use one docker file

Author: Mubangizi

.github/workflows/prod.yml

@@ -61,7 +61,7 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           context: .
-          file: Dockerfile
+          file: docker/prod/Dockerfile
           labels: ${{ steps.meta.outputs.labels }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
@@ -136,7 +136,7 @@ jobs:
           --set environment.ADMIN_PSQL_PASSWORD="${{ secrets.PRODUCTION_ADMIN_PSQL_PASSWORD }}" \
           --set environment.ADMIN_PSQL_HOST="${{ secrets.PRODUCTION_ADMIN_PSQL_HOST }}" \
           --set environment.ADMIN_PSQL_PORT="${{ secrets.PRODUCTION_ADMIN_PSQL_PORT }}" \
-          --set environment.MAIL_PASSWORD="${{ secrets.PRODUCTION_MAIL_PASSWORD }}" \
+          --set environment.MAIL_PASSWORD="${{ secrets.MAIL_PASSWORD }}" \
           --timeout=300s
 
       - name: Monitor Rollout

.github/workflows/staging.yaml

@@ -49,7 +49,7 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           context: .
-          file: Dockerfile.api
+          file: Dockerfile
           labels: ${{ steps.meta.outputs.labels }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
@@ -73,7 +73,7 @@ jobs:
     name: Deploy (Staging)
 
     needs:
-      - Build
+      - build
 
     runs-on: ubuntu-latest
     env:

Dockerfile

@@ -19,4 +19,5 @@ RUN poetry install
 EXPOSE 8000
 
 #Exposing port for celery flower
-EXPOSE 5555
+# EXPOSE 5555
+ENTRYPOINT ["sh", "/app/scripts/start.sh"]

docker-compose.yml

@@ -10,7 +10,7 @@ services:
     restart: always
     build:
       context: .
-      dockerfile: Dockerfile.api
+      dockerfile: Dockerfile
     container_name: database-api
     environment:
       PYTHONDONTWRITEBYTECODE: 1

Dockerfile.api docker/prod/DockerfileDockerfile.api renamed to docker/prod/Dockerfile

@@ -18,5 +18,6 @@ RUN poetry install
 
 EXPOSE 8000
 
-ENTRYPOINT ["sh", "/app/scripts/start.sh"]
-
+#Exposing port for celery flower
+# EXPOSE 5555
+ENTRYPOINT ["sh", "/app/scripts/start-prod.sh"]