From 4cd8c65524563e448fda7c6b7258536dfb250d84 Mon Sep 17 00:00:00 2001 From: Baptiste Peupier <60870677+BaptistePeupier@users.noreply.github.com> Date: Wed, 2 Feb 2022 13:18:09 +0100 Subject: [PATCH] ssss --- frontend/backend/application/__init__.py | 4 +--- frontend/conf/nginx.conf | 12 ++++++------ frontend/docker-compose.yml | 2 -- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/frontend/backend/application/__init__.py b/frontend/backend/application/__init__.py index 18638d6..1f773b6 100644 --- a/frontend/backend/application/__init__.py +++ b/frontend/backend/application/__init__.py @@ -1,6 +1,4 @@ -print("Import Flask") from flask import Flask -print("Import Flask-Cors") from flask_cors import CORS @@ -9,7 +7,7 @@ def create_app(flask_env='development'): app = Flask(__name__, instance_relative_config=False, static_url_path='') origin = app.config.get('ALLOW_ORIGIN') if origin is None: - origin = ['http://10.1.1.10', 'http://10.1.5.10'] + origin = ['http://10.1.1.10'] CORS(app, supports_credentials=True, origins=origin) if flask_env == 'production': app.config.from_object("config.ProductionConfig") diff --git a/frontend/conf/nginx.conf b/frontend/conf/nginx.conf index 2a7b0ab..e1ee6c3 100644 --- a/frontend/conf/nginx.conf +++ b/frontend/conf/nginx.conf @@ -21,9 +21,9 @@ http { server frontend:4200; } - # upstream flask-frontend { - # server flask-frontend:5000; - # } + upstream flask-frontend { + server flask-frontend:5000; + } server { @@ -34,9 +34,9 @@ http { proxy_pass http://frontend; } - # location /api { - # proxy_pass http://flask-frontend; - # } + location /api { + proxy_pass http://flask-frontend; + } } } diff --git a/frontend/docker-compose.yml b/frontend/docker-compose.yml index 46e015f..f29551a 100644 --- a/frontend/docker-compose.yml +++ b/frontend/docker-compose.yml @@ -38,8 +38,6 @@ services: - FLASK_ENV=production - FLASK_DEBUG=0 - FLASK_RUN_PORT=5000 - ports: - - "5000:5000" networks: - net depends_on: