From f29c90897f8b56de646955664c06f4e146e37394 Mon Sep 17 00:00:00 2001 From: Ryan Kegel Date: Wed, 11 Feb 2026 14:56:32 -0500 Subject: [PATCH] -test environment --- docker-compose.test.yml | 28 +++++++++++++++++++++++++++ frontend/vue-app/Dockerfile | 9 ++++++++- frontend/vue-app/nginx.conf | 38 ++++++++++++++++++------------------- 3 files changed, 55 insertions(+), 20 deletions(-) create mode 100644 docker-compose.test.yml diff --git a/docker-compose.test.yml b/docker-compose.test.yml new file mode 100644 index 0000000..c174ec8 --- /dev/null +++ b/docker-compose.test.yml @@ -0,0 +1,28 @@ +# yaml +version: "3.8" + +services: + chore-test-app-backend: # Renamed for clarity + image: git.ryankegel.com:3000/ryan/backend:next-1.0.4-20260211 + ports: + - "5001:5000" # Map external 5001 to internal 5000 + environment: + - FLASK_ENV=development + # Add other env vars, volumes, or networks as needed (mirror production but adjust ports) + + chore-test-app-frontend: # Renamed for clarity + image: git.ryankegel.com:3000/ryan/frontend:next-1.0.4-20260211 + ports: + - "8081:80" # Map external 8081 to internal 80 (assuming Nginx serves on 80) + environment: + - BACKEND_HOST=chore-test-app-backend # Override for test env + 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 + +networks: + chore-test-app-net: + driver: bridge + +volumes: + chore-test-app-backend-data: {} diff --git a/frontend/vue-app/Dockerfile b/frontend/vue-app/Dockerfile index fd3b859..e7bd266 100644 --- a/frontend/vue-app/Dockerfile +++ b/frontend/vue-app/Dockerfile @@ -16,4 +16,11 @@ COPY 192.168.1.102+1-key.pem /etc/nginx/ssl/server.key EXPOSE 80 EXPOSE 443 -CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file +# Copy nginx.conf +COPY nginx.conf /etc/nginx/nginx.conf + +# Set default BACKEND_HOST (can be overridden at runtime) +ENV BACKEND_HOST=chore-app-backend + +# Use envsubst to replace variables in nginx.conf at startup +CMD ["/bin/sh", "-c", "envsubst < /etc/nginx/nginx.conf > /etc/nginx/nginx.conf.tmp && mv /etc/nginx/nginx.conf.tmp /etc/nginx/nginx.conf && nginx -g 'daemon off;'"] \ No newline at end of file diff --git a/frontend/vue-app/nginx.conf b/frontend/vue-app/nginx.conf index 6a9aee1..b29949a 100644 --- a/frontend/vue-app/nginx.conf +++ b/frontend/vue-app/nginx.conf @@ -1,8 +1,8 @@ events {} http { - include /etc/nginx/mime.types; - default_type application/octet-stream; + include /etc/nginx/mime.types; + default_type application/octet-stream; server { client_max_body_size 2M; @@ -17,27 +17,27 @@ http { ssl_ciphers HIGH:!aNULL:!MD5; location /api/ { - proxy_pass http://chore-app-backend:5000/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; + proxy_pass http://$BACKEND_HOST:5000/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; } -location /events { - proxy_pass http://chore-app-backend:5000/events; - proxy_set_header Host $host; - proxy_set_header Connection ''; - proxy_http_version 1.1; - chunked_transfer_encoding off; - proxy_buffering off; - proxy_cache off; - proxy_read_timeout 36000s; - proxy_send_timeout 36000s; -} + location /events { + proxy_pass http://$BACKEND_HOST:5000/events; + proxy_set_header Host $host; + proxy_set_header Connection ''; + proxy_http_version 1.1; + chunked_transfer_encoding off; + proxy_buffering off; + proxy_cache off; + proxy_read_timeout 36000s; + proxy_send_timeout 36000s; + } location / { try_files $uri $uri/ /index.html; - } + } } } \ No newline at end of file