Add gitea instance.

arbeitsschutz/docker-compose.yaml

@@ -1,12 +1,10 @@
-version: "3.9"
-
 networks:
   proxy:
     external: true
 
 services:
   arbeitsschutz:
-    image: cs-git.ddnss.de/arbeitsschutz-ulm/website:latest
+    image: cs-git.ddnss.de/arbeitsschutz-ulm/website:master
     container_name: arbeitsschutz
     hostname: arbeitsschutz
     restart: always

buehler-tmp/docker-compose.yaml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
   proxy:
     external: true

common/docker-compose.yaml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
   proxy:
     external: false
@@ -13,7 +11,7 @@ volumes:
 
 services:
   traefik:
-    image: traefik:v2.9
+    image: traefik:v2.11
     container_name: traefik
     restart: unless-stopped
     command:
@@ -25,6 +23,7 @@ services:
       - --providers.docker.swarmMode=false
       - --entryPoints.web.address=:80
       - --entryPoints.websecure.address=:443
+      - --entryPoints.shh.address=:222/tcp
       - --entryPoints.smtp.address=:25
       - --entryPoints.smtp-ssl.address=:465
       - --entryPoints.imap-ssl.address=:993

gitea/.env

@@ -0,0 +1,3 @@
+DB_USER=gitea
+DB_NAME=gitea
+DB_PASS=QseAwSwyq8^AeH#cMby9C7i4

gitea/docker-compose.yaml

@@ -0,0 +1,88 @@
+networks:
+  proxy:
+    external: true
+  gitea:
+    name: gitea
+    external: false
+
+volumes:
+  gitea:
+    name: gitea
+  gitea-db:
+    name: gitea-db
+  gitea-runner:
+    name: gitea-runner
+
+services:
+  gitea:
+    image: gitea/gitea
+    container_name: gitea
+    hostname: gitea
+    environment:
+      USER_UID: 1000
+      USER_GID: 1000
+      GITEA__database__DB_TYPE: postgres
+      GITEA__database__HOST: gitea-db:5432
+      GITEA__database__NAME: ${DB_NAME}
+      GITEA__database__USER: ${DB_USER}
+      GITEA__database__PASSWD: ${DB_PASS}
+      GITEA__server__START_SSH_SERVER: true
+      GITEA__server__SSH_PORT: 22
+      GITEA__server__SSH_LISTEN_PORT: 222
+    restart: unless-stopped
+    depends_on:
+      - gitea-db
+    volumes:
+      - gitea:/data
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    networks:
+      - proxy
+      - gitea
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.git.entrypoints=web"
+      - "traefik.http.routers.git.rule=Host(`gitea.steinle-computer.de`)"
+      - "traefik.http.routers.git.middlewares=git"
+      - "traefik.http.middlewares.git.redirectscheme.scheme=https"
+      - "traefik.http.routers.git-secure.entrypoints=websecure"
+      - "traefik.http.routers.git-secure.rule=Host(`gitea.steinle-computer.de`)"
+      - "traefik.http.routers.git-secure.service=git-secure"
+      - "traefik.http.routers.git-secure.tls=true"
+      - "traefik.http.routers.git-secure.tls.certresolver=cs"
+      - "traefik.http.routers.git-secure.tls.domains[0].main=gitea.steinle-computer.de"
+      - "traefik.http.services.git-secure.loadbalancer.server.port=3000"
+      - "traefik.tcp.routers.git-ssh.entrypoints=ssh"
+      - "traefik.tcp.routers.git-ssh.rule=HostSNI(`*`)"
+      - "traefik.tcp.routers.git-ssh.service=git-ssh"
+      - "traefik.tcp.services.git-ssh.loadbalancer.server.port=222"
+
+  gitea-db:
+    image: postgres:17-alpine
+    container_name: gitea-db
+    hostname: gitea-db
+    restart: unless-stopped
+    volumes:
+      - gitea-db:/var/lib/postgresql/data
+    networks:
+      - gitea
+    environment:
+      POSTGRES_PASSWORD: ${DB_PASS}
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_DB: ${DB_NAME}
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U $DB_USER" ]
+
+  runner:
+    image: gitea/act_runner
+    restart: always
+    depends_on:
+      - gitea
+    volumes:
+      - gitea-runner:/data
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      - GITEA_INSTANCE_URL=https://gitea.steinle-computer.de
+      - GITEA_RUNNER_REGISTRATION_TOKEN=flpCcwO0Dw6u4jtWT2wMBrBWuFZ8HDdS4qV277tH
+    networks:
+      - gitea

huber-putz/docker-compose.yaml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
   proxy:
     external: true

kimai-scheidle/docker-compose.yaml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 volumes:
   scheidle-app:
     name: scheidle-app

mail/docker-compose.yaml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 networks:
   proxy:
     external: true
@@ -55,7 +53,7 @@ services:
     healthcheck:
       test: "ss --listening --tcp | grep -P 'LISTEN.+:smtp' || exit 1"
       timeout: 3s
-      retries: 0
+      retries: 1
     networks:
        - proxy
        - mail

monitoring/docker-compose.yaml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 networks:
   proxy:
     external: true
@@ -107,5 +105,9 @@ services:
     environment:
       TZ: Europe/Berlin
       WATCHTOWER_INCLUDE_STOPPED: true
-      WATCHTOWER_MONITOR_ONLY: true
+      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}}"

monitoring/watchtower-config.json

@@ -1,9 +1,8 @@
 {
 	"auths": {
-		"cs-registry.ddnss.de": {
+		"cs-git.ddnss.de": {
-			"auth": "Y2hyaXM6U2VjcmV0MTI="
+			"auth": "Y2hyaXM6cScsXEgoT2Q6RzMpLlh2PCMhNVA="
-		},
+		},		"https://index.docker.io/v1/": {
-		"https://index.docker.io/v1/": {
 			"auth": "Y3MyMjExOkU2U2Njc3ViRFJrYUppMlNMVSUh"
 		}
 	}

rist-editors/docker-compose.yaml

@@ -1,12 +1,10 @@
-version: "3.9"
-
 networks:
   proxy:
     external: true
 
 services:
   rist-editors:
-    image: cs-registry.ddnss.de/ri-st/old_editors
+    image: cs-git.ddnss.de/ri-st/old-editors
     container_name: rist-editors
     hostname: rist-editors
     restart: unless-stopped

rist-startup/docker-compose.yaml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   startup-app:
     image: cs-git.ddnss.de/ri-st/startup
@@ -22,7 +20,7 @@ services:
       - "traefik.http.routers.rist-startup-secure.tls=true"
       - "traefik.http.routers.rist-startup-secure.tls.certresolver=cs"
       - "traefik.http.routers.rist-startup-secure.service=rist-startup-secure"
-      - "traefik.http.services.rist-startup-secure.loadbalancer.server.port=80"
+      - "traefik.http.services.rist-startup-secure.loadbalancer.server.port=8080"
 
   startup-db:
     image: mysql:8

svj/docker-compose.yaml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 volumes:
   svj-media:
     name: svj-media
@@ -15,7 +13,7 @@ networks:
 
 services:
   svj:
-    image: cs-registry.ddnss.de/svj/website:latest
+    image: cs-git.ddnss.de/svj/website:latest
     container_name: svj
     hostname: svj
     restart: unless-stopped