fix conflicts

This commit is contained in:
Mael G. 2025-01-06 21:10:56 +01:00
parent 27e8dc5830
commit fff7b70527
2 changed files with 2 additions and 2 deletions
compute-1-mep/wiki
internals/woodpecker

View file

@ -7,7 +7,7 @@ services:
image: git.gnous.eu/gnouseu/wiki:v3 image: git.gnous.eu/gnouseu/wiki:v3
restart: unless-stopped restart: unless-stopped
ports: ports:
- "3005:80" - "3010:80"
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.wiki.entryPoints=websecure" - "traefik.http.routers.wiki.entryPoints=websecure"

View file

@ -53,7 +53,7 @@ services:
- "traefik.http.routers.woodpecker-grpc-secure.entrypoints=websecure" - "traefik.http.routers.woodpecker-grpc-secure.entrypoints=websecure"
- "traefik.http.routers.woodpecker-grpc-secure.service=woodpecker-grpc" - "traefik.http.routers.woodpecker-grpc-secure.service=woodpecker-grpc"
- "traefik.http.routers.woodpecker-grpc.middlewares=woodpecker-grpc-redirect@docker" - "traefik.http.routers.woodpecker-grpc.middlewares=woodpecker-grpc-redirect@docker"
- "traefik.http.routers.gnousdoteu.middlewares=proxyHeader@file,proxyError@file" - "traefik.http.routers.woodpecker-grpc.middlewares=proxyHeader@file,proxyError@file"
depends_on: depends_on:
- db - db