diff --git a/docker-compose.yml b/docker-compose.yml index 0ceda80..17b893c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.9" - services: mysql: image: mysql:8.4 @@ -9,11 +7,10 @@ services: MYSQL_DATABASE: gameovergne_app MYSQL_USER: gameovergne MYSQL_PASSWORD: gameovergne - # 🔒 Persistant + accessible depuis l'extérieur volumes: - ./mysql-data:/var/lib/mysql ports: - - "3366:3306" # pour te connecter depuis ton Mac / un client SQL + - "3366:3306" networks: - gameovergne restart: unless-stopped @@ -35,16 +32,14 @@ services: SPRING_DATASOURCE_PASSWORD: gameovergne PRESTASHOP_API_KEY: 2AQPG13MJ8X117U6FJ5NGHPS93HE34AB SERVER_PORT: 3000 - # pense bien à avoir prestashop.base-url / prestashop.basic-auth dans application.properties ou via env si besoin networks: - - gameovergne - traefik + - gameovergne restart: unless-stopped labels: - traefik.enable=true - traefik.docker.network=traefik - - # API sous /gameovergne-api + - traefik.http.routers.gameovergne-api.rule=Host(`dev.vincent-guillet.fr`) && PathPrefix(`/gameovergne-api`) - traefik.http.routers.gameovergne-api.entrypoints=edge - traefik.http.routers.gameovergne-api.service=gameovergne-api @@ -65,24 +60,19 @@ services: - traefik.enable=true - traefik.docker.network=traefik - # 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.entrypoints=edge - traefik.http.routers.gameovergne-client.service=gameovergne-client - traefik.http.routers.gameovergne-client.middlewares=gameovergne-slash,gameovergne-client-stripprefix - # Redirige /gameovergne vers /gameovergne/ - traefik.http.middlewares.gameovergne-slash.redirectregex.regex=^https?://([^/]+)/gameovergne$$ - traefik.http.middlewares.gameovergne-slash.redirectregex.replacement=https://$${1}/gameovergne/ - traefik.http.middlewares.gameovergne-slash.redirectregex.permanent=true - # Enlève /gameovergne avant d'envoyer vers Nginx (le conteneur Angular) - traefik.http.middlewares.gameovergne-client-stripprefix.stripprefix.prefixes=/gameovergne - # Service vers Nginx (port 80 dans le conteneur) - traefik.http.services.gameovergne-client.loadbalancer.server.port=80 - # Proxy Presta via /gameovergne/ps -> même service, même StripPrefix - traefik.http.routers.gameovergne-ps.rule=Host(`dev.vincent-guillet.fr`) && PathPrefix(`/gameovergne/ps`) - traefik.http.routers.gameovergne-ps.entrypoints=edge - traefik.http.routers.gameovergne-ps.service=gameovergne-client @@ -92,4 +82,4 @@ networks: traefik: external: true gameovergne: - driver: bridge \ No newline at end of file + external: true \ No newline at end of file