From 29307807668f2ca265af593eee396f1a6af76f6f Mon Sep 17 00:00:00 2001
From: Baptiste Peupier <60870677+BaptistePeupier@users.noreply.github.com>
Date: Wed, 2 Feb 2022 13:29:25 +0100
Subject: [PATCH] aled

---
 frontend/backend/application/__init__.py |  2 +-
 frontend/docker-compose.yml              | 30 ++++++++++++++----------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/frontend/backend/application/__init__.py b/frontend/backend/application/__init__.py
index 1f773b6..5712059 100644
--- a/frontend/backend/application/__init__.py
+++ b/frontend/backend/application/__init__.py
@@ -7,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']
+        origin = ['http://10.1.5.10']
     CORS(app, supports_credentials=True, origins=origin)
     if flask_env == 'production':
         app.config.from_object("config.ProductionConfig")
diff --git a/frontend/docker-compose.yml b/frontend/docker-compose.yml
index f29551a..45362af 100644
--- a/frontend/docker-compose.yml
+++ b/frontend/docker-compose.yml
@@ -1,19 +1,19 @@
 version: '3.8'
 
 services:
-  nginx-front:
-    image: nginx:latest
-    volumes:
-      - ./conf/nginx.conf:/etc/nginx/nginx.conf
-      - ./logs/nginx:/etc/nginx/logs
-      - ./cert:/etc/nginx/cert
-    networks:
-      - net
-    ports:
-      - 80:80
-    depends_on:
-      - frontend
-      - flask-frontend
+  # nginx-front:
+  #   image: nginx:latest
+  #   volumes:
+  #     - ./conf/nginx.conf:/etc/nginx/nginx.conf
+  #     - ./logs/nginx:/etc/nginx/logs
+  #     - ./cert:/etc/nginx/cert
+  #   networks:
+  #     - net
+  #   ports:
+  #     - 80:80
+  #   depends_on:
+  #     - frontend
+  #     - flask-frontend
 
   frontend:
     container_name: frontend
@@ -22,6 +22,8 @@ services:
     volumes:
       - ./src:/data/frontend
       - ./node_modules:/data/frontend/node_modules
+    ports:
+      - "4200:4200"
     environment:
       - NODE_ENV=production
     networks:
@@ -38,6 +40,8 @@ services:
       - FLASK_ENV=production
       - FLASK_DEBUG=0
       - FLASK_RUN_PORT=5000
+    ports:
+      - "5000:5000"
     networks:
       - net
     depends_on: