From 9d3ae3933e06bcc9d6ba6cf6fd893a1457acbd28 Mon Sep 17 00:00:00 2001
From: Renovate bot <renovate@gnous.eu>
Date: Tue, 25 Feb 2025 07:22:01 +0000
Subject: [PATCH 01/17] Update ghcr.io/renovatebot/renovate Docker tag to
v39.180.2
---
compute-1-mep/renovate/docker-compose.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compute-1-mep/renovate/docker-compose.yaml b/compute-1-mep/renovate/docker-compose.yaml
index 7a0e759..2b9b08a 100644
--- a/compute-1-mep/renovate/docker-compose.yaml
+++ b/compute-1-mep/renovate/docker-compose.yaml
@@ -4,7 +4,7 @@ networks:
services:
renovate:
- image: ghcr.io/renovatebot/renovate:39.170.2-full
+ image: ghcr.io/renovatebot/renovate:39.180.2-full
restart: always
environment:
- LOG_LEVEL=info
From 1f11caa41349f94828b00e2399c32b6731e20d12 Mon Sep 17 00:00:00 2001
From: Renovate bot <renovate@gnous.eu>
Date: Wed, 26 Feb 2025 12:32:54 +0000
Subject: [PATCH 02/17] Update gitlab/gitlab-ce Docker tag to v17.9.1
---
compute-2-mep/gitlab/docker-compose.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compute-2-mep/gitlab/docker-compose.yaml b/compute-2-mep/gitlab/docker-compose.yaml
index e4a9b5b..4ac71ea 100644
--- a/compute-2-mep/gitlab/docker-compose.yaml
+++ b/compute-2-mep/gitlab/docker-compose.yaml
@@ -12,7 +12,7 @@ volumes:
services:
gitlab:
- image: gitlab/gitlab-ce:17.9.0-ce.0
+ image: gitlab/gitlab-ce:17.9.1-ce.0
container_name: gitlab
restart: always
hostname: "gitlab.gnous.eu"
From 427cedd743dce2a2eaceadb249fe9bc14fc0f850 Mon Sep 17 00:00:00 2001
From: Renovate bot <renovate@gnous.eu>
Date: Wed, 26 Feb 2025 18:53:54 +0000
Subject: [PATCH 03/17] Update ghcr.io/renovatebot/renovate Docker tag to
v39.182.3
---
compute-1-mep/renovate/docker-compose.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compute-1-mep/renovate/docker-compose.yaml b/compute-1-mep/renovate/docker-compose.yaml
index 2b9b08a..0020d1c 100644
--- a/compute-1-mep/renovate/docker-compose.yaml
+++ b/compute-1-mep/renovate/docker-compose.yaml
@@ -4,7 +4,7 @@ networks:
services:
renovate:
- image: ghcr.io/renovatebot/renovate:39.180.2-full
+ image: ghcr.io/renovatebot/renovate:39.182.3-full
restart: always
environment:
- LOG_LEVEL=info
From f93bc34b2551efb91aa7c4381596b0db77daf54e Mon Sep 17 00:00:00 2001
From: Renovate bot <renovate@gnous.eu>
Date: Wed, 26 Feb 2025 21:34:10 +0000
Subject: [PATCH 04/17] Update woodpeckerci/woodpecker-server Docker tag to
v3.2.0
---
compute-2-mep/woodpecker/docker-compose.yaml | 2 +-
internals/woodpecker/docker-compose.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/compute-2-mep/woodpecker/docker-compose.yaml b/compute-2-mep/woodpecker/docker-compose.yaml
index 0b9041d..cb97bfb 100644
--- a/compute-2-mep/woodpecker/docker-compose.yaml
+++ b/compute-2-mep/woodpecker/docker-compose.yaml
@@ -9,7 +9,7 @@ volumes:
services:
server:
- image: woodpeckerci/woodpecker-server:v3.1.0
+ image: woodpeckerci/woodpecker-server:v3.2.0
container_name: woodpecker_server
environment:
- WOODPECKER_OPEN=true
diff --git a/internals/woodpecker/docker-compose.yaml b/internals/woodpecker/docker-compose.yaml
index 7cbd98b..713dc50 100644
--- a/internals/woodpecker/docker-compose.yaml
+++ b/internals/woodpecker/docker-compose.yaml
@@ -10,7 +10,7 @@ volumes:
services:
server:
- image: woodpeckerci/woodpecker-server:v3.1.0
+ image: woodpeckerci/woodpecker-server:v3.2.0
container_name: woodpecker_server
environment:
- WOODPECKER_OPEN=false
From 7255187b96cb397fe5425d46d1525741da172538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gramain?= <mael@enpls.org>
Date: Sun, 2 Mar 2025 16:53:18 +0100
Subject: [PATCH 05/17] Drop cert resolvers
---
compute-1-mep/forgejo/docker-compose.yaml | 1 -
compute-1-mep/freshrss/docker-compose.yaml | 1 -
compute-1-mep/haste/docker-compose.yaml | 1 -
compute-1-mep/searx/docker-compose.yaml | 1 -
compute-1-mep/wallabag/docker-compose.yaml | 1 -
compute-1-mep/wiki/docker-compose.yaml | 1 -
compute-2-mep/gitlab/docker-compose.yaml | 2 --
compute-2-mep/gnous_frontend/docker-compose.yaml | 1 -
compute-2-mep/mastodon/docker-compose.yaml | 3 ---
compute-2-mep/vaultwarden/docker-compose.yaml | 1 -
compute-2-mep/woodpecker/docker-compose.yaml | 2 --
internals/komodo/docker-compose.yaml | 1 -
internals/semaphore/docker-compose.yaml | 1 -
internals/wikijs/docker-compose.yaml | 1 -
internals/woodpecker/docker-compose.yaml | 2 --
15 files changed, 20 deletions(-)
diff --git a/compute-1-mep/forgejo/docker-compose.yaml b/compute-1-mep/forgejo/docker-compose.yaml
index c9d6469..3d0edcb 100644
--- a/compute-1-mep/forgejo/docker-compose.yaml
+++ b/compute-1-mep/forgejo/docker-compose.yaml
@@ -71,7 +71,6 @@ services:
- "traefik.http.services.forgejo-service-gnous.loadbalancer.server.port=3001"
- "traefik.http.routers.forgejognous.rule=(Host(`git.gnous.eu`) && !Path(`/metrics`))"
- "traefik.http.routers.forgejognous.tls=true"
- - "traefik.http.routers.forgejognous.tls.certresolver=defaultacme"
- "traefik.http.routers.forgejognous.entrypoints=websecure"
- "traefik.http.routers.forgejognous.service=forgejo-service-gnous"
- "traefik.http.routers.forgejognous.middlewares=proxyHeader@file,proxyError@file"
diff --git a/compute-1-mep/freshrss/docker-compose.yaml b/compute-1-mep/freshrss/docker-compose.yaml
index 29c954c..9c852a2 100644
--- a/compute-1-mep/freshrss/docker-compose.yaml
+++ b/compute-1-mep/freshrss/docker-compose.yaml
@@ -26,7 +26,6 @@ services:
- "traefik.http.routers.freshrss.entryPoints=websecure"
- "traefik.http.routers.freshrss.rule=Host(`rss.gnous.eu`)"
- "traefik.http.routers.freshrss.tls=true"
- - "traefik.http.routers.freshrss.tls.certresolver=defaultacme"
- "traefik.http.routers.freshrss.middlewares=proxyHeader@file,proxyError@file"
env_file:
- path: .env
diff --git a/compute-1-mep/haste/docker-compose.yaml b/compute-1-mep/haste/docker-compose.yaml
index a7ff82c..1f3a557 100644
--- a/compute-1-mep/haste/docker-compose.yaml
+++ b/compute-1-mep/haste/docker-compose.yaml
@@ -19,7 +19,6 @@ services:
- "traefik.http.routers.gnoushaste.entryPoints=websecure"
- "traefik.http.routers.gnoushaste.rule=Host(`haste.gnous.eu`)"
- "traefik.http.routers.gnoushaste.tls=true"
- - "traefik.http.routers.gnoushaste.tls.certresolver=defaultacme"
- "traefik.http.routers.gnoushaste.middlewares=proxyHeader@file,proxyError@file"
env_file:
- path: .env
diff --git a/compute-1-mep/searx/docker-compose.yaml b/compute-1-mep/searx/docker-compose.yaml
index a8c8dab..a1863fb 100644
--- a/compute-1-mep/searx/docker-compose.yaml
+++ b/compute-1-mep/searx/docker-compose.yaml
@@ -36,7 +36,6 @@ services:
- "traefik.http.routers.searx.entryPoints=websecure"
- "traefik.http.routers.searx.rule=Host(`searx.gnous.eu`)"
- "traefik.http.routers.searx.tls=true"
- - "traefik.http.routers.searx.tls.certresolver=defaultacme"
- "traefik.http.routers.searx.middlewares=proxyHeader@file,proxyError@file"
redis:
image: "redis:7.4-alpine"
diff --git a/compute-1-mep/wallabag/docker-compose.yaml b/compute-1-mep/wallabag/docker-compose.yaml
index 52fb18a..44b443b 100644
--- a/compute-1-mep/wallabag/docker-compose.yaml
+++ b/compute-1-mep/wallabag/docker-compose.yaml
@@ -49,7 +49,6 @@ services:
- "traefik.http.services.wallabag-service-gnous.loadbalancer.server.port=3009"
- "traefik.http.routers.wallabaggnous.rule=Host(`bag.gnous.eu`)"
- "traefik.http.routers.wallabaggnous.tls=true"
- - "traefik.http.routers.wallabaggnous.tls.certresolver=defaultacme"
- "traefik.http.routers.wallabaggnous.entrypoints=websecure"
- "traefik.http.routers.wallabaggnous.service=wallabag-service-gnous"
- "traefik.http.routers.wallabaggnous.middlewares=proxyHeader@file,proxyError@file"
diff --git a/compute-1-mep/wiki/docker-compose.yaml b/compute-1-mep/wiki/docker-compose.yaml
index 9e0d7fd..5b54095 100644
--- a/compute-1-mep/wiki/docker-compose.yaml
+++ b/compute-1-mep/wiki/docker-compose.yaml
@@ -13,6 +13,5 @@ services:
- "traefik.http.routers.wiki.entryPoints=websecure"
- "traefik.http.routers.wiki.rule=Host(`wiki.gnous.eu`)"
- "traefik.http.routers.wiki.tls=true"
- - "traefik.http.routers.wiki.tls.certresolver=defaultacme"
- "traefik.http.routers.wiki.middlewares=proxyHeader@file,proxyError@file"
diff --git a/compute-2-mep/gitlab/docker-compose.yaml b/compute-2-mep/gitlab/docker-compose.yaml
index 4ac71ea..974afc4 100644
--- a/compute-2-mep/gitlab/docker-compose.yaml
+++ b/compute-2-mep/gitlab/docker-compose.yaml
@@ -49,7 +49,6 @@ services:
- "traefik.http.services.gitlab-gnous.loadbalancer.server.port=3005"
- "traefik.http.routers.gitlabgnous.rule=Host(`gitlab.gnous.eu`)"
- "traefik.http.routers.gitlabgnous.tls=true"
- - "traefik.http.routers.gitlabgnous.tls.certresolver=defaultacme"
- "traefik.http.routers.gitlabgnous.entrypoints=websecure"
- "traefik.http.routers.gitlabgnous.service=gitlab-gnous"
- "traefik.http.routers.gitlabgnous.middlewares=proxyHeader@file,proxyError@file"
@@ -57,7 +56,6 @@ services:
- "traefik.http.services.registry-gnous.loadbalancer.server.port=3006"
- "traefik.http.routers.registrygnous.rule=Host(`pkg.gnous.eu`)"
- "traefik.http.routers.registrygnous.tls=true"
- - "traefik.http.routers.registrygnous.tls.certresolver=defaultacme"
- "traefik.http.routers.registrygnous.entrypoints=websecure"
- "traefik.http.routers.registrygnous.service=registry-gnous"
- "traefik.http.routers.registrygnous.middlewares=proxyHeader@file,proxyError@file"
diff --git a/compute-2-mep/gnous_frontend/docker-compose.yaml b/compute-2-mep/gnous_frontend/docker-compose.yaml
index 0f61b8b..930ac7a 100644
--- a/compute-2-mep/gnous_frontend/docker-compose.yaml
+++ b/compute-2-mep/gnous_frontend/docker-compose.yaml
@@ -14,5 +14,4 @@ services:
- "traefik.http.routers.gnousdoteu.entryPoints=websecure"
- "traefik.http.routers.gnousdoteu.rule=Host(`gnous.eu`)"
- "traefik.http.routers.gnousdoteu.tls=true"
- - "traefik.http.routers.gnousdoteu.tls.certresolver=defaultacme"
- "traefik.http.routers.gnousdoteu.middlewares=proxyHeader@file,proxyError@file"
diff --git a/compute-2-mep/mastodon/docker-compose.yaml b/compute-2-mep/mastodon/docker-compose.yaml
index 8ed3fa9..ea257a1 100644
--- a/compute-2-mep/mastodon/docker-compose.yaml
+++ b/compute-2-mep/mastodon/docker-compose.yaml
@@ -34,7 +34,6 @@ services:
- "traefik.http.routers.mastodon-web.entrypoints=websecure"
- "traefik.http.routers.mastodon-web.rule=Host(`toot.gnous.eu`)"
- "traefik.http.routers.mastodon-web.tls=true"
- - "traefik.http.routers.mastodon-web.tls.certresolver=defaultacme"
- "traefik.http.routers.mastodon-web.middlewares=proxyHeader@file,proxyError@file"
# Cron
- "ofelia.enabled=true"
@@ -64,9 +63,7 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.mastodon-streaming.entrypoints=websecure"
- "traefik.http.routers.mastodon-streaming.rule=(Host(`toot.gnous.eu`) && PathPrefix(`/api/v1/streaming`))"
- - "traefik.http.routers.mastodon-streaming.tls.certresolver=letsencrypt"
- "traefik.http.routers.mastodon-streaming.tls=true"
- - "traefik.http.routers.mastodon-streaming.tls.certresolver=defaultacme"
- "traefik.http.routers.mastodon-streaming.middlewares=proxyHeader@file,proxyError@file"
sidekiq:
diff --git a/compute-2-mep/vaultwarden/docker-compose.yaml b/compute-2-mep/vaultwarden/docker-compose.yaml
index 264601b..3bbd32a 100644
--- a/compute-2-mep/vaultwarden/docker-compose.yaml
+++ b/compute-2-mep/vaultwarden/docker-compose.yaml
@@ -25,7 +25,6 @@ services:
- "traefik.http.routers.vaultwarden.entryPoints=websecure"
- "traefik.http.routers.vaultwarden.rule=Host(`pass.gnous.eu`)"
- "traefik.http.routers.vaultwarden.tls=true"
- - "traefik.http.routers.vaultwarden.tls.certresolver=defaultacme"
- "traefik.http.routers.vaultwarden.middlewares=proxyHeader@file,proxyError@file"
restart: always
volumes:
diff --git a/compute-2-mep/woodpecker/docker-compose.yaml b/compute-2-mep/woodpecker/docker-compose.yaml
index cb97bfb..078d677 100644
--- a/compute-2-mep/woodpecker/docker-compose.yaml
+++ b/compute-2-mep/woodpecker/docker-compose.yaml
@@ -41,7 +41,6 @@ services:
- "traefik.http.services.woodpecker-service-gnous.loadbalancer.server.port=4001"
- "traefik.http.routers.woodpeckergnous.rule=Host(`cicd.gnous.eu`)"
- "traefik.http.routers.woodpeckergnous.tls=true"
- - "traefik.http.routers.woodpeckergnous.tls.certresolver=defaultacme"
- "traefik.http.routers.woodpeckergnous.entrypoints=websecure"
- "traefik.http.routers.woodpeckergnous.service=woodpecker-service-gnous"
- "traefik.http.routers.woodpeckergnous.middlewares=proxyHeader@file,proxyError@file"
@@ -50,7 +49,6 @@ services:
- "traefik.http.services.woodpecker-grpc-gnous.loadbalancer.server.scheme=h2c"
- "traefik.http.routers.woodpecker-grpc-gnous.rule=Host(`grpc.cicd.gnous.eu`)"
- "traefik.http.routers.woodpecker-grpc-gnous.tls=true"
- - "traefik.http.routers.woodpecker-grpc-gnous.tls.certresolver=defaultacme"
- "traefik.http.routers.woodpecker-grpc-gnous.entrypoints=websecure"
- "traefik.http.routers.woodpecker-grpc-gnous.service=woodpecker-grpc-gnous"
- "traefik.http.routers.woodpecker-grpc-gnous.middlewares=woodpecker-grpc-redirect@docker"
diff --git a/internals/komodo/docker-compose.yaml b/internals/komodo/docker-compose.yaml
index 9bec574..61ead34 100644
--- a/internals/komodo/docker-compose.yaml
+++ b/internals/komodo/docker-compose.yaml
@@ -43,7 +43,6 @@ services:
- "traefik.http.routers.komodo.entryPoints=websecure"
- "traefik.http.routers.komodo.rule=Host(`deploy.net.enpls.org`)"
- "traefik.http.routers.komodo.tls=true"
- - "traefik.http.routers.komodo.tls.certresolver=defaultacme"
- "traefik.http.routers.komodo.middlewares=proxyHeader@file,proxyError@file"
- "komodo.skip:"
diff --git a/internals/semaphore/docker-compose.yaml b/internals/semaphore/docker-compose.yaml
index 6fcfb7e..65a0e5a 100644
--- a/internals/semaphore/docker-compose.yaml
+++ b/internals/semaphore/docker-compose.yaml
@@ -32,7 +32,6 @@ services:
- "traefik.http.services.semaphore-service.loadbalancer.server.port=8085"
- "traefik.http.routers.semaphore.rule=Host(`semaphore.net.enpls.org`)"
- "traefik.http.routers.semaphore.tls=true"
- - "traefik.http.routers.semaphore.tls.certresolver=defaultacme"
- "traefik.http.routers.semaphore.entrypoints=websecure"
- "traefik.http.routers.semaphore.service=semaphore-service"
- "traefik.http.routers.semaphore.middlewares=proxyHeader@file,proxyError@file"
diff --git a/internals/wikijs/docker-compose.yaml b/internals/wikijs/docker-compose.yaml
index 9da6f4d..82bd133 100644
--- a/internals/wikijs/docker-compose.yaml
+++ b/internals/wikijs/docker-compose.yaml
@@ -27,7 +27,6 @@ services:
- "traefik.http.routers.wikijs.entryPoints=websecure"
- "traefik.http.routers.wikijs.rule=Host(`doc.net.enpls.org`)"
- "traefik.http.routers.wikijs.tls=true"
- - "traefik.http.routers.wikijs.tls.certresolver=defaultacme"
- "traefik.http.routers.wikijs.middlewares=proxyHeader@file,proxyError@file"
volumes:
diff --git a/internals/woodpecker/docker-compose.yaml b/internals/woodpecker/docker-compose.yaml
index 713dc50..17d187c 100644
--- a/internals/woodpecker/docker-compose.yaml
+++ b/internals/woodpecker/docker-compose.yaml
@@ -40,7 +40,6 @@ services:
- "traefik.http.services.woodpecker-service.loadbalancer.server.port=8083"
- "traefik.http.routers.woodpecker.rule=Host(`build.net.enpls.org`)"
- "traefik.http.routers.woodpecker.tls=true"
- - "traefik.http.routers.woodpecker.tls.certresolver=defaultacme"
- "traefik.http.routers.woodpecker.entrypoints=websecure"
- "traefik.http.routers.woodpecker.service=woodpecker-service"
- "traefik.http.routers.woodpecker.middlewares=proxyHeader@file,proxyError@file"
@@ -49,7 +48,6 @@ services:
- "traefik.http.services.woodpecker-grpc.loadbalancer.server.scheme=h2c"
- "traefik.http.routers.woodpecker-grpc-secure.rule=Host(`grpc.build.net.enpls.org`)"
- "traefik.http.routers.woodpecker-grpc-secure.tls=true"
- - "traefik.http.routers.woodpecker-grpc-secure.tls.certresolver=defaultacme"
- "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"
From 4de577b269c40294db1bf3485dd810e214a13bab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gramain?= <mael@enpls.org>
Date: Sun, 2 Mar 2025 17:03:02 +0100
Subject: [PATCH 06/17] update lb ip
---
compute-2-mep/gitlab/docker-compose.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compute-2-mep/gitlab/docker-compose.yaml b/compute-2-mep/gitlab/docker-compose.yaml
index 974afc4..1ba27cc 100644
--- a/compute-2-mep/gitlab/docker-compose.yaml
+++ b/compute-2-mep/gitlab/docker-compose.yaml
@@ -63,4 +63,4 @@ services:
- "traefik.tcp.routers.gitlabssh.entrypoints=sshgitlab"
- "traefik.tcp.routers.gitlabssh.rule=HostSNI(`*`)"
- "traefik.tcp.routers.gitlabssh.service=gitlab-ssh"
- - "traefik.tcp.services.gitlab-ssh.loadbalancer.server.port=3007"
+ - "traefik.tcp.services.gitlab-ssh.loadbalancer.server.address=gitlab:22"
\ No newline at end of file
From 19e1151e2e118b4d52318e92005366f3eed8a01a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gramain?= <mael@enpls.org>
Date: Sun, 2 Mar 2025 17:04:36 +0100
Subject: [PATCH 07/17] add buildx
---
internals/woodpecker/docker-compose.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/internals/woodpecker/docker-compose.yaml b/internals/woodpecker/docker-compose.yaml
index 17d187c..f2432ad 100644
--- a/internals/woodpecker/docker-compose.yaml
+++ b/internals/woodpecker/docker-compose.yaml
@@ -24,6 +24,7 @@ services:
- WOODPECKER_GITEA=true
- WOODPECKER_GITEA_URL=https://git.gnous.eu
- WOODPECKER_DATABASE_DRIVER=postgres
+ - WOODPECKER_PLUGINS_PRIVILEGED=woodpeckerci/plugin-docker-buildx:5.2
env_file:
- .env
restart: always
From dac4cfaed31147310669c5e38d1480db7b1c6605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gramain?= <mael@enpls.org>
Date: Sun, 2 Mar 2025 17:14:22 +0100
Subject: [PATCH 08/17] disable env requirements
---
cicd-worker-pub-mep/woodpecker-runner/docker-compose.yaml | 3 ++-
compute-1-mep/forgejo/docker-compose.yaml | 3 ++-
compute-1-mep/renovate/docker-compose.yaml | 3 ++-
compute-1-mep/traefik-kop/docker-compose.yaml | 3 ++-
compute-2-mep/traefik-kop/docker-compose.yaml | 3 ++-
internals/komodo/docker-compose.yaml | 3 +++
internals/semaphore/docker-compose.yaml | 6 ++++--
internals/traefik-kop/docker-compose.yaml | 3 ++-
internals/wikijs/docker-compose.yaml | 6 ++++--
internals/woodpecker-worker/docker-compose.yaml | 3 ++-
internals/woodpecker/docker-compose.yaml | 6 ++++--
11 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/cicd-worker-pub-mep/woodpecker-runner/docker-compose.yaml b/cicd-worker-pub-mep/woodpecker-runner/docker-compose.yaml
index 8e6f763..0c4c318 100644
--- a/cicd-worker-pub-mep/woodpecker-runner/docker-compose.yaml
+++ b/cicd-worker-pub-mep/woodpecker-runner/docker-compose.yaml
@@ -16,7 +16,8 @@ services:
- WOODPECKER_GRPC_SECURE=true
- WOODPECKER_GRPC_VERIFY=true
env_file:
- - .env
+ - path: .env
+ required: false
restart: always
volumes:
- agent:/etc/woodpecker
diff --git a/compute-1-mep/forgejo/docker-compose.yaml b/compute-1-mep/forgejo/docker-compose.yaml
index 3d0edcb..b520826 100644
--- a/compute-1-mep/forgejo/docker-compose.yaml
+++ b/compute-1-mep/forgejo/docker-compose.yaml
@@ -13,7 +13,8 @@ services:
restart: always
container_name: forgejo
env_file:
- - .env
+ - path: .env
+ required: false
environment:
- USER_UID=1000
- USER_GID=1000
diff --git a/compute-1-mep/renovate/docker-compose.yaml b/compute-1-mep/renovate/docker-compose.yaml
index 0020d1c..3c1e660 100644
--- a/compute-1-mep/renovate/docker-compose.yaml
+++ b/compute-1-mep/renovate/docker-compose.yaml
@@ -14,4 +14,5 @@ services:
- RENOVATE_GIT_AUTHOR=Renovate bot <renovate@gnous.eu>
- RENOVATE_TOKEN=${RENOVATE_TOKEN}
env_file:
- - .env
+ - path: .env
+ required: false
\ No newline at end of file
diff --git a/compute-1-mep/traefik-kop/docker-compose.yaml b/compute-1-mep/traefik-kop/docker-compose.yaml
index 9385059..0981c74 100644
--- a/compute-1-mep/traefik-kop/docker-compose.yaml
+++ b/compute-1-mep/traefik-kop/docker-compose.yaml
@@ -5,6 +5,7 @@ services:
volumes:
- /var/run/docker.sock:/var/run/docker.sock
env_file:
- - .env
+ - path: .env
+ required: false
environment:
- BIND_IP=10.100.2.2
diff --git a/compute-2-mep/traefik-kop/docker-compose.yaml b/compute-2-mep/traefik-kop/docker-compose.yaml
index f2aca06..d54de00 100644
--- a/compute-2-mep/traefik-kop/docker-compose.yaml
+++ b/compute-2-mep/traefik-kop/docker-compose.yaml
@@ -5,6 +5,7 @@ services:
volumes:
- /var/run/docker.sock:/var/run/docker.sock
env_file:
- - .env
+ - path: .env
+ required: false
environment:
- BIND_IP=10.100.2.3
diff --git a/internals/komodo/docker-compose.yaml b/internals/komodo/docker-compose.yaml
index 61ead34..583a01b 100644
--- a/internals/komodo/docker-compose.yaml
+++ b/internals/komodo/docker-compose.yaml
@@ -18,6 +18,7 @@ services:
env_file:
- path: ./core.env
- path: ./.env
+ required: false
core:
image: ghcr.io/mbecker20/komodo:${COMPOSE_KOMODO_IMAGE_TAG:-latest}
restart: unless-stopped
@@ -32,6 +33,7 @@ services:
env_file:
- path: ./core.env
- path: ./.env
+ required: false
environment:
KOMODO_DATABASE_ADDRESS: mongo:27017
KOMODO_DATABASE_USERNAME: ${DB_USERNAME}
@@ -58,6 +60,7 @@ services:
env_file:
- path: ./core.env
- path: ./.env
+ required: false
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /proc:/proc
diff --git a/internals/semaphore/docker-compose.yaml b/internals/semaphore/docker-compose.yaml
index 65a0e5a..603e8de 100644
--- a/internals/semaphore/docker-compose.yaml
+++ b/internals/semaphore/docker-compose.yaml
@@ -6,7 +6,8 @@ services:
volumes:
- db:/var/lib/postgresql/data
env_file:
- - .env
+ - path: .env
+ required: false
environment:
POSTGRES_USER: semaphore
POSTGRES_DB: semaphore
@@ -16,7 +17,8 @@ services:
- 8085:3000
image: semaphoreui/semaphore:v2.12.14
env_file:
- - .env
+ - path: .env
+ required: false
environment:
SEMAPHORE_DB_USER: semaphore
SEMAPHORE_DB_HOST: postgres
diff --git a/internals/traefik-kop/docker-compose.yaml b/internals/traefik-kop/docker-compose.yaml
index 1d7de67..69e9368 100644
--- a/internals/traefik-kop/docker-compose.yaml
+++ b/internals/traefik-kop/docker-compose.yaml
@@ -5,6 +5,7 @@ services:
volumes:
- /var/run/docker.sock:/var/run/docker.sock
env_file:
- - .env
+ - path: .env
+ required: false
environment:
- BIND_IP=10.100.2.5
diff --git a/internals/wikijs/docker-compose.yaml b/internals/wikijs/docker-compose.yaml
index 82bd133..f443f7b 100644
--- a/internals/wikijs/docker-compose.yaml
+++ b/internals/wikijs/docker-compose.yaml
@@ -2,7 +2,8 @@ services:
db:
image: postgres:14
env_file:
- - .env
+ - path: .env
+ required: false
logging:
driver: "none"
restart: unless-stopped
@@ -18,7 +19,8 @@ services:
DB_HOST: db
DB_PORT: 5432
env_file:
- - .env
+ - path: .env
+ required: false
restart: unless-stopped
ports:
- "8082:3000"
diff --git a/internals/woodpecker-worker/docker-compose.yaml b/internals/woodpecker-worker/docker-compose.yaml
index 9494964..72addfb 100644
--- a/internals/woodpecker-worker/docker-compose.yaml
+++ b/internals/woodpecker-worker/docker-compose.yaml
@@ -12,7 +12,8 @@ services:
- WOODPECKER_GRPC_SECURE=true
- WOODPECKER_GRPC_VERIFY=true
env_file:
- - .env
+ - path: .env
+ required: false
restart: always
volumes:
- agent:/etc/woodpecker
diff --git a/internals/woodpecker/docker-compose.yaml b/internals/woodpecker/docker-compose.yaml
index f2432ad..ced5016 100644
--- a/internals/woodpecker/docker-compose.yaml
+++ b/internals/woodpecker/docker-compose.yaml
@@ -26,7 +26,8 @@ services:
- WOODPECKER_DATABASE_DRIVER=postgres
- WOODPECKER_PLUGINS_PRIVILEGED=woodpeckerci/plugin-docker-buildx:5.2
env_file:
- - .env
+ - path: .env
+ required: false
restart: always
networks:
- woodpecker
@@ -60,7 +61,8 @@ services:
image: postgres:14-alpine
restart: always
env_file:
- - .env
+ - path: .env
+ required: false
networks:
- woodpecker
volumes:
From e5ba64d30edb3b5bfcf368326cab8cab42808365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gramain?= <mael@enpls.org>
Date: Sun, 2 Mar 2025 17:25:30 +0100
Subject: [PATCH 09/17] revert certresolver test
---
compute-1-mep/forgejo/docker-compose.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/compute-1-mep/forgejo/docker-compose.yaml b/compute-1-mep/forgejo/docker-compose.yaml
index b520826..b67fa34 100644
--- a/compute-1-mep/forgejo/docker-compose.yaml
+++ b/compute-1-mep/forgejo/docker-compose.yaml
@@ -72,6 +72,7 @@ services:
- "traefik.http.services.forgejo-service-gnous.loadbalancer.server.port=3001"
- "traefik.http.routers.forgejognous.rule=(Host(`git.gnous.eu`) && !Path(`/metrics`))"
- "traefik.http.routers.forgejognous.tls=true"
+ - "traefik.http.routers.forgejognous.tls.certresolver=default"
- "traefik.http.routers.forgejognous.entrypoints=websecure"
- "traefik.http.routers.forgejognous.service=forgejo-service-gnous"
- "traefik.http.routers.forgejognous.middlewares=proxyHeader@file,proxyError@file"
From 11bc6fbfcecb3ad9bc9aec7140df7ef67704333a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gramain?= <mael@enpls.org>
Date: Sun, 2 Mar 2025 17:35:05 +0100
Subject: [PATCH 10/17] reenable certresolver
---
compute-1-mep/freshrss/docker-compose.yaml | 1 +
compute-1-mep/haste/docker-compose.yaml | 1 +
compute-1-mep/searx/docker-compose.yaml | 1 +
compute-1-mep/wallabag/docker-compose.yaml | 1 +
compute-1-mep/wiki/docker-compose.yaml | 1 +
compute-2-mep/gitlab/docker-compose.yaml | 2 ++
compute-2-mep/gnous_frontend/docker-compose.yaml | 1 +
compute-2-mep/mastodon/docker-compose.yaml | 2 ++
compute-2-mep/vaultwarden/docker-compose.yaml | 1 +
compute-2-mep/woodpecker/docker-compose.yaml | 2 ++
internals/komodo/docker-compose.yaml | 1 +
internals/semaphore/docker-compose.yaml | 1 +
internals/wikijs/docker-compose.yaml | 1 +
internals/woodpecker/docker-compose.yaml | 2 ++
14 files changed, 18 insertions(+)
diff --git a/compute-1-mep/freshrss/docker-compose.yaml b/compute-1-mep/freshrss/docker-compose.yaml
index 9c852a2..172c772 100644
--- a/compute-1-mep/freshrss/docker-compose.yaml
+++ b/compute-1-mep/freshrss/docker-compose.yaml
@@ -26,6 +26,7 @@ services:
- "traefik.http.routers.freshrss.entryPoints=websecure"
- "traefik.http.routers.freshrss.rule=Host(`rss.gnous.eu`)"
- "traefik.http.routers.freshrss.tls=true"
+ - "traefik.http.routers.freshrss.tls.certresolver=default"
- "traefik.http.routers.freshrss.middlewares=proxyHeader@file,proxyError@file"
env_file:
- path: .env
diff --git a/compute-1-mep/haste/docker-compose.yaml b/compute-1-mep/haste/docker-compose.yaml
index 1f3a557..555aa02 100644
--- a/compute-1-mep/haste/docker-compose.yaml
+++ b/compute-1-mep/haste/docker-compose.yaml
@@ -19,6 +19,7 @@ services:
- "traefik.http.routers.gnoushaste.entryPoints=websecure"
- "traefik.http.routers.gnoushaste.rule=Host(`haste.gnous.eu`)"
- "traefik.http.routers.gnoushaste.tls=true"
+ - "traefik.http.routers.gnoushaste.tls.certresolver=default"
- "traefik.http.routers.gnoushaste.middlewares=proxyHeader@file,proxyError@file"
env_file:
- path: .env
diff --git a/compute-1-mep/searx/docker-compose.yaml b/compute-1-mep/searx/docker-compose.yaml
index a1863fb..2377d0b 100644
--- a/compute-1-mep/searx/docker-compose.yaml
+++ b/compute-1-mep/searx/docker-compose.yaml
@@ -36,6 +36,7 @@ services:
- "traefik.http.routers.searx.entryPoints=websecure"
- "traefik.http.routers.searx.rule=Host(`searx.gnous.eu`)"
- "traefik.http.routers.searx.tls=true"
+ - "traefik.http.routers.searx.tls.certresolver=default"
- "traefik.http.routers.searx.middlewares=proxyHeader@file,proxyError@file"
redis:
image: "redis:7.4-alpine"
diff --git a/compute-1-mep/wallabag/docker-compose.yaml b/compute-1-mep/wallabag/docker-compose.yaml
index 44b443b..c237d30 100644
--- a/compute-1-mep/wallabag/docker-compose.yaml
+++ b/compute-1-mep/wallabag/docker-compose.yaml
@@ -49,6 +49,7 @@ services:
- "traefik.http.services.wallabag-service-gnous.loadbalancer.server.port=3009"
- "traefik.http.routers.wallabaggnous.rule=Host(`bag.gnous.eu`)"
- "traefik.http.routers.wallabaggnous.tls=true"
+ - "traefik.http.routers.wallabaggnous.tls.certresolver=default"
- "traefik.http.routers.wallabaggnous.entrypoints=websecure"
- "traefik.http.routers.wallabaggnous.service=wallabag-service-gnous"
- "traefik.http.routers.wallabaggnous.middlewares=proxyHeader@file,proxyError@file"
diff --git a/compute-1-mep/wiki/docker-compose.yaml b/compute-1-mep/wiki/docker-compose.yaml
index 5b54095..755ab74 100644
--- a/compute-1-mep/wiki/docker-compose.yaml
+++ b/compute-1-mep/wiki/docker-compose.yaml
@@ -13,5 +13,6 @@ services:
- "traefik.http.routers.wiki.entryPoints=websecure"
- "traefik.http.routers.wiki.rule=Host(`wiki.gnous.eu`)"
- "traefik.http.routers.wiki.tls=true"
+ - "traefik.http.routers.wiki.tls.certresolver=default"
- "traefik.http.routers.wiki.middlewares=proxyHeader@file,proxyError@file"
diff --git a/compute-2-mep/gitlab/docker-compose.yaml b/compute-2-mep/gitlab/docker-compose.yaml
index 1ba27cc..fb5e559 100644
--- a/compute-2-mep/gitlab/docker-compose.yaml
+++ b/compute-2-mep/gitlab/docker-compose.yaml
@@ -49,6 +49,7 @@ services:
- "traefik.http.services.gitlab-gnous.loadbalancer.server.port=3005"
- "traefik.http.routers.gitlabgnous.rule=Host(`gitlab.gnous.eu`)"
- "traefik.http.routers.gitlabgnous.tls=true"
+ - "traefik.http.routers.gitlabgnous.tls.certresolver=default"
- "traefik.http.routers.gitlabgnous.entrypoints=websecure"
- "traefik.http.routers.gitlabgnous.service=gitlab-gnous"
- "traefik.http.routers.gitlabgnous.middlewares=proxyHeader@file,proxyError@file"
@@ -56,6 +57,7 @@ services:
- "traefik.http.services.registry-gnous.loadbalancer.server.port=3006"
- "traefik.http.routers.registrygnous.rule=Host(`pkg.gnous.eu`)"
- "traefik.http.routers.registrygnous.tls=true"
+ - "traefik.http.routers.registrygnous.tls.certresolver=default"
- "traefik.http.routers.registrygnous.entrypoints=websecure"
- "traefik.http.routers.registrygnous.service=registry-gnous"
- "traefik.http.routers.registrygnous.middlewares=proxyHeader@file,proxyError@file"
diff --git a/compute-2-mep/gnous_frontend/docker-compose.yaml b/compute-2-mep/gnous_frontend/docker-compose.yaml
index 930ac7a..1cd4fdd 100644
--- a/compute-2-mep/gnous_frontend/docker-compose.yaml
+++ b/compute-2-mep/gnous_frontend/docker-compose.yaml
@@ -14,4 +14,5 @@ services:
- "traefik.http.routers.gnousdoteu.entryPoints=websecure"
- "traefik.http.routers.gnousdoteu.rule=Host(`gnous.eu`)"
- "traefik.http.routers.gnousdoteu.tls=true"
+ - "traefik.http.routers.gnousdoteu.tls.certresolver=default"
- "traefik.http.routers.gnousdoteu.middlewares=proxyHeader@file,proxyError@file"
diff --git a/compute-2-mep/mastodon/docker-compose.yaml b/compute-2-mep/mastodon/docker-compose.yaml
index ea257a1..7eb1b47 100644
--- a/compute-2-mep/mastodon/docker-compose.yaml
+++ b/compute-2-mep/mastodon/docker-compose.yaml
@@ -34,6 +34,7 @@ services:
- "traefik.http.routers.mastodon-web.entrypoints=websecure"
- "traefik.http.routers.mastodon-web.rule=Host(`toot.gnous.eu`)"
- "traefik.http.routers.mastodon-web.tls=true"
+ - "traefik.http.routers.mastodon-web.tls.certresolver=default"
- "traefik.http.routers.mastodon-web.middlewares=proxyHeader@file,proxyError@file"
# Cron
- "ofelia.enabled=true"
@@ -64,6 +65,7 @@ services:
- "traefik.http.routers.mastodon-streaming.entrypoints=websecure"
- "traefik.http.routers.mastodon-streaming.rule=(Host(`toot.gnous.eu`) && PathPrefix(`/api/v1/streaming`))"
- "traefik.http.routers.mastodon-streaming.tls=true"
+ - "traefik.http.routers.mastodon-streaming.tls.certresolver=default"
- "traefik.http.routers.mastodon-streaming.middlewares=proxyHeader@file,proxyError@file"
sidekiq:
diff --git a/compute-2-mep/vaultwarden/docker-compose.yaml b/compute-2-mep/vaultwarden/docker-compose.yaml
index 3bbd32a..a417011 100644
--- a/compute-2-mep/vaultwarden/docker-compose.yaml
+++ b/compute-2-mep/vaultwarden/docker-compose.yaml
@@ -25,6 +25,7 @@ services:
- "traefik.http.routers.vaultwarden.entryPoints=websecure"
- "traefik.http.routers.vaultwarden.rule=Host(`pass.gnous.eu`)"
- "traefik.http.routers.vaultwarden.tls=true"
+ - "traefik.http.routers.vaultwarden.tls.certresolver=default"
- "traefik.http.routers.vaultwarden.middlewares=proxyHeader@file,proxyError@file"
restart: always
volumes:
diff --git a/compute-2-mep/woodpecker/docker-compose.yaml b/compute-2-mep/woodpecker/docker-compose.yaml
index 078d677..e0765c9 100644
--- a/compute-2-mep/woodpecker/docker-compose.yaml
+++ b/compute-2-mep/woodpecker/docker-compose.yaml
@@ -41,6 +41,7 @@ services:
- "traefik.http.services.woodpecker-service-gnous.loadbalancer.server.port=4001"
- "traefik.http.routers.woodpeckergnous.rule=Host(`cicd.gnous.eu`)"
- "traefik.http.routers.woodpeckergnous.tls=true"
+ - "traefik.http.routers.woodpeckergnous.tls.certresolver=default"
- "traefik.http.routers.woodpeckergnous.entrypoints=websecure"
- "traefik.http.routers.woodpeckergnous.service=woodpecker-service-gnous"
- "traefik.http.routers.woodpeckergnous.middlewares=proxyHeader@file,proxyError@file"
@@ -49,6 +50,7 @@ services:
- "traefik.http.services.woodpecker-grpc-gnous.loadbalancer.server.scheme=h2c"
- "traefik.http.routers.woodpecker-grpc-gnous.rule=Host(`grpc.cicd.gnous.eu`)"
- "traefik.http.routers.woodpecker-grpc-gnous.tls=true"
+ - "traefik.http.routers.woodpecker-grpc-gnous.tls.certresolver=default"
- "traefik.http.routers.woodpecker-grpc-gnous.entrypoints=websecure"
- "traefik.http.routers.woodpecker-grpc-gnous.service=woodpecker-grpc-gnous"
- "traefik.http.routers.woodpecker-grpc-gnous.middlewares=woodpecker-grpc-redirect@docker"
diff --git a/internals/komodo/docker-compose.yaml b/internals/komodo/docker-compose.yaml
index 583a01b..e274780 100644
--- a/internals/komodo/docker-compose.yaml
+++ b/internals/komodo/docker-compose.yaml
@@ -45,6 +45,7 @@ services:
- "traefik.http.routers.komodo.entryPoints=websecure"
- "traefik.http.routers.komodo.rule=Host(`deploy.net.enpls.org`)"
- "traefik.http.routers.komodo.tls=true"
+ - "traefik.http.routers.komodo.tls.certresolver=default"
- "traefik.http.routers.komodo.middlewares=proxyHeader@file,proxyError@file"
- "komodo.skip:"
diff --git a/internals/semaphore/docker-compose.yaml b/internals/semaphore/docker-compose.yaml
index 603e8de..f4e2c38 100644
--- a/internals/semaphore/docker-compose.yaml
+++ b/internals/semaphore/docker-compose.yaml
@@ -34,6 +34,7 @@ services:
- "traefik.http.services.semaphore-service.loadbalancer.server.port=8085"
- "traefik.http.routers.semaphore.rule=Host(`semaphore.net.enpls.org`)"
- "traefik.http.routers.semaphore.tls=true"
+ - "traefik.http.routers.semaphore.tls.certresolver=default"
- "traefik.http.routers.semaphore.entrypoints=websecure"
- "traefik.http.routers.semaphore.service=semaphore-service"
- "traefik.http.routers.semaphore.middlewares=proxyHeader@file,proxyError@file"
diff --git a/internals/wikijs/docker-compose.yaml b/internals/wikijs/docker-compose.yaml
index f443f7b..aa4823c 100644
--- a/internals/wikijs/docker-compose.yaml
+++ b/internals/wikijs/docker-compose.yaml
@@ -29,6 +29,7 @@ services:
- "traefik.http.routers.wikijs.entryPoints=websecure"
- "traefik.http.routers.wikijs.rule=Host(`doc.net.enpls.org`)"
- "traefik.http.routers.wikijs.tls=true"
+ - "traefik.http.routers.wikijs.tls.certresolver=default"
- "traefik.http.routers.wikijs.middlewares=proxyHeader@file,proxyError@file"
volumes:
diff --git a/internals/woodpecker/docker-compose.yaml b/internals/woodpecker/docker-compose.yaml
index ced5016..41d7dfb 100644
--- a/internals/woodpecker/docker-compose.yaml
+++ b/internals/woodpecker/docker-compose.yaml
@@ -42,6 +42,7 @@ services:
- "traefik.http.services.woodpecker-service.loadbalancer.server.port=8083"
- "traefik.http.routers.woodpecker.rule=Host(`build.net.enpls.org`)"
- "traefik.http.routers.woodpecker.tls=true"
+ - "traefik.http.routers.woodpecker.tls.certresolver=default"
- "traefik.http.routers.woodpecker.entrypoints=websecure"
- "traefik.http.routers.woodpecker.service=woodpecker-service"
- "traefik.http.routers.woodpecker.middlewares=proxyHeader@file,proxyError@file"
@@ -50,6 +51,7 @@ services:
- "traefik.http.services.woodpecker-grpc.loadbalancer.server.scheme=h2c"
- "traefik.http.routers.woodpecker-grpc-secure.rule=Host(`grpc.build.net.enpls.org`)"
- "traefik.http.routers.woodpecker-grpc-secure.tls=true"
+ - "traefik.http.routers.woodpecker-grpc-secure.tls.certresolver=default"
- "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"
From 1e71b6382674fb42fd67a7d46ae5fb0851087101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gramain?= <mael@enpls.org>
Date: Sun, 2 Mar 2025 17:43:06 +0100
Subject: [PATCH 11/17] retry to disable tls ?
---
compute-1-mep/forgejo/docker-compose.yaml | 2 --
compute-1-mep/freshrss/docker-compose.yaml | 2 --
compute-1-mep/haste/docker-compose.yaml | 2 --
3 files changed, 6 deletions(-)
diff --git a/compute-1-mep/forgejo/docker-compose.yaml b/compute-1-mep/forgejo/docker-compose.yaml
index b67fa34..39d221e 100644
--- a/compute-1-mep/forgejo/docker-compose.yaml
+++ b/compute-1-mep/forgejo/docker-compose.yaml
@@ -71,8 +71,6 @@ services:
# web server
- "traefik.http.services.forgejo-service-gnous.loadbalancer.server.port=3001"
- "traefik.http.routers.forgejognous.rule=(Host(`git.gnous.eu`) && !Path(`/metrics`))"
- - "traefik.http.routers.forgejognous.tls=true"
- - "traefik.http.routers.forgejognous.tls.certresolver=default"
- "traefik.http.routers.forgejognous.entrypoints=websecure"
- "traefik.http.routers.forgejognous.service=forgejo-service-gnous"
- "traefik.http.routers.forgejognous.middlewares=proxyHeader@file,proxyError@file"
diff --git a/compute-1-mep/freshrss/docker-compose.yaml b/compute-1-mep/freshrss/docker-compose.yaml
index 172c772..f2d1746 100644
--- a/compute-1-mep/freshrss/docker-compose.yaml
+++ b/compute-1-mep/freshrss/docker-compose.yaml
@@ -25,8 +25,6 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.freshrss.entryPoints=websecure"
- "traefik.http.routers.freshrss.rule=Host(`rss.gnous.eu`)"
- - "traefik.http.routers.freshrss.tls=true"
- - "traefik.http.routers.freshrss.tls.certresolver=default"
- "traefik.http.routers.freshrss.middlewares=proxyHeader@file,proxyError@file"
env_file:
- path: .env
diff --git a/compute-1-mep/haste/docker-compose.yaml b/compute-1-mep/haste/docker-compose.yaml
index 555aa02..677e287 100644
--- a/compute-1-mep/haste/docker-compose.yaml
+++ b/compute-1-mep/haste/docker-compose.yaml
@@ -18,8 +18,6 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.gnoushaste.entryPoints=websecure"
- "traefik.http.routers.gnoushaste.rule=Host(`haste.gnous.eu`)"
- - "traefik.http.routers.gnoushaste.tls=true"
- - "traefik.http.routers.gnoushaste.tls.certresolver=default"
- "traefik.http.routers.gnoushaste.middlewares=proxyHeader@file,proxyError@file"
env_file:
- path: .env
From 2d5cadfdfc45e5c62d9a65cedce1f67156abdb1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gramain?= <mael@enpls.org>
Date: Sun, 2 Mar 2025 17:45:18 +0100
Subject: [PATCH 12/17] step by step tls disable
---
compute-1-mep/searx/docker-compose.yaml | 2 --
compute-1-mep/wallabag/docker-compose.yaml | 2 --
compute-1-mep/wiki/docker-compose.yaml | 2 --
3 files changed, 6 deletions(-)
diff --git a/compute-1-mep/searx/docker-compose.yaml b/compute-1-mep/searx/docker-compose.yaml
index 2377d0b..ec1b1a2 100644
--- a/compute-1-mep/searx/docker-compose.yaml
+++ b/compute-1-mep/searx/docker-compose.yaml
@@ -35,8 +35,6 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.searx.entryPoints=websecure"
- "traefik.http.routers.searx.rule=Host(`searx.gnous.eu`)"
- - "traefik.http.routers.searx.tls=true"
- - "traefik.http.routers.searx.tls.certresolver=default"
- "traefik.http.routers.searx.middlewares=proxyHeader@file,proxyError@file"
redis:
image: "redis:7.4-alpine"
diff --git a/compute-1-mep/wallabag/docker-compose.yaml b/compute-1-mep/wallabag/docker-compose.yaml
index c237d30..f14970a 100644
--- a/compute-1-mep/wallabag/docker-compose.yaml
+++ b/compute-1-mep/wallabag/docker-compose.yaml
@@ -48,8 +48,6 @@ services:
# web server
- "traefik.http.services.wallabag-service-gnous.loadbalancer.server.port=3009"
- "traefik.http.routers.wallabaggnous.rule=Host(`bag.gnous.eu`)"
- - "traefik.http.routers.wallabaggnous.tls=true"
- - "traefik.http.routers.wallabaggnous.tls.certresolver=default"
- "traefik.http.routers.wallabaggnous.entrypoints=websecure"
- "traefik.http.routers.wallabaggnous.service=wallabag-service-gnous"
- "traefik.http.routers.wallabaggnous.middlewares=proxyHeader@file,proxyError@file"
diff --git a/compute-1-mep/wiki/docker-compose.yaml b/compute-1-mep/wiki/docker-compose.yaml
index 755ab74..3f68741 100644
--- a/compute-1-mep/wiki/docker-compose.yaml
+++ b/compute-1-mep/wiki/docker-compose.yaml
@@ -12,7 +12,5 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.wiki.entryPoints=websecure"
- "traefik.http.routers.wiki.rule=Host(`wiki.gnous.eu`)"
- - "traefik.http.routers.wiki.tls=true"
- - "traefik.http.routers.wiki.tls.certresolver=default"
- "traefik.http.routers.wiki.middlewares=proxyHeader@file,proxyError@file"
From f6124955c45cd895244cd106ea53e2edab85374f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gramain?= <mael@enpls.org>
Date: Sun, 2 Mar 2025 18:01:42 +0100
Subject: [PATCH 13/17] lets break everything again
---
compute-2-mep/gitlab/docker-compose.yaml | 4 ----
compute-2-mep/gnous_frontend/docker-compose.yaml | 2 --
compute-2-mep/mastodon/docker-compose.yaml | 4 ----
compute-2-mep/vaultwarden/docker-compose.yaml | 2 --
compute-2-mep/woodpecker/docker-compose.yaml | 4 ----
internals/semaphore/docker-compose.yaml | 2 --
internals/wikijs/docker-compose.yaml | 2 --
internals/woodpecker/docker-compose.yaml | 4 ----
8 files changed, 24 deletions(-)
diff --git a/compute-2-mep/gitlab/docker-compose.yaml b/compute-2-mep/gitlab/docker-compose.yaml
index fb5e559..76c93a2 100644
--- a/compute-2-mep/gitlab/docker-compose.yaml
+++ b/compute-2-mep/gitlab/docker-compose.yaml
@@ -48,16 +48,12 @@ services:
# Web
- "traefik.http.services.gitlab-gnous.loadbalancer.server.port=3005"
- "traefik.http.routers.gitlabgnous.rule=Host(`gitlab.gnous.eu`)"
- - "traefik.http.routers.gitlabgnous.tls=true"
- - "traefik.http.routers.gitlabgnous.tls.certresolver=default"
- "traefik.http.routers.gitlabgnous.entrypoints=websecure"
- "traefik.http.routers.gitlabgnous.service=gitlab-gnous"
- "traefik.http.routers.gitlabgnous.middlewares=proxyHeader@file,proxyError@file"
# Registry
- "traefik.http.services.registry-gnous.loadbalancer.server.port=3006"
- "traefik.http.routers.registrygnous.rule=Host(`pkg.gnous.eu`)"
- - "traefik.http.routers.registrygnous.tls=true"
- - "traefik.http.routers.registrygnous.tls.certresolver=default"
- "traefik.http.routers.registrygnous.entrypoints=websecure"
- "traefik.http.routers.registrygnous.service=registry-gnous"
- "traefik.http.routers.registrygnous.middlewares=proxyHeader@file,proxyError@file"
diff --git a/compute-2-mep/gnous_frontend/docker-compose.yaml b/compute-2-mep/gnous_frontend/docker-compose.yaml
index 1cd4fdd..d3f2ffb 100644
--- a/compute-2-mep/gnous_frontend/docker-compose.yaml
+++ b/compute-2-mep/gnous_frontend/docker-compose.yaml
@@ -13,6 +13,4 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.gnousdoteu.entryPoints=websecure"
- "traefik.http.routers.gnousdoteu.rule=Host(`gnous.eu`)"
- - "traefik.http.routers.gnousdoteu.tls=true"
- - "traefik.http.routers.gnousdoteu.tls.certresolver=default"
- "traefik.http.routers.gnousdoteu.middlewares=proxyHeader@file,proxyError@file"
diff --git a/compute-2-mep/mastodon/docker-compose.yaml b/compute-2-mep/mastodon/docker-compose.yaml
index 7eb1b47..c73163f 100644
--- a/compute-2-mep/mastodon/docker-compose.yaml
+++ b/compute-2-mep/mastodon/docker-compose.yaml
@@ -33,8 +33,6 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.mastodon-web.entrypoints=websecure"
- "traefik.http.routers.mastodon-web.rule=Host(`toot.gnous.eu`)"
- - "traefik.http.routers.mastodon-web.tls=true"
- - "traefik.http.routers.mastodon-web.tls.certresolver=default"
- "traefik.http.routers.mastodon-web.middlewares=proxyHeader@file,proxyError@file"
# Cron
- "ofelia.enabled=true"
@@ -64,8 +62,6 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.mastodon-streaming.entrypoints=websecure"
- "traefik.http.routers.mastodon-streaming.rule=(Host(`toot.gnous.eu`) && PathPrefix(`/api/v1/streaming`))"
- - "traefik.http.routers.mastodon-streaming.tls=true"
- - "traefik.http.routers.mastodon-streaming.tls.certresolver=default"
- "traefik.http.routers.mastodon-streaming.middlewares=proxyHeader@file,proxyError@file"
sidekiq:
diff --git a/compute-2-mep/vaultwarden/docker-compose.yaml b/compute-2-mep/vaultwarden/docker-compose.yaml
index a417011..1c5d4ed 100644
--- a/compute-2-mep/vaultwarden/docker-compose.yaml
+++ b/compute-2-mep/vaultwarden/docker-compose.yaml
@@ -24,8 +24,6 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.vaultwarden.entryPoints=websecure"
- "traefik.http.routers.vaultwarden.rule=Host(`pass.gnous.eu`)"
- - "traefik.http.routers.vaultwarden.tls=true"
- - "traefik.http.routers.vaultwarden.tls.certresolver=default"
- "traefik.http.routers.vaultwarden.middlewares=proxyHeader@file,proxyError@file"
restart: always
volumes:
diff --git a/compute-2-mep/woodpecker/docker-compose.yaml b/compute-2-mep/woodpecker/docker-compose.yaml
index e0765c9..941463b 100644
--- a/compute-2-mep/woodpecker/docker-compose.yaml
+++ b/compute-2-mep/woodpecker/docker-compose.yaml
@@ -40,8 +40,6 @@ services:
# web server
- "traefik.http.services.woodpecker-service-gnous.loadbalancer.server.port=4001"
- "traefik.http.routers.woodpeckergnous.rule=Host(`cicd.gnous.eu`)"
- - "traefik.http.routers.woodpeckergnous.tls=true"
- - "traefik.http.routers.woodpeckergnous.tls.certresolver=default"
- "traefik.http.routers.woodpeckergnous.entrypoints=websecure"
- "traefik.http.routers.woodpeckergnous.service=woodpecker-service-gnous"
- "traefik.http.routers.woodpeckergnous.middlewares=proxyHeader@file,proxyError@file"
@@ -49,8 +47,6 @@ services:
- "traefik.http.services.woodpecker-grpc-gnous.loadbalancer.server.port=4002"
- "traefik.http.services.woodpecker-grpc-gnous.loadbalancer.server.scheme=h2c"
- "traefik.http.routers.woodpecker-grpc-gnous.rule=Host(`grpc.cicd.gnous.eu`)"
- - "traefik.http.routers.woodpecker-grpc-gnous.tls=true"
- - "traefik.http.routers.woodpecker-grpc-gnous.tls.certresolver=default"
- "traefik.http.routers.woodpecker-grpc-gnous.entrypoints=websecure"
- "traefik.http.routers.woodpecker-grpc-gnous.service=woodpecker-grpc-gnous"
- "traefik.http.routers.woodpecker-grpc-gnous.middlewares=woodpecker-grpc-redirect@docker"
diff --git a/internals/semaphore/docker-compose.yaml b/internals/semaphore/docker-compose.yaml
index f4e2c38..774a79c 100644
--- a/internals/semaphore/docker-compose.yaml
+++ b/internals/semaphore/docker-compose.yaml
@@ -33,8 +33,6 @@ services:
- "traefik.enable=true"
- "traefik.http.services.semaphore-service.loadbalancer.server.port=8085"
- "traefik.http.routers.semaphore.rule=Host(`semaphore.net.enpls.org`)"
- - "traefik.http.routers.semaphore.tls=true"
- - "traefik.http.routers.semaphore.tls.certresolver=default"
- "traefik.http.routers.semaphore.entrypoints=websecure"
- "traefik.http.routers.semaphore.service=semaphore-service"
- "traefik.http.routers.semaphore.middlewares=proxyHeader@file,proxyError@file"
diff --git a/internals/wikijs/docker-compose.yaml b/internals/wikijs/docker-compose.yaml
index aa4823c..56f4d82 100644
--- a/internals/wikijs/docker-compose.yaml
+++ b/internals/wikijs/docker-compose.yaml
@@ -28,8 +28,6 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.wikijs.entryPoints=websecure"
- "traefik.http.routers.wikijs.rule=Host(`doc.net.enpls.org`)"
- - "traefik.http.routers.wikijs.tls=true"
- - "traefik.http.routers.wikijs.tls.certresolver=default"
- "traefik.http.routers.wikijs.middlewares=proxyHeader@file,proxyError@file"
volumes:
diff --git a/internals/woodpecker/docker-compose.yaml b/internals/woodpecker/docker-compose.yaml
index 41d7dfb..5ae65b8 100644
--- a/internals/woodpecker/docker-compose.yaml
+++ b/internals/woodpecker/docker-compose.yaml
@@ -41,8 +41,6 @@ services:
# web server
- "traefik.http.services.woodpecker-service.loadbalancer.server.port=8083"
- "traefik.http.routers.woodpecker.rule=Host(`build.net.enpls.org`)"
- - "traefik.http.routers.woodpecker.tls=true"
- - "traefik.http.routers.woodpecker.tls.certresolver=default"
- "traefik.http.routers.woodpecker.entrypoints=websecure"
- "traefik.http.routers.woodpecker.service=woodpecker-service"
- "traefik.http.routers.woodpecker.middlewares=proxyHeader@file,proxyError@file"
@@ -50,8 +48,6 @@ services:
- "traefik.http.services.woodpecker-grpc.loadbalancer.server.port=8084"
- "traefik.http.services.woodpecker-grpc.loadbalancer.server.scheme=h2c"
- "traefik.http.routers.woodpecker-grpc-secure.rule=Host(`grpc.build.net.enpls.org`)"
- - "traefik.http.routers.woodpecker-grpc-secure.tls=true"
- - "traefik.http.routers.woodpecker-grpc-secure.tls.certresolver=default"
- "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"
From d33bf5d32e8e8eb2650df44752f8a0b7d80c03b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gramain?= <mael@enpls.org>
Date: Sun, 2 Mar 2025 18:15:10 +0100
Subject: [PATCH 14/17] change agent image
---
.woodpecker/lint.yml | 2 +-
cicd-worker-pub-mep/woodpecker-runner/docker-compose.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.woodpecker/lint.yml b/.woodpecker/lint.yml
index 954a40a..d02b253 100644
--- a/.woodpecker/lint.yml
+++ b/.woodpecker/lint.yml
@@ -20,7 +20,7 @@ steps:
- rm -rf output.txt
- apt-get update
- apt-get install -y curl
- - curl -SL https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
+ - curl -SL https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
- chmod +x /usr/local/bin/docker-compose
- bash .ci/lint_wrap.sh
comment_2:
diff --git a/cicd-worker-pub-mep/woodpecker-runner/docker-compose.yaml b/cicd-worker-pub-mep/woodpecker-runner/docker-compose.yaml
index 0c4c318..2a91c8d 100644
--- a/cicd-worker-pub-mep/woodpecker-runner/docker-compose.yaml
+++ b/cicd-worker-pub-mep/woodpecker-runner/docker-compose.yaml
@@ -8,7 +8,7 @@ volumes:
services:
agent:
- image: woodpeckerci/woodpecker-agent:latest
+ image: woodpeckerci/woodpecker-agent:next
container_name: woodpecker_agent
environment:
- WOODPECKER_SERVER=grpc.cicd.gnous.eu:443
From 9cd768871fc3bc546600905acaa41c6fde9997c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gramain?= <mael@enpls.org>
Date: Sun, 2 Mar 2025 18:39:58 +0100
Subject: [PATCH 15/17] delete the last one
---
internals/komodo/docker-compose.yaml | 2 --
1 file changed, 2 deletions(-)
diff --git a/internals/komodo/docker-compose.yaml b/internals/komodo/docker-compose.yaml
index e274780..e2548a8 100644
--- a/internals/komodo/docker-compose.yaml
+++ b/internals/komodo/docker-compose.yaml
@@ -45,8 +45,6 @@ services:
- "traefik.http.routers.komodo.entryPoints=websecure"
- "traefik.http.routers.komodo.rule=Host(`deploy.net.enpls.org`)"
- "traefik.http.routers.komodo.tls=true"
- - "traefik.http.routers.komodo.tls.certresolver=default"
- - "traefik.http.routers.komodo.middlewares=proxyHeader@file,proxyError@file"
- "komodo.skip:"
periphery:
From 848471398feffce749a84755d1651d4e2a6f9030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gramain?= <mael@enpls.org>
Date: Sun, 2 Mar 2025 18:49:26 +0100
Subject: [PATCH 16/17] test server transport
---
compute-2-mep/gitlab/docker-compose.yaml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/compute-2-mep/gitlab/docker-compose.yaml b/compute-2-mep/gitlab/docker-compose.yaml
index 76c93a2..68a2eee 100644
--- a/compute-2-mep/gitlab/docker-compose.yaml
+++ b/compute-2-mep/gitlab/docker-compose.yaml
@@ -61,4 +61,8 @@ services:
- "traefik.tcp.routers.gitlabssh.entrypoints=sshgitlab"
- "traefik.tcp.routers.gitlabssh.rule=HostSNI(`*`)"
- "traefik.tcp.routers.gitlabssh.service=gitlab-ssh"
- - "traefik.tcp.services.gitlab-ssh.loadbalancer.server.address=gitlab:22"
\ No newline at end of file
+ - "traefik.tcp.services.gitlab-ssh.loadbalancer.server.address=gitlab:3007"
+ - "traefik.tcp.services.gitlab-ssh.loadbalancer.serversTransport=gitlabtransport"
+
+ # Define ServersTransport
+ - "traefik.tcp.serversTransports.gitlabtransport.terminationDelay=0"
\ No newline at end of file
From 2c11caea0b74900e9263006bb286b3363d9ae8cd Mon Sep 17 00:00:00 2001
From: Renovate bot <renovate@gnous.eu>
Date: Sun, 2 Mar 2025 18:37:27 +0000
Subject: [PATCH 17/17] Update postgres Docker tag to v17
---
internals/wikijs/docker-compose.yaml | 2 +-
internals/woodpecker/docker-compose.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/internals/wikijs/docker-compose.yaml b/internals/wikijs/docker-compose.yaml
index 56f4d82..e645ef2 100644
--- a/internals/wikijs/docker-compose.yaml
+++ b/internals/wikijs/docker-compose.yaml
@@ -1,6 +1,6 @@
services:
db:
- image: postgres:14
+ image: postgres:17
env_file:
- path: .env
required: false
diff --git a/internals/woodpecker/docker-compose.yaml b/internals/woodpecker/docker-compose.yaml
index 5ae65b8..290f027 100644
--- a/internals/woodpecker/docker-compose.yaml
+++ b/internals/woodpecker/docker-compose.yaml
@@ -56,7 +56,7 @@ services:
- db
db:
- image: postgres:14-alpine
+ image: postgres:17-alpine
restart: always
env_file:
- path: .env