Compare commits

..

No commits in common. "73cea67d85196c23d0e5152e0ba2d1115ff7fb34" and "1a578aba1bf3a44df0bbcaa3f4063710a0d6e1aa" have entirely different histories.

View File

@ -21,7 +21,6 @@ services:
- collabry - collabry
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.docker.network=collabry"
- "traefik.http.services.alabuga-backend.loadbalancer.server.port=8000" - "traefik.http.services.alabuga-backend.loadbalancer.server.port=8000"
- "traefik.http.routers.alabuga-backend.service=alabuga-backend" - "traefik.http.routers.alabuga-backend.service=alabuga-backend"
- "traefik.http.routers.alabuga-backend.rule=Host(`${ALABUGA_API_DOMAIN}`)" - "traefik.http.routers.alabuga-backend.rule=Host(`${ALABUGA_API_DOMAIN}`)"
@ -41,12 +40,13 @@ services:
networks: networks:
- app-network - app-network
- collabry - collabry
ports:
- '3000:3000'
command: npm run dev -- --hostname 0.0.0.0 --port 3000 command: npm run dev -- --hostname 0.0.0.0 --port 3000
depends_on: depends_on:
- backend - backend
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.docker.network=collabry"
# - "traefik.http.services.alabuga-frontend.loadbalancer.server.port=3000" # - "traefik.http.services.alabuga-frontend.loadbalancer.server.port=3000"
# - "traefik.http.routers.alabuga-frontend.service=alabuga-frontend" # - "traefik.http.routers.alabuga-frontend.service=alabuga-frontend"
# - "traefik.http.routers.alabuga-frontend.rule=Host(`${ALABUGA_DOMAIN}`)" # - "traefik.http.routers.alabuga-frontend.rule=Host(`${ALABUGA_DOMAIN}`)"
@ -57,6 +57,7 @@ services:
- "traefik.http.middlewares.alabuga-frontend.redirectregex.replacement=https://alabuga.hchm.ru$$1" - "traefik.http.middlewares.alabuga-frontend.redirectregex.replacement=https://alabuga.hchm.ru$$1"
- "traefik.http.middlewares.alabuga-frontend.redirectregex.permanent=true" - "traefik.http.middlewares.alabuga-frontend.redirectregex.permanent=true"
# Роутер
- "traefik.http.routers.alabuga-frontend.rule=Host(`${ALABUGA_DOMAIN}`)" - "traefik.http.routers.alabuga-frontend.rule=Host(`${ALABUGA_DOMAIN}`)"
- "traefik.http.routers.alabuga-frontend.entrypoints=web" - "traefik.http.routers.alabuga-frontend.entrypoints=web"
- "traefik.http.routers.alabuga-frontend.middlewares=redirect-alabuga" - "traefik.http.routers.alabuga-frontend.middlewares=redirect-alabuga"