update compose

docker-compose.yml

@@ -1,12 +1,7 @@
 services:
-
   mysql:
     image: mysql:8.4
     container_name: gameovergne-mysql
-    networks:
-      - gameovergne-app-network
-    ports:
-      - "3366:3306"
     environment:
       MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: gameovergne_app
@@ -14,38 +9,64 @@ services:
       MYSQL_PASSWORD: gameovergne
     volumes:
       - mysql-data:/var/lib/mysql
+    networks:
+      - gameovergne
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "127.0.0.1", "-u", "root", "-proot"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+    restart: unless-stopped
 
   spring:
-    depends_on:
+    image: registry.unifihomenetwork.com/gameovergne-api:dev-latest
-      - mysql
-    build:
-      context: ./api
-      dockerfile: Dockerfile
     container_name: gameovergne-api
-    networks:
+    depends_on:
-      - gameovergne-app-network
+      mysql:
-    ports:
+        condition: service_healthy
-      - "8888:8080"
     environment:
-      - SPRING_IMAGE_NAME=gameovergne-api
+      SPRING_DATASOURCE_URL: jdbc:mysql://mysql:3306/gameovergne_app?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC
-      - IMAGE_TAG=latest
+      SPRING_DATASOURCE_USERNAME: gameovergne
+      SPRING_DATASOURCE_PASSWORD: gameovergne
+    networks:
+      - gameovergne
+      - traefik
+    restart: unless-stopped
+    labels:
+      - traefik.enable=true
+      - traefik.docker.network=traefik
+      - traefik.http.routers.gameovergne-api.rule=Host(`dev.unifihomenetwork.com`) && PathPrefix(`/gameovergne-api`)
+      - traefik.http.routers.gameovergne-api.entrypoints=edge
+      - traefik.http.routers.gameovergne-api.middlewares=gameovergne-api-stripprefix
+      - traefik.http.services.gameovergne-api.loadbalancer.server.port=8080
+      - traefik.http.middlewares.gameovergne-api-stripprefix.stripprefix.prefixes=/gameovergne-api
 
   angular:
-    build:
+    image: registry.unifihomenetwork.com/gameovergne-client:dev-latest
-      context: ./client
-      dockerfile: Dockerfile
-    networks:
-      - gameovergne-app-network
     container_name: gameovergne-client
-    ports:
+    depends_on:
-      - "4200:4200"
+      - spring
-    environment:
+    networks:
-      - ANGULAR_IMAGE_NAME=gameovergne-client
+      - gameovergne
-      - IMAGE_TAG=latest
+      - traefik
+    restart: unless-stopped
+    labels:
+      - traefik.enable=true
+      - traefik.docker.network=traefik
+      - traefik.http.routers.gameovergne-client.rule=Host(`dev.unifihomenetwork.com`) && (Path(`/gameovergne`) || PathPrefix(`/gameovergne/`))
+      - traefik.http.routers.gameovergne-client.entrypoints=edge
+      - traefik.http.routers.gameovergne-client.middlewares=gameovergne-slash,gameovergne-client-stripprefix
+      - traefik.http.services.gameovergne-client.loadbalancer.server.port=4200
+      - traefik.http.middlewares.gameovergne-slash.redirectregex.regex=^(.*/gameovergne)$
+      - traefik.http.middlewares.gameovergne-slash.redirectregex.replacement=$${1}/
+      - traefik.http.middlewares.gameovergne-slash.redirectregex.permanent=true
+      - traefik.http.middlewares.gameovergne-client-stripprefix.stripprefix.prefixes=/gameovergne
 
 networks:
-  gameovergne-app-network:
+  traefik:
     external: true
+  gameovergne:
+    external: false
+
 volumes:
   mysql-data:
-    external: true