Feature/single image (#83)

* add allow-grant.sh to main container

* update changelog

* Feature/single image ci fixes (#84)

* remove ci fixes

* remove workflow from test in main.yml

Co-authored-by: Raj Poluri <[email protected]>
Co-authored-by: Ken Figueiredo <[email protected]>

.github/workflows/main.yml

@@ -16,18 +16,3 @@ jobs:
         dockerfile: "Dockerfile"
         always_pull: true
         push: false
-
-  apiary-init-docker-image:
-    name: Apiary Init Container Docker Checks
-    runs-on: ubuntu-18.04
-    steps:
-    - name: Check out code  
-      uses: actions/checkout@v2
-
-    - name: Ensure Apiary Init Docker Image Builds.
-      uses: docker/[email protected]
-      with:
-        path: "initContainer"
-        dockerfile: "initContainer/Dockerfile"
-        always_pull: true
-        push: false

.github/workflows/release.yml

@@ -22,23 +22,4 @@ jobs:
         repository: expediagroup/apiary-metastore-core
         username: ${{ secrets.DOCKER_HUB_USERNAME }}
         password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-        push: ${{ startsWith(github.ref, 'refs/tags/') }}
-
-  apiary-init-docker-image:
-    name: Apiary Init Container Docker Release
-    runs-on: ubuntu-18.04
-    steps:
-    - name: Check out code  
-      uses: actions/checkout@v2
-
-    - name: Release Apiary Init Docker Image
-      uses: docker/[email protected]
-      with:
-        path: "initContainer"
-        dockerfile: "initContainer/Dockerfile"
-        always_pull: true
-        tag_with_ref: true
-        repository: expediagroup/apiary-metastore-init-container
-        username: ${{ secrets.DOCKER_HUB_USERNAME }}
-        password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-        push: ${{ startsWith(github.ref, 'refs/tags/') }}
+        push: ${{ startsWith(github.ref, 'refs/tags/') }

CHANGELOG.md

@@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.17.0] - 2020-09-02
+### Added
+- Add `allow-grant.sh` to main container.
+- Add `db-iam-user.sh` to main container.
+
+### Removed
+- Removed `initContainer` in favor of a single image.
+
 ## [1.16.0] - 2020-08-31
 ### Added
 - [Issue-165](https://github.com/ExpediaGroup/apiary-data-lake/issues/165) Add init container dockerfile for supporting air-gapped environments.

Dockerfile

@@ -79,4 +79,6 @@ COPY files/update_property.py /bin/update_property.py
 COPY files/s3inventory.tpl /s3inventory.tpl
 COPY files/startup.sh /startup.sh
 COPY files/s3_inventory_repair.sh /s3_inventory_repair.sh
+COPY files/allow-grant.sh /allow-grant.sh
+COPY files/db-iam-user.sh /db-iam-user.sh
 CMD /startup.sh