From 045c159733ea68258e249e7ca31ba38978457e79 Mon Sep 17 00:00:00 2001 From: adam-skowronek Date: Mon, 9 Jan 2023 19:35:41 +0000 Subject: [PATCH] Update prod deployment config --- backend/Dockerfile.prod | 4 +++- docker-compose.prod.yaml | 2 +- frontend/nginx.conf | 13 ++++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/backend/Dockerfile.prod b/backend/Dockerfile.prod index fa48dac..0d4391f 100644 --- a/backend/Dockerfile.prod +++ b/backend/Dockerfile.prod @@ -14,4 +14,6 @@ RUN pip install -r requirements.txt COPY . . -RUN flask db migrate \ No newline at end of file +RUN flask db stamp head +RUN flask db migrate +RUN flask db upgrade diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml index d7b4d59..a03dce0 100644 --- a/docker-compose.prod.yaml +++ b/docker-compose.prod.yaml @@ -34,7 +34,7 @@ services: # depends_on: # - nginx_server ports: - - "9998:80" + - "80:80" volumes: db_data: diff --git a/frontend/nginx.conf b/frontend/nginx.conf index d34a0a3..671659e 100644 --- a/frontend/nginx.conf +++ b/frontend/nginx.conf @@ -1,3 +1,7 @@ +upstream web_app { + server backend_service:5000; +} + server { listen 80; @@ -6,4 +10,11 @@ server { index index.html index.htm; try_files $uri $uri/ /index.html =404; } -} \ No newline at end of file + + location ~ /api/ { + proxy_pass http://web_app; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_redirect off; + } +}