adjust docker compose files

.github/workflows/cd.prod.yml

@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build image
-        run: docker build -t anchor-python-bp-prod:latest -f docker/prod/Dockerfile .
+        run: docker build -t anchor-python-bp-prod:latest -f Dockerfile .
 
       - name: Save image 
         run: docker save anchor-python-bp-prod:latest | gzip > prod.tar.gz
@@ -23,7 +23,7 @@ jobs:
           username: ${{ secrets.USERNAME }}
           password: ${{ secrets.PASSWORD }}
           source: "prod.tar.gz"
-          target: "/home/${{ secrets.USERNAME }}/boilerplate-python/prod_source_code/docker/prod"
+          target: "/home/${{ secrets.USERNAME }}/boilerplate-python/prod_source_code"
 
       - name: Deploy image on server
         uses: appleboy/[email protected]
@@ -32,8 +32,8 @@ jobs:
           username: ${{ secrets.USERNAME }}
           password: ${{ secrets.PASSWORD }}
           script: |
-            cd /home/${{ secrets.USERNAME }}/boilerplate-python/prod_source_code/docker/prod
+            cd /home/${{ secrets.USERNAME }}/boilerplate-python/prod_source_code
             git pull origin main
             docker load --input prod.tar.gz
-            docker-compose -f docker-compose.yml up -d
+            docker-compose -f docker-compose.prod.yml up -d
             rm -f prod.tar.gz

.github/workflows/cd.staging.yml

@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build image
-        run: docker build -t anchor-python-bp-staging:latest -f docker/staging/Dockerfile .
+        run: docker build -t anchor-python-bp-staging:latest -f Dockerfile .
 
       - name: Save image 
         run: docker save anchor-python-bp-staging:latest | gzip > staging.tar.gz
@@ -23,7 +23,7 @@ jobs:
           username: ${{ secrets.USERNAME }}
           password: ${{ secrets.PASSWORD }}
           source: "staging.tar.gz"
-          target: "/home/${{ secrets.USERNAME }}/boilerplate-python/staging_source_code/docker/staging"
+          target: "/home/${{ secrets.USERNAME }}/boilerplate-python/staging_source_code"
 
       - name: Deploy image on server
         uses: appleboy/[email protected]
@@ -32,8 +32,8 @@ jobs:
           username: ${{ secrets.USERNAME }}
           password: ${{ secrets.PASSWORD }}
           script: |
-            cd /home/${{ secrets.USERNAME }}/boilerplate-python/staging_source_code/docker/staging
+            cd /home/${{ secrets.USERNAME }}/boilerplate-python/staging_source_code
             git pull origin staging
             docker load --input staging.tar.gz
-            docker-compose -f docker-compose.yml up -d
+            docker-compose -f docker-compose.staging.yml up -d
             rm -f staging.tar.gz

docker-compose.yml

@@ -0,0 +1,36 @@
+services:
+  app_dev:
+    image: anchor-python-bp-dev:latest
+    command: ["sh", "-c", "alembic upgrade head && uvicorn main:app --host 0.0.0.0 --port 7001 --reload"]
+    container_name: app_dev
+    networks:
+      - hng-network
+    restart: unless-stopped
+    ports:
+      - 7006:7001
+    working_dir: /app 
+    volumes:
+      - .env:/app/.env    
+    depends_on:
+      - dev_db
+
+  dev_db:
+    image: postgres:14.12
+    container_name: dev_db
+    restart: always
+    volumes:
+      - dev_db:/var/lib/postgresql/data
+      - .env:/app/.env
+    environment:
+      - POSTGRES_PASSWORD=${DB_PASSWORD?Variable not set}
+      - POSTGRES_USER=${DB_USER?Variable not set}
+      - POSTGRES_DB=${DB_NAME?Variable not set}
+    networks:
+      - hng-network
+
+volumes:
+  dev_db:
+
+networks:
+  hng-network:
+    driver: bridge