From abb6b82fb696cc5434a98e920527ea6c09b210f2 Mon Sep 17 00:00:00 2001 From: chris Date: Wed, 2 Apr 2025 12:56:49 +0000 Subject: [PATCH 01/11] Use latest tag for erechnung-asu. --- erechnung-asu/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erechnung-asu/docker-compose.yaml b/erechnung-asu/docker-compose.yaml index 232a6a4..0762e94 100644 --- a/erechnung-asu/docker-compose.yaml +++ b/erechnung-asu/docker-compose.yaml @@ -10,7 +10,7 @@ volumes: services: app: - image: cs-git.ddnss.de/ri-st/project:master + image: cs-git.ddnss.de/ri-st/project:latest restart: always dns: - '8.8.8.8' From 6a5fc53fb7659a68f3d855ec84b87e3e7945511e Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 6 May 2025 10:37:16 +0000 Subject: [PATCH 02/11] Use new registration token for gitea runner. --- gitea/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitea/docker-compose.yaml b/gitea/docker-compose.yaml index 482ea30..cf2c0f8 100644 --- a/gitea/docker-compose.yaml +++ b/gitea/docker-compose.yaml @@ -83,6 +83,6 @@ services: - /var/run/docker.sock:/var/run/docker.sock environment: - GITEA_INSTANCE_URL=https://gitea.steinle-computer.de - - GITEA_RUNNER_REGISTRATION_TOKEN=flpCcwO0Dw6u4jtWT2wMBrBWuFZ8HDdS4qV277tH + - GITEA_RUNNER_REGISTRATION_TOKEN=jMMDhDpMzlmtN2pXzVj6qcAdlGEpDb8dmzbfmdm8 networks: - gitea From 1a8f83c08f3785b3750f75eefd735fee1c3f087a Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 6 May 2025 10:40:29 +0000 Subject: [PATCH 03/11] Use public registry image for asu. --- arbeitsschutz/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arbeitsschutz/docker-compose.yaml b/arbeitsschutz/docker-compose.yaml index 19c967d..111a8f6 100644 --- a/arbeitsschutz/docker-compose.yaml +++ b/arbeitsschutz/docker-compose.yaml @@ -4,7 +4,7 @@ networks: services: arbeitsschutz: - image: cs-git.ddnss.de/arbeitsschutz-ulm/website:master + image: gitea.steinle-computer.de/arbeitsschutz-ulm/website:latest container_name: arbeitsschutz hostname: arbeitsschutz restart: always From 5abe999d36ab2e05e3e60c825f21e08047d50130 Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 6 May 2025 10:49:16 +0000 Subject: [PATCH 04/11] Use erechnung asu image from public registry instance. --- erechnung-asu/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erechnung-asu/docker-compose.yaml b/erechnung-asu/docker-compose.yaml index 0762e94..00c6bfb 100644 --- a/erechnung-asu/docker-compose.yaml +++ b/erechnung-asu/docker-compose.yaml @@ -10,7 +10,7 @@ volumes: services: app: - image: cs-git.ddnss.de/ri-st/project:latest + image: gitea.steinle-computer.de/ri-st/project:latest restart: always dns: - '8.8.8.8' From 51b73a39fb69eab20c2c9d2c9fa2688430f70c2d Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 6 May 2025 10:56:39 +0000 Subject: [PATCH 05/11] Use huber-putz image from public registry instance. --- huber-putz/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/huber-putz/docker-compose.yaml b/huber-putz/docker-compose.yaml index fc4f6e5..caf9876 100644 --- a/huber-putz/docker-compose.yaml +++ b/huber-putz/docker-compose.yaml @@ -4,7 +4,7 @@ networks: services: huber-putz: - image: cs-git.ddnss.de/huber/stuck-web + image: gitea.steinle-computer.de/huber/stuck-web container_name: huber-putz hostname: huber-putz restart: always From 799349e04189c3a96abd7349ce826aa228f7651a Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 6 May 2025 10:57:43 +0000 Subject: [PATCH 06/11] Use prometheus image from public registry istance and remove watchtower notification. --- monitoring/docker-compose.yaml | 5 +---- monitoring/watchtower-config.json | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml index 50b8077..7489c1c 100644 --- a/monitoring/docker-compose.yaml +++ b/monitoring/docker-compose.yaml @@ -13,7 +13,7 @@ volumes: services: prometheus: - image: cs-git.ddnss.de/production/prometheus + image: gitea.steinle-computer.de/production/prometheus container_name: prometheus hostname: prometheus restart: unless-stopped @@ -108,6 +108,3 @@ services: WATCHTOWER_MONITOR_ONLY: false WATCHTOWER_WARN_ON_HEAD_FAILURE: "never" WATCHTOWER_SCHEDULE: "0 0 2 * * *" - WATCHTOWER_NOTIFICATIONS: "shoutrrr" - WATCHTOWER_NOTIFICATION_URL: "mattermost://watchtower@cs-mm.ddnss.de/og4ckuqet7fafb8kjuaigzuh7c" - WATCHTOWER_NOTIFICATION_TEMPLATE: "{{range .}} Production - {{.Time.Format \"2006-01-02 15:04:05\"}} ({{.Level}}): {{.Message}}{{println}}{{end}}" diff --git a/monitoring/watchtower-config.json b/monitoring/watchtower-config.json index 33c82bb..4f2c3aa 100644 --- a/monitoring/watchtower-config.json +++ b/monitoring/watchtower-config.json @@ -1,8 +1,9 @@ { "auths": { - "cs-git.ddnss.de": { + "gitea.steinle-computer.de": { "auth": "Y2hyaXM6cScsXEgoT2Q6RzMpLlh2PCMhNVA=" - }, "https://index.docker.io/v1/": { + }, + "https://index.docker.io/v1/": { "auth": "Y3MyMjExOkU2U2Njc3ViRFJrYUppMlNMVSUh" } } From 1266af9265a97aeb85cfe9dd28a1e63d02f1a02b Mon Sep 17 00:00:00 2001 From: Christian Steinle Date: Tue, 6 May 2025 10:59:51 +0000 Subject: [PATCH 07/11] Use new registration token for gitea runner. --- gitea/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitea/docker-compose.yaml b/gitea/docker-compose.yaml index 482ea30..cf2c0f8 100644 --- a/gitea/docker-compose.yaml +++ b/gitea/docker-compose.yaml @@ -83,6 +83,6 @@ services: - /var/run/docker.sock:/var/run/docker.sock environment: - GITEA_INSTANCE_URL=https://gitea.steinle-computer.de - - GITEA_RUNNER_REGISTRATION_TOKEN=flpCcwO0Dw6u4jtWT2wMBrBWuFZ8HDdS4qV277tH + - GITEA_RUNNER_REGISTRATION_TOKEN=jMMDhDpMzlmtN2pXzVj6qcAdlGEpDb8dmzbfmdm8 networks: - gitea From 28fd3daca68ba116b8cf4db003cb4bcab3d23cbd Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 6 May 2025 11:02:34 +0000 Subject: [PATCH 08/11] Use public registry for rist-editor image. --- rist-editors/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rist-editors/docker-compose.yaml b/rist-editors/docker-compose.yaml index cadfc3c..254ba56 100644 --- a/rist-editors/docker-compose.yaml +++ b/rist-editors/docker-compose.yaml @@ -4,7 +4,7 @@ networks: services: rist-editors: - image: cs-git.ddnss.de/ri-st/old-editors + image: gitea.steinle-computer.de/ri-st/old-editors container_name: rist-editors hostname: rist-editors restart: unless-stopped From c84d3f40694b8100fc1a92cef037a50851b38776 Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 6 May 2025 11:05:49 +0000 Subject: [PATCH 09/11] Use image from public registry for startup. --- rist-startup/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rist-startup/docker-compose.yaml b/rist-startup/docker-compose.yaml index 3571979..b316a84 100644 --- a/rist-startup/docker-compose.yaml +++ b/rist-startup/docker-compose.yaml @@ -1,6 +1,6 @@ services: startup-app: - image: cs-git.ddnss.de/ri-st/startup + image: gitea.steinle-computer.de/ri-st/startup container_name: startup-app links: - startup-db From f93afbf50732417008bad33d23a5cd960e87e5c1 Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 6 May 2025 11:07:13 +0000 Subject: [PATCH 10/11] Use public registry for startup image. --- svj/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svj/docker-compose.yaml b/svj/docker-compose.yaml index 14a063e..6b405b3 100644 --- a/svj/docker-compose.yaml +++ b/svj/docker-compose.yaml @@ -13,7 +13,7 @@ networks: services: svj: - image: cs-git.ddnss.de/svj/website:latest + image: gitea.steinle-computer.de/svj/website:latest container_name: svj hostname: svj restart: unless-stopped From 434e3cbee445fc9d6b3fa48d30cccf387de31ec4 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 9 May 2025 10:15:40 +0000 Subject: [PATCH 11/11] Use watchtower to cleanup and update cadvisor. --- monitoring/docker-compose.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml index 7489c1c..fc6ea29 100644 --- a/monitoring/docker-compose.yaml +++ b/monitoring/docker-compose.yaml @@ -30,7 +30,7 @@ services: - "traefik.http.services.prometheus.loadbalancer.server.port=9090" cadvisor: - image: gcr.io/cadvisor/cadvisor:v0.51.0 + image: gcr.io/cadvisor/cadvisor:v0.52.1 container_name: cadvisor hostname: cadvisor restart: unless-stopped @@ -106,5 +106,7 @@ services: TZ: Europe/Berlin WATCHTOWER_INCLUDE_STOPPED: true WATCHTOWER_MONITOR_ONLY: false + WATCHTOWER_CLEANUP: true + WATCHTOWER_REMOVE_VOLUMES: true WATCHTOWER_WARN_ON_HEAD_FAILURE: "never" WATCHTOWER_SCHEDULE: "0 0 2 * * *"