Merge pull request #10 from UNDP-Data/feat/cicd

Feat/cicd
UNDP-Data · Nov 10, 2023 · dfa0e14 · dfa0e14
2 parents 8876261 + ae68cd1
commit dfa0e14
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
+  IMAGE_NAME: cogserver
 
 jobs:
   build-and-push-image:
@@ -15,7 +15,6 @@ jobs:
       contents: read
       packages: write
 
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -33,9 +32,6 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
-#      - name: Copy .env file
-#        run: cp "gdal_rio.env" gdal_rio.env
-
       - name: Read gdal_rio.env file and set environment variables
         run: |
           while IFS= read -r line; do

diff --git a/Dockerfile b/Dockerfile
@@ -12,6 +12,4 @@ RUN pipenv run pip install uvicorn titiler asyncpg postgis --no-cache-dir  --upg
 
 
 COPY src/cogserver cogserver
-COPY gdal_rio.env .
-
 CMD pipenv run uvicorn cogserver:app --host ${HOST} --port ${PORT}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,8 +13,8 @@ services:
     # Enable the following volumes if you want to mount source code to Docker
     # volumes:
       # - "./app/wmts.py:/opt/wmts/wmts.py"
-#    env_file:
-#      - gdal_rio.env
+    env_file:
+      - gdal_rio.env
     ports:
       - 8000:80
 #    environment:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,6 +12,4 @@ RUN pipenv run pip install uvicorn titiler asyncpg postgis --no-cache-dir --upg


		COPY src/cogserver cogserver
		COPY gdal_rio.env .

		CMD pipenv run uvicorn cogserver:app --host ${HOST} --port ${PORT}