configs: Update scripts and config for new ui

docker-compose.yml

@@ -13,7 +13,7 @@ services:
       - MYSQL_USER=fic
       - MYSQL_PASSWORD=fic
 
-  fic-admin:
+  admin:
     build:
       context: .
       dockerfile: Dockerfile-admin
@@ -39,7 +39,7 @@ services:
       - MYSQL_HOST=mysql
       - FICCA_PASS
 
-  fic-backend:
+  backend:
     build:
       context: .
       dockerfile: Dockerfile-backend
@@ -58,7 +58,7 @@ services:
     environment:
       - MYSQL_HOST=mysql
 
-  fic-qa:
+  qa:
     build:
       context: .
       dockerfile: Dockerfile-qa
@@ -77,7 +77,7 @@ services:
     environment:
       - MYSQL_HOST=mysql
 
-  fic-frontend:
+  frontend:
     build:
       context: .
       dockerfile: Dockerfile-frontend
@@ -95,9 +95,9 @@ services:
       - submissions:/srv/submissions
       - startingblock:/srv/startingblock
     depends_on:
-      - fic-backend
+      - backend
 
-  fic-dashboard:
+  dashboard:
     build:
       context: .
       dockerfile: Dockerfile-dashboard
@@ -112,26 +112,29 @@ services:
       - teams:/srv/TEAMS:ro
       - settings:/srv/SETTINGS:ro
     depends_on:
-      - fic-backend
+      - backend
 
   front:
-    image: nginx:latest
+    build:
+      context: .
+      dockerfile: Dockerfile-nginx
+    image: nemunaire/fic-nginx:latest
     ports:
       - "8042:80"
     networks:
       - fic-net
     volumes:
       - /mnt/fic:/mnt/fic:ro
-      - ./configs/nginx-frontend-htpasswd.conf:/etc/nginx/conf.d/default.conf:ro
-      - ./configs/nginx-fic.conf:/etc/nginx/auth.conf:ro
-      - htdocs:/srv/htdocs-frontend:ro
       - files:/srv/FILES:ro
       - settings:/srv/SETTINGS:ro
       - teams:/srv/TEAMS:ro
       - startingblock:/srv/startingblock:ro
     depends_on:
-      - fic-frontend
-      - fic-admin
+      - qa
+      - frontend
+      - dashboard
+      - backend
+      - admin
 
 volumes:
   mysql-data: