Change to only one drocker compose file

src/api/api.env → .env

@@ -2,7 +2,7 @@
 UVICORN_HOST=0.0.0.0
 UVICORN_PORT=8000
 
-# Auth configuration
+# API Auth configuration
 ALGORITHM="HS256"
 ACCESS_TOKEN_EXPIRATION = 60
 CRYPT_CONTEXT_SCHEME="argon2"
@@ -11,9 +11,12 @@ CRYPT_CONTEXT_SCHEME="argon2"
 AUTHORIZED_USERS ="root" # Do not put spaces between users
 
 
-# Database Vars (!!! Critic Variables !!!)
+
+
+
+# Database Vars
 POSTGRES_HOST="bank_app_postgres"
 POSTGRES_PORT=5432
 POSTGRES_USER="root"
 POSTGRES_PASSWORD= "root" # Define Postgres password here
-POSTGRES_DB = 'bank_db'
+POSTGRES_DB = 'bank_db'

.github/workflows/upload_docker_images.yaml

@@ -1,26 +1,22 @@
-# Version : 0.1.4
+# Version : 0.1.5
 # Current state : Dev
 # Author : Guillaume Pot
 # Contact : [email protected]
 
-
 # Name of the workflow 
-name : Upload Docker images
+name: Upload Docker images
 
 # Trigger
 on:
   pull_request:
     branches: ["main"]
 
-
 # Jobs
 jobs:
   # Job - Push Streamlit image
-  Push and push Streamlit image:
+  push_streamlit_image:
+    name: Push Streamlit image
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      secrets: read
 
     # Actions to execute
     steps:
@@ -34,6 +30,12 @@ jobs:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
+      # Get version from .env file
+      - name: Load .env file
+        uses: c-py/action-dotenv-to-setenv@v2
+        with:
+          env-file: .github/workflows/.env
+
       # Build & Push Docker Image
       - name: Build and push Docker Image
         uses: docker/build-push-action@v2
@@ -43,14 +45,10 @@ jobs:
           push: true
           tags: Unclad3610/personal_bank_app_streamlit:${{ env.streamlit_version }}, Unclad3610/personal_bank_app_streamlit:latest
 
-
-
   # Job - Push FastAPI image
-  Push and push FastAPI image:
+  push_fastapi_image:
+    name: Push FastAPI image
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      secrets: read
 
     # Actions to execute
     steps:
@@ -77,4 +75,4 @@ jobs:
           context: ./src/api
           file: ./src/api/Dockerfile
           push: true
-          tags: Unclad3610/personal_bank_app_api:${{ env.api_version }}, Unclad3610/personal_bank_app_api:latest
+          tags: Unclad3610/personal_bank_app_api:${{ env.api_version }}, Unclad3610/personal_bank_app_api:latest

docker-compose.yaml

@@ -0,0 +1,73 @@
+# Version : 0.2.1
+# Current state : Prod
+# Author : Guillaume Pot
+# Contact : [email protected]
+
+
+services:
+  # PostGres Container
+  container_postgres:
+    image: postgres:14
+    container_name: bank_app_postgres
+    env_file:
+      - .env
+    volumes:
+      - ../../storage/postgres_data:/var/lib/postgresql/data
+    ports:
+      - "${POSTGRES_PORT}:5432"
+    restart: on-failure
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+    networks:
+      - bank_app_network
+
+  # API Container
+  container_api:
+    image: Unclad3610/personal_bank_app_api:latest
+    container_name: bank_app_api
+    env_file:
+      - .env
+    ports:
+      - "8000:8000"
+    depends_on:
+      - serviceName: container_postgres
+        condition: service_healthy
+    restart: always
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+    networks:
+      - bank_app_network
+
+
+  # STREAMLIT Container
+  container_streamlit:
+    image: Unclad3610/personal_bank_app_streamlit:latest
+    container_name: bank_app_streamlit
+    environment:
+      - API_VERSION="0.2.0"
+      - API_URL="http://bank_app_api:8000"
+    ports:
+      - "8001:8001"
+    depends_on:
+      - serviceName: container_api
+        condition: service_healthy
+    restart: always
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://container_api:8000"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+    networks:
+      - bank_app_network
+
+
+# Networks
+networks:
+  bank_app_network:
+    external: true