From c4a6ff131244735f59b02b244e9be5876bc63678 Mon Sep 17 00:00:00 2001
From: Baptiste Peupier <60870677+BaptistePeupier@users.noreply.github.com>
Date: Wed, 2 Feb 2022 09:46:23 +0100
Subject: [PATCH] update rp

---
 frontend/conf/nginx.conf       | 14 ++++++----
 frontend/docker-compose.yml    | 49 ++++++++++++++++++----------------
 frontend/logs/nginx/access.log | 14 ++++++++++
 3 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/frontend/conf/nginx.conf b/frontend/conf/nginx.conf
index a022b5c..0d5f437 100644
--- a/frontend/conf/nginx.conf
+++ b/frontend/conf/nginx.conf
@@ -33,15 +33,19 @@ http {
     location / {
       proxy_pass      		http://frontend;
     }
-  }
-
-  server {
-    listen 					      80;
-    access_log      		  logs/access.log;
 
     location /api {
       proxy_pass      		http://flask-frontend;
     }
   }
 
+  # server {
+  #   listen 					      80;
+  #   access_log      		  logs/access.log;
+
+  #   location /api {
+  #     proxy_pass      		http://flask-frontend;
+  #   }
+  # }
+
 }
diff --git a/frontend/docker-compose.yml b/frontend/docker-compose.yml
index b5ffa7c..6c07a23 100644
--- a/frontend/docker-compose.yml
+++ b/frontend/docker-compose.yml
@@ -1,32 +1,19 @@
 version: '3.8'
 
 services:
-  nginx:
-      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:
-    container_name: flask-frontend
-    build: backend
-    command: python -m flask run
+  nginx-front:
+    image: nginx:latest
     volumes:
-      - ./backend:/data/backend
-    environment:
-      - FLASK_APP=app.py
-      - FLASK_ENV=development
-      - FLASK_DEBUG=0
-      - FLASK_RUN_PORT=5000
+      - ./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
@@ -40,6 +27,22 @@ services:
     networks:
       - net
 
+  flask-frontend:
+    container_name: flask-frontend
+    build: backend
+    command: python -m flask run
+    volumes:
+      - ./backend:/data/backend
+    environment:
+      - FLASK_APP=app.py
+      - FLASK_ENV=development
+      - FLASK_DEBUG=0
+      - FLASK_RUN_PORT=5000
+    networks:
+      - net
+    depends_on:
+      - frontend
+
 networks:
   net:
     driver: bridge
diff --git a/frontend/logs/nginx/access.log b/frontend/logs/nginx/access.log
index 7926e49..b657bb1 100644
--- a/frontend/logs/nginx/access.log
+++ b/frontend/logs/nginx/access.log
@@ -33,3 +33,17 @@
 172.22.0.1 - - [01/Feb/2022:15:22:18 +0000] "GET /favicon.ico HTTP/1.1" 502 559 "http://localhost/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.99 Safari/537.36"
 172.22.0.1 - - [01/Feb/2022:15:22:19 +0000] "GET / HTTP/1.1" 502 559 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.99 Safari/537.36"
 172.22.0.1 - - [01/Feb/2022:15:22:19 +0000] "GET /favicon.ico HTTP/1.1" 502 559 "http://localhost/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.99 Safari/537.36"
+172.28.0.1 - - [02/Feb/2022:08:44:58 +0000] "GET / HTTP/1.1" 200 2713 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 OPR/82.0.4227.50"
+172.28.0.1 - - [02/Feb/2022:08:44:59 +0000] "GET /runtime.aaedba49815d2ab0.js HTTP/1.1" 200 1066 "http://localhost/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 OPR/82.0.4227.50"
+172.28.0.1 - - [02/Feb/2022:08:44:59 +0000] "GET /polyfills.0cf80192f5858f6f.js HTTP/1.1" 200 37090 "http://localhost/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 OPR/82.0.4227.50"
+172.28.0.1 - - [02/Feb/2022:08:44:59 +0000] "GET /styles.f64087845b474dd2.css HTTP/1.1" 200 235504 "http://localhost/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 OPR/82.0.4227.50"
+172.28.0.1 - - [02/Feb/2022:08:44:59 +0000] "GET /main.100f2196b68e9ba2.js HTTP/1.1" 200 694159 "http://localhost/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 OPR/82.0.4227.50"
+172.28.0.1 - - [02/Feb/2022:08:44:59 +0000] "GET /assets/logo.png HTTP/1.1" 200 201990 "http://localhost/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 OPR/82.0.4227.50"
+172.28.0.1 - - [02/Feb/2022:08:45:01 +0000] "GET /styles.f64087845b474dd2.css HTTP/1.1" 304 0 "http://localhost/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 OPR/82.0.4227.50"
+172.28.0.1 - - [02/Feb/2022:08:45:52 +0000] "GET / HTTP/1.1" 200 2713 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 OPR/82.0.4227.50"
+172.28.0.1 - - [02/Feb/2022:08:45:52 +0000] "GET /runtime.aaedba49815d2ab0.js HTTP/1.1" 200 1066 "http://localhost/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 OPR/82.0.4227.50"
+172.28.0.1 - - [02/Feb/2022:08:45:52 +0000] "GET /polyfills.0cf80192f5858f6f.js HTTP/1.1" 200 37090 "http://localhost/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 OPR/82.0.4227.50"
+172.28.0.1 - - [02/Feb/2022:08:45:52 +0000] "GET /main.100f2196b68e9ba2.js HTTP/1.1" 200 694159 "http://localhost/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 OPR/82.0.4227.50"
+172.28.0.1 - - [02/Feb/2022:08:45:52 +0000] "GET /styles.f64087845b474dd2.css HTTP/1.1" 200 235504 "http://localhost/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 OPR/82.0.4227.50"
+172.28.0.1 - - [02/Feb/2022:08:45:52 +0000] "GET /assets/logo.png HTTP/1.1" 200 201990 "http://localhost/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 OPR/82.0.4227.50"
+172.28.0.1 - - [02/Feb/2022:08:45:52 +0000] "GET /favicon.ico HTTP/1.1" 200 948 "http://localhost/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 OPR/82.0.4227.50"