From fff7b7052784e9e99f98eb3ef24f9bbb190e8264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gramain?= <mael@enpls.org>
Date: Mon, 6 Jan 2025 21:10:56 +0100
Subject: [PATCH] fix conflicts
---
compute-1-mep/wiki/docker-compose.yaml | 2 +-
internals/woodpecker/docker-compose.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/compute-1-mep/wiki/docker-compose.yaml b/compute-1-mep/wiki/docker-compose.yaml
index d9edbef..9e0d7fd 100644
--- a/compute-1-mep/wiki/docker-compose.yaml
+++ b/compute-1-mep/wiki/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
image: git.gnous.eu/gnouseu/wiki:v3
restart: unless-stopped
ports:
- - "3005:80"
+ - "3010:80"
labels:
- "traefik.enable=true"
- "traefik.http.routers.wiki.entryPoints=websecure"
diff --git a/internals/woodpecker/docker-compose.yaml b/internals/woodpecker/docker-compose.yaml
index 2ae2e57..b719bf2 100644
--- a/internals/woodpecker/docker-compose.yaml
+++ b/internals/woodpecker/docker-compose.yaml
@@ -53,7 +53,7 @@ services:
- "traefik.http.routers.woodpecker-grpc-secure.entrypoints=websecure"
- "traefik.http.routers.woodpecker-grpc-secure.service=woodpecker-grpc"
- "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:
- db