From eb04f769ae7a09fcd4b49cbcfb6c743ea069480b Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 16 Aug 2025 15:40:41 -0400 Subject: [PATCH 1/3] tsk-172: Updated docker compose to include songparser service --- docker-compose.yaml | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 46c6f3b..a5fad94 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -17,7 +17,8 @@ services: main_db: condition: service_healthy networks: - - main-api-network + # - main-api-network + - icarus-network restart: unless-stopped # Optional: Restart policy # --- Web API auth --- @@ -39,10 +40,23 @@ services: auth_db: condition: service_healthy networks: - - auth-api-network + # - auth-api-network + - icarus-network # Optional: Mount local code for development (live reload) # volumes: # - ./path/to/your/web-api-repo:/app + songparser: + build: + context: ../songparser + ssh: ["default"] + dockerfile: Dockerfile + container_name: songparser + restart: unless-stopped + env_file: + - ../songparser/.env + networks: + - icarus-network + # PostgreSQL Database Service # --- icarus web api db --- @@ -69,7 +83,8 @@ services: start_period: 10s restart: always # Optional: Restart policy networks: - - main-api-network + # - main-api-network + - icarus-network # --- icarus web auth api db --- auth_db: @@ -95,7 +110,8 @@ services: start_period: 10s restart: always # Optional: Restart policy networks: - - auth-api-network + # - auth-api-network + - icarus-network # Define the named volume for data persistence volumes: @@ -106,7 +122,9 @@ volumes: # Define the network (optional, but good practice) networks: - main-api-network: - driver: bridge - auth-api-network: + # main-api-network: + # driver: bridge + # auth-api-network: + # driver: bridge + icarus-network: driver: bridge -- 2.47.3 From 21002919d18730b6095c174e30533aeef99380d8 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 16 Aug 2025 18:42:37 -0400 Subject: [PATCH 2/3] tsk-172: Changed docker dependencies --- docker-compose.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index a5fad94..73a04ee 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -45,6 +45,7 @@ services: # Optional: Mount local code for development (live reload) # volumes: # - ./path/to/your/web-api-repo:/app + songparser: build: context: ../songparser @@ -54,6 +55,11 @@ services: restart: unless-stopped env_file: - ../songparser/.env + depends_on: + - api + - main_db + - auth_api + - auth_db networks: - icarus-network -- 2.47.3 From 5af440b7e191c1d6be50db21df285cac291af416 Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sat, 16 Aug 2025 18:57:58 -0400 Subject: [PATCH 3/3] tsk-172: Cleanup --- docker-compose.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 73a04ee..7a952eb 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -17,7 +17,6 @@ services: main_db: condition: service_healthy networks: - # - main-api-network - icarus-network restart: unless-stopped # Optional: Restart policy @@ -40,12 +39,12 @@ services: auth_db: condition: service_healthy networks: - # - auth-api-network - icarus-network # Optional: Mount local code for development (live reload) # volumes: # - ./path/to/your/web-api-repo:/app + # --- songparser service --- songparser: build: context: ../songparser @@ -89,7 +88,6 @@ services: start_period: 10s restart: always # Optional: Restart policy networks: - # - main-api-network - icarus-network # --- icarus web auth api db --- @@ -116,7 +114,6 @@ services: start_period: 10s restart: always # Optional: Restart policy networks: - # - auth-api-network - icarus-network # Define the named volume for data persistence @@ -128,9 +125,5 @@ volumes: # Define the network (optional, but good practice) networks: - # main-api-network: - # driver: bridge - # auth-api-network: - # driver: bridge icarus-network: driver: bridge -- 2.47.3