Update docker-compose.yml
This commit is contained in:
@@ -28,6 +28,8 @@ services:
|
|||||||
SPRING_DATASOURCE_URL: jdbc:mysql://mysql:3306/gameovergne_app?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC
|
SPRING_DATASOURCE_URL: jdbc:mysql://mysql:3306/gameovergne_app?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC
|
||||||
SPRING_DATASOURCE_USERNAME: gameovergne
|
SPRING_DATASOURCE_USERNAME: gameovergne
|
||||||
SPRING_DATASOURCE_PASSWORD: gameovergne
|
SPRING_DATASOURCE_PASSWORD: gameovergne
|
||||||
|
# IMPORTANT : Spring doit écouter sur 3000
|
||||||
|
SERVER_PORT: 3000
|
||||||
networks:
|
networks:
|
||||||
- gameovergne
|
- gameovergne
|
||||||
- traefik
|
- traefik
|
||||||
@@ -45,7 +47,7 @@ services:
|
|||||||
- traefik.http.middlewares.gameovergne-api-stripprefix.stripprefix.prefixes=/gameovergne-api
|
- traefik.http.middlewares.gameovergne-api-stripprefix.stripprefix.prefixes=/gameovergne-api
|
||||||
|
|
||||||
angular:
|
angular:
|
||||||
image: registry.vincent-guillet.fr/gameovergne-client:dev-latest
|
image: registry.vincent-guillet.fr/gameovergne-client:dev-ngserve
|
||||||
container_name: gameovergne-client
|
container_name: gameovergne-client
|
||||||
depends_on:
|
depends_on:
|
||||||
- spring
|
- spring
|
||||||
@@ -57,21 +59,28 @@ services:
|
|||||||
- traefik.enable=true
|
- traefik.enable=true
|
||||||
- traefik.docker.network=traefik
|
- traefik.docker.network=traefik
|
||||||
|
|
||||||
# FRONT sous /gameovergne
|
# FRONT sous /gameovergne (avec et sans slash final)
|
||||||
- traefik.http.routers.gameovergne-client.rule=Host(`dev.vincent-guillet.fr`) && (Path(`/gameovergne`) || PathPrefix(`/gameovergne/`))
|
- traefik.http.routers.gameovergne-client.rule=Host(`dev.vincent-guillet.fr`) && (Path(`/gameovergne`) || PathPrefix(`/gameovergne/`))
|
||||||
- traefik.http.routers.gameovergne-client.entrypoints=edge
|
- traefik.http.routers.gameovergne-client.entrypoints=edge
|
||||||
- traefik.http.routers.gameovergne-client.service=gameovergne-client
|
- traefik.http.routers.gameovergne-client.service=gameovergne-client
|
||||||
- traefik.http.services.gameovergne-client.loadbalancer.server.port=80
|
|
||||||
|
|
||||||
# Middleware : ajoute un "/" si on arrive sur /gameovergne sans slash
|
|
||||||
- traefik.http.routers.gameovergne-client.middlewares=gameovergne-slash,gameovergne-client-stripprefix
|
- traefik.http.routers.gameovergne-client.middlewares=gameovergne-slash,gameovergne-client-stripprefix
|
||||||
|
|
||||||
|
# Ajoute un "/" si on arrive sur /gameovergne sans slash
|
||||||
- traefik.http.middlewares.gameovergne-slash.redirectregex.regex=^(.*/gameovergne)$$
|
- traefik.http.middlewares.gameovergne-slash.redirectregex.regex=^(.*/gameovergne)$$
|
||||||
- traefik.http.middlewares.gameovergne-slash.redirectregex.replacement=$$1/
|
- traefik.http.middlewares.gameovergne-slash.redirectregex.replacement=$$1/
|
||||||
- traefik.http.middlewares.gameovergne-slash.redirectregex.permanent=true
|
- traefik.http.middlewares.gameovergne-slash.redirectregex.permanent=true
|
||||||
|
|
||||||
# Ensuite on enlève le préfixe /gameovergne avant d'envoyer à Nginx
|
# Enlève /gameovergne avant d'envoyer vers Angular (dev server)
|
||||||
- traefik.http.middlewares.gameovergne-client-stripprefix.stripprefix.prefixes=/gameovergne
|
- traefik.http.middlewares.gameovergne-client-stripprefix.stripprefix.prefixes=/gameovergne
|
||||||
|
|
||||||
|
# Router pour /ps vers le même conteneur Angular (ng serve + proxy.conf.json)
|
||||||
|
- traefik.http.routers.gameovergne-ps.rule=Host(`dev.vincent-guillet.fr`) && PathPrefix(`/ps`)
|
||||||
|
- traefik.http.routers.gameovergne-ps.entrypoints=edge
|
||||||
|
- traefik.http.routers.gameovergne-ps.service=gameovergne-client
|
||||||
|
|
||||||
|
# UN SEUL port déclaré pour ce service (4200, ng serve)
|
||||||
|
- traefik.http.services.gameovergne-client.loadbalancer.server.port=4200
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
traefik:
|
traefik:
|
||||||
external: true
|
external: true
|
||||||
|
|||||||
Reference in New Issue
Block a user