From 067c287fc44ffa87838786b70daa422c8a055a37 Mon Sep 17 00:00:00 2001 From: HumanoidSandvichDispenser Date: Thu, 7 Nov 2024 18:12:53 -0800 Subject: [PATCH] Update docker-compose for backend and reverse proxy --- backend-flask/Dockerfile | 11 ++++------ docker-compose.yml | 47 +++++++++++++++++++++++++++++++++++----- nginx/default.conf | 24 ++++++++++++++++++++ 3 files changed, 69 insertions(+), 13 deletions(-) create mode 100644 nginx/default.conf diff --git a/backend-flask/Dockerfile b/backend-flask/Dockerfile index 09cc4d4..a726e99 100644 --- a/backend-flask/Dockerfile +++ b/backend-flask/Dockerfile @@ -1,15 +1,12 @@ # Use an official Python runtime as a parent image FROM python:3.11-slim -# Set the working directory in the container -WORKDIR /app +COPY requirements.txt / -# Install dependencies -COPY requirements.txt ./ RUN pip install --no-cache-dir -r requirements.txt -# Copy the entire app into the container -COPY . . +COPY . /app +WORKDIR /app # Expose the Flask development server port EXPOSE 5000 @@ -19,4 +16,4 @@ ENV FLASK_APP=app.py ENV FLASK_ENV=development # Command to run the Flask application -CMD ["flask", "run", "--host=0.0.0.0", "--port=5000"] +CMD ["flask", "run", "--host=0.0.0.0", "--port=5000", "--debug"] diff --git a/docker-compose.yml b/docker-compose.yml index f4f43ce..312d849 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,46 @@ +version: '3.9' + services: + # Flask service backend: - build: ./backend + container_name: backend + build: + context: ./backend-flask + #image: jazzdd/alpine-flask:python3 ports: - - 5000:5000 + - ":5000" volumes: - - ./backend:/app - - ./sqlite3:/app/sqlite3 - command: uvicorn src.main:app --reload --host 0.0.0.0 --port 5000 + - ./backend-flask:/app + networks: + - dev-network + + # Vue + Vite service + frontend: + container_name: frontend + build: + context: ./availabili.tf + ports: + - ":5173" environment: - - DB_URI=sqlite:///./sqlite3/db.sqlite3 + VITE_API_URL: http://localhost:8000 # API endpoint + volumes: + - ./availabili.tf:/app + networks: + - dev-network + + # NGINX service + nginx: + image: nginx:latest + ports: + - "8000:80" + volumes: + - ./nginx:/etc/nginx/conf.d + depends_on: + - backend + - frontend + networks: + - dev-network + +networks: + dev-network: + driver: bridge diff --git a/nginx/default.conf b/nginx/default.conf new file mode 100644 index 0000000..8bda23e --- /dev/null +++ b/nginx/default.conf @@ -0,0 +1,24 @@ +server { + listen 80; + + # Proxy for the Vite frontend + location / { + proxy_pass http://frontend:5173; + proxy_set_header Host $host; + + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } + + # Proxy for the Flask backend API + location /api/ { + proxy_pass http://backend:5000; + proxy_set_header Host $host; + } + + location /apidoc/ { + proxy_pass http://backend:5000; + proxy_set_header Host $host; + } +}