Merge branch 'master' of https://gitea.fam-steinle.de/production/production-infra

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

erechnung-asu/docker-compose.yaml

@@ -10,7 +10,7 @@ volumes:
 
 services:
   app:
-    image: cs-git.ddnss.de/ri-st/project:master
+    image: gitea.steinle-computer.de/ri-st/project:latest
     restart: always
     dns:
       - '8.8.8.8'

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

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

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
@@ -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,8 +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 * * *"
-      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}}"

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"
 		}
 	}

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

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

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