Merge remote-tracking branch 'refs/remotes/origin/Etape1' into Etape1

dockercompose/docker-compose.yml

@@ -16,10 +16,6 @@ services:
     build:
       context: ..
       dockerfile: dockerfiles/front/Dockerfile
-
-    ports:
-      - "5000:5000"
-      - "5080:80"
     volumes:
       - ../doodlestudent/front:/app
     environment:

nginx.conf

@@ -17,15 +17,6 @@ server {
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header Connection "";
     }
-    location /web/ {
-        proxy_pass http://front:5080/;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header Connection "";
-    }
     location /pad/ {
         proxy_pass http://etherpad:9001/;
         proxy_http_version 1.1;
@@ -39,6 +30,12 @@ server {
     # FrontEnd returns
     ##########################
     location / {
-        try_files $uri $uri/ /index.html;
+        proxy_pass http://front:80/;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Connection "";
     }
 }