From a21cb60aebac0756c86adf4591cd10d6804887a7 Mon Sep 17 00:00:00 2001 From: Ryan Kegel Date: Wed, 11 Feb 2026 21:36:45 -0500 Subject: [PATCH] -test environment --- docker-compose.test.yml | 18 +++++++++--------- docker-compose.yml | 42 +++++++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 27 deletions(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 0a3ee59..39bad6a 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -2,23 +2,23 @@ version: "3.8" services: - chore-test-app-backend: # Renamed for clarity - image: git.ryankegel.com:3000/ryan/backend:next-1.0.4-20260211 + chore-test-app-backend: # Test backend service name + image: git.ryankegel.com:3000/ryan/backend:next-1.0.4-20260211 # Use dev tag ports: - - "5001:5000" # Map external 5001 to internal 5000 + - "5004:5000" # Host 5004 -> Container 5000 environment: - FLASK_ENV=development - # Add other env vars, volumes, or networks as needed (mirror production but adjust ports) + # Add volumes, networks, etc., as needed - chore-test-app-frontend: # Renamed for clarity - image: git.ryankegel.com:3000/ryan/frontend:next-1.0.4-20260211 + chore-test-app-frontend: # Test frontend service name + image: git.ryankegel.com:3000/ryan/frontend:next-1.0.4-20260211 # Use dev tag ports: - - "443:443" # Map host 443 to container 443 for HTTPS + - "446:443" # Host 446 -> Container 443 (HTTPS) environment: - - BACKEND_HOST=chore-test-app-backend # Override for test env + - BACKEND_HOST=chore-test-app-backend # Points to internal backend service depends_on: - chore-test-app-backend - # If the frontend proxy needs to point to the dev backend, ensure the Nginx config uses the internal backend service name or IP + # Add volumes, networks, etc., as needed networks: chore-test-app-net: diff --git a/docker-compose.yml b/docker-compose.yml index f8966f9..11d50c4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,30 +1,36 @@ # yaml -version: '3.8' +version: "3.8" services: - chore-app-backend: - image: devserver.lan:5900/chore-app-backend:production - container_name: chore-app-backend - restart: unless-stopped - expose: - - "5000" - networks: - - chore-app-net - volumes: - - chore-app-backend-data:/app/data # persists backend data - - chore-app-frontend: - image: devserver.lan:5900/chore-app-frontend:production - container_name: chore-app-frontend - restart: unless-stopped + chore-app-backend: # Production backend service name + image: git.ryankegel.com:3000/ryan/backend:latest # Or specific version tag + container_name: chore-app-backend-prod # Added for easy identification ports: - - "4600:443" + - "5001:5000" # Host 5001 -> Container 5000 + environment: + - FLASK_ENV=production + volumes: + - chore-app-backend-data:/app/data # Assuming backend data storage; adjust path as needed networks: - chore-app-net + # Add other volumes, networks, etc., as needed + + chore-app-frontend: # Production frontend service name + image: git.ryankegel.com:3000/ryan/frontend:latest # Or specific version tag + container_name: chore-app-frontend-prod # Added for easy identification + ports: + - "443:443" # Host 443 -> Container 443 (HTTPS) + environment: + - BACKEND_HOST=chore-app-backend # Points to internal backend service + depends_on: + - chore-app-backend + networks: + - chore-app-net + # Add volumes, networks, etc., as needed networks: chore-app-net: driver: bridge volumes: - chore-app-backend-data: {} \ No newline at end of file + chore-app-backend-data: {}