Watchtower: Simplify auto updates

2022-09-25 14:55:45 +02:00 · 2022-09-25 14:55:45 +02:00 · 5c7a1d11c9
commit 5c7a1d11c9
parent b616b8a854
14 changed files with 1 additions and 70 deletions
--- a/coreos-config/compose/00_traefik/docker-compose.yaml
+++ b/coreos-config/compose/00_traefik/docker-compose.yaml
@ -9,8 +9,6 @@ services:
      - "443:443"
      - "80:80"
    privileged: true
-    labels:
-      - "com.centurylinklabs.watchtower.scope=update"
    volumes:
      - "/var/run/docker.sock:/var/run/docker.sock:z"
      - "./traefik.yaml:/etc/traefik/traefik.yaml:Z,ro"
--- a/coreos-config/compose/01_keycloak/docker-compose.yaml
+++ b/coreos-config/compose/01_keycloak/docker-compose.yaml
@ -36,7 +36,6 @@ services:
      - "traefik.http.routers.keycloak.rule=Host(`auth.tobiasmanske.de`)"
      - "traefik.http.routers.keycloak.entryPoints=websecure"
      - "traefik.http.services.keycloak.loadbalancer.server.port=8080"
-      - "com.centurylinklabs.watchtower.scope=update"
    restart: always
    networks:
      - backend
--- a/coreos-config/compose/01_registry/docker-compose.yaml
+++ b/coreos-config/compose/01_registry/docker-compose.yaml
@ -4,7 +4,6 @@ services:
    container_name: registry
    restart: always
    labels:
-      - "com.centurylinklabs.watchtower.scope=update"
      - "traefik.enable=true"
      - "traefik.http.routers.registry.rule=Host(`registry.tobiasmanske.de`)"
      - "traefik.http.routers.registry.entryPoints=websecure"
@ -33,7 +32,6 @@ services:
      - "traefik.http.routers.registryui.rule=Host(`registry-ui.tobiasmanske.de`)"
      - "traefik.http.routers.registryui.entryPoints=websecure"
      - "traefik.http.services.registryui.loadbalancer.server.port=80"
-      - "com.centurylinklabs.watchtower.scope=update"
    networks:
      - gateway
      - backend
--- a/coreos-config/compose/02_gitea/docker-compose.yaml
+++ b/coreos-config/compose/02_gitea/docker-compose.yaml
@ -27,7 +27,6 @@ services:
      - "traefik.http.routers.gitea.rule=Host(`git.tobiasmanske.de`)"
      - "traefik.http.routers.gitea.entryPoints=websecure"
      - "traefik.http.services.gitea.loadbalancer.server.port=3000"
-      - "com.centurylinklabs.watchtower.scope=update"
    ports:
      - "7779:22"
    depends_on:
@ -36,8 +35,6 @@ services:
  db:
    image: postgres:14
    restart: always
-    labels:
-      - "com.centurylinklabs.watchtower.scope=update"
    environment:
      - POSTGRES_USER="{{ gitea.db.user }}"
      - POSTGRES_PASSWORD="{{ gitea.db.password }}"
@ -69,7 +66,6 @@ services:
      - "traefik.http.routers.drone.rule=Host(`drone.tobiasmanske.de`)"
      - "traefik.http.routers.drone.entryPoints=websecure"
      - "traefik.http.services.drone.loadbalancer.server.port=80"
-      - "com.centurylinklabs.watchtower.scope=update"
    depends_on:
      - gitea

@ -77,8 +73,6 @@ services:
    image: drone/drone-runner-docker:1.8
    restart: always
    privileged: true
-    labels:
-      - "com.centurylinklabs.watchtower.scope=update"
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
    environment:
--- a/coreos-config/compose/02_wireguard/docker-compose.yaml
+++ b/coreos-config/compose/02_wireguard/docker-compose.yaml
@ -16,8 +16,6 @@ services:
    volumes:
      - ./wg0.conf:/config/wg0.conf:ro,z
      - /lib/modules:/lib/modules:ro
-    labels:
-      - "com.centurylinklabs.watchtower.scope=update"
    ports:
      - 51820:51820/udp
    sysctls:
--- a/coreos-config/compose/03_hedgedoc/docker-compose.yaml
+++ b/coreos-config/compose/03_hedgedoc/docker-compose.yaml
@ -9,8 +9,6 @@ services:
      - POSTGRES_DB={{ hedgedoc.db.name }}
    volumes:
      - database:/var/lib/postgresql/data
-    labels:
-      - "com.centurylinklabs.watchtower.scope=update"
    restart: always
    networks:
      - backend
--- a/coreos-config/compose/03_miniflux/docker-compose.yaml
+++ b/coreos-config/compose/03_miniflux/docker-compose.yaml
@ -24,7 +24,6 @@ services:
      - "traefik.http.routers.miniflux.rule=Host(`rss.tobiasmanske.de`)"
      - "traefik.http.routers.miniflux.entryPoints=websecure"
      - "traefik.http.services.miniflux.loadbalancer.server.port=8080"
-      - "com.centurylinklabs.watchtower.scope=update"
    networks:
      - backend
      - gateway
--- a/coreos-config/compose/03_nextcloud/docker-compose.yaml
+++ b/coreos-config/compose/03_nextcloud/docker-compose.yaml
@ -13,8 +13,6 @@ services:
      - MYSQL_PASSWORD={{ nextcloud.db.password }}
      - MYSQL_DATABASE={{ nextcloud.db.name }}
      - MYSQL_USER={{ nextcloud.db.user }}
-    labels:
-      - "com.centurylinklabs.watchtower.scope=update"
    networks:
      - backend

@ -47,7 +45,6 @@ services:
      - "traefik.http.middlewares.nextcloud-dav.replacepathregex.replacement=/remote.php/dav/"
      - "traefik.http.middlewares.compression.compress=true"
      - "traefik.http.routers.nextcloud.middlewares=nextcloud,nextcloud-dav,compression"
-      - "com.centurylinklabs.watchtower.scope=update"

 volumes:
  nc_config:
--- a/coreos-config/compose/03_search/docker-compose.yaml
+++ b/coreos-config/compose/03_search/docker-compose.yaml
@ -20,7 +20,6 @@ services:
      - "traefik.http.services.searxng.loadbalancer.server.port=8080"
      - "traefik.http.middlewares.compression.compress=true"
      - "traefik.http.routers.searxng.middlewares=compression"
-      - "com.centurylinklabs.watchtower.scope=update"

  redis:
    container_name: redis
@ -36,25 +35,6 @@ services:
      - SETGID
      - SETUID
      - DAC_OVERRIDE
-    labels:
-      - "com.centurylinklabs.watchtower.scope=update"
-
-  # morty:
-  #   container_name: morty
-  #   image: dalf/morty
-  #   restart: always
-  #   command: -timeout 6 -ipv6
-  #   environment:
-  #     - MORTY_KEY={{ search.morty.key }}
-  #     - MORTY_ADDRESS=0.0.0.0:3030
-  #   labels:
-  #     - "traefik.enable=true"
-  #     - "traefik.http.routers.morty.rule=Host(`search.tobiasmanske.de`) && PathPrefix(`/morty`)"
-  #     - "traefik.http.routers.morty.entrypoints=websecure"
-  #     - "traefik.http.services.morty.loadbalancer.server.port=3030"
-  #   networks:
-  #     - gateway
-  #     - backend

 networks:
  gateway:
--- a/coreos-config/compose/03_syncthing/docker-compose.yaml
+++ b/coreos-config/compose/03_syncthing/docker-compose.yaml
@ -14,8 +14,6 @@ services:
      - ./config/key.pem:/var/syncthing/config/key.pem:ro,z
      - ./config/config.xml:/var/syncthing/config/config.xml:ro,z
    hostname: "Netcup"
-    labels:
-      - "com.centurylinklabs.watchtower.scope=update"
    environment:
      - PUID=0
      - PGID=0
--- a/coreos-config/compose/04_blog/docker-compose.yaml
+++ b/coreos-config/compose/04_blog/docker-compose.yaml
@ -9,7 +9,6 @@ services:
      - "traefik.http.routers.tobiasmanskede.rule=Host(`tobiasmanske.de`) || Host(`www.tobiasmanske.de`)"
      - "traefik.http.routers.tobiasmanskede.entryPoints=websecure"
      - "traefik.http.services.tobiasmanskede.loadbalancer.server.port=80"
-      - "com.centurylinklabs.watchtower.scope=http"
    restart: always
    networks:
      - gateway
--- a/coreos-config/compose/05_caddy/docker-compose.yaml
+++ b/coreos-config/compose/05_caddy/docker-compose.yaml
@ -11,7 +11,6 @@ services:
      - "traefik.http.routers.caddyredir.rule={{ redirect.hosts | map(attribute='from') | map('regex_replace', '^(.*)$', 'Host(`\\1`)') | join(' || ') }}"
      - "traefik.http.routers.caddyredir.entryPoints=websecure"
      - "traefik.http.services.caddyredir.loadbalancer.server.port=80"
-      - "com.centurylinklabs.watchtower.scope=update"
    restart: always
    networks:
      - gateway
--- a/coreos-config/compose/05_thelounge/docker-compose.yaml
+++ b/coreos-config/compose/05_thelounge/docker-compose.yaml
@ -11,7 +11,6 @@ services:
      - "traefik.http.routers.thelounge.rule=Host(`lounge.tobiasmanske.de`)"
      - "traefik.http.routers.thelounge.entryPoints=websecure"
      - "traefik.http.services.thelounge.loadbalancer.server.port=9000"
-      - "com.centurylinklabs.watchtower.scope=update"
    restart: always
    networks:
      - gateway
--- a/coreos-config/compose/05_watchtower/docker-compose.yaml
+++ b/coreos-config/compose/05_watchtower/docker-compose.yaml
@ -6,10 +6,9 @@ services:
    privileged: true
    environment:
      DOCKER_CONFIG: /config
-      WATCHTOWER_POLL_INTERVAL: 21600
+      WATCHTOWER_SCHEDULE: 0 42 * * * *
      WATCHTOWER_CLEANUP: 1
      WATCHTOWER_ROLLING_RESTART: 1
-      WATCHTOWER_SCOPE: update
      WATCHTOWER_NOTIFICATIONS: slack
      WATCHTOWER_NOTIFICATION_SLACK_HOOK_URL: https://discord.com/api/webhooks/{{ watchtower.discord.webhook }}/slack
      WATCHTOWER_NOTIFICATION_SLACK_IDENTIFIER: Watchtower
@ -19,28 +18,4 @@ services:
      - /var/run/docker.sock:/var/run/docker.sock
      - /home/core/.docker:/config
    restart: always
-    labels:
-      - "com.centurylinklabs.watchtower.scope=update"
-
-  http:
-    image: containrrr/watchtower:latest
-    privileged: true
-    container_name: HTTP
-    environment:
-      DOCKER_CONFIG: /config
-      WATCHTOWER_POLL_INTERVAL: 900
-      WATCHTOWER_CLEANUP: 1
-      WATCHTOWER_ROLLING_RESTART: 1
-      WATCHTOWER_SCOPE: http
-      WATCHTOWER_NOTIFICATIONS: slack
-      WATCHTOWER_NOTIFICATION_SLACK_HOOK_URL: https://discord.com/api/webhooks/{{ watchtower.discord.webhook }}/slack
-      WATCHTOWER_NOTIFICATION_SLACK_IDENTIFIER: Watchtower
-      WATCHTOWER_NOTIFICATION_SLACK_ICON_EMOJI: ":whale:"
-      WATCHTOWER_NOTIFICATION_SLACK_ICON_URL: https://raw.githubusercontent.com/containrrr/watchtower/master/logo.png
-    volumes:
-      - /home/core/.docker/:/config/
-      - /var/run/docker.sock:/var/run/docker.sock
-    restart: always
-    labels:
-      - "com.centurylinklabs.watchtower.scope=http"
 ...