diff --git a/Dockerfile b/Dockerfile index 55534c9..ab230ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,15 @@ FROM python:3.12-slim -# Set working directory WORKDIR /app -# Copy requirements first for better caching COPY requirements.txt . - -# Install dependencies RUN pip install --no-cache-dir -r requirements.txt -# Copy the rest of the application COPY . . -# Expose the port the app runs on EXPOSE 5000 -# Set environment variables -ENV FLASK_APP=main.py ENV PYTHONUNBUFFERED=1 -# Run the application -CMD ["python", "main.py"] +# Use Gunicorn instead of python main.py +CMD ["gunicorn", "--bind", "0.0.0.0:5000", "--workers", "4", "--timeout", "120", "main:app"] diff --git a/requirements.txt b/requirements.txt index cc49e44..d7248ce 100644 Binary files a/requirements.txt and b/requirements.txt differ diff --git a/web/vue-app/nginx.conf b/web/vue-app/nginx.conf index 412792b..7edc346 100644 --- a/web/vue-app/nginx.conf +++ b/web/vue-app/nginx.conf @@ -16,26 +16,20 @@ 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: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/; - 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_http_version 1.1; - proxy_set_header Connection ''; - chunked_transfer_encoding off; - proxy_buffering off; - proxy_cache off; - proxy_read_timeout 36000s; - proxy_send_timeout 36000s; + proxy_pass http://backend:5000/events; + proxy_set_header Connection ''; + proxy_http_version 1.1; + chunked_transfer_encoding off; + proxy_buffering off; + proxy_cache off; } location / {