From 4dc87f579ccfefa2d7170f9b9902c4ba6eb9556f Mon Sep 17 00:00:00 2001
From: Baptiste Peupier <60870677+BaptistePeupier@users.noreply.github.com>
Date: Wed, 2 Feb 2022 14:00:50 +0100
Subject: [PATCH] =?UTF-8?q?voil=C3=A0voil=C3=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/backend/application/__init__.py      |  2 +-
 frontend/docker-compose.yml                   | 30 ++++++++-----------
 frontend/src/environments/environment.prod.ts |  2 +-
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/frontend/backend/application/__init__.py b/frontend/backend/application/__init__.py
index 74f0d52..1f773b6 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', 'http://10.1.5.10', 'http://10.1.1.10:4200', 'http://10.1.5.10:4200']
+        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/docker-compose.yml b/frontend/docker-compose.yml
index 45362af..f29551a 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,8 +22,6 @@ services:
     volumes:
       - ./src:/data/frontend
       - ./node_modules:/data/frontend/node_modules
-    ports:
-      - "4200:4200"
     environment:
       - NODE_ENV=production
     networks:
@@ -40,8 +38,6 @@ services:
       - FLASK_ENV=production
       - FLASK_DEBUG=0
       - FLASK_RUN_PORT=5000
-    ports:
-      - "5000:5000"
     networks:
       - net
     depends_on:
diff --git a/frontend/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts
index 63d553f..e664d27 100644
--- a/frontend/src/environments/environment.prod.ts
+++ b/frontend/src/environments/environment.prod.ts
@@ -1,4 +1,4 @@
 export const environment = {
   production: true,
-  debutUrl: 'http://10.1.1.10:5000/api/'
+  debutUrl: 'http://10.1.1.10/api/'
 };