diff --git a/docker-compose/httpd/docker-compose.yml.j2 b/docker-compose/httpd/docker-compose.yml.j2 index f145e06a..eb7cd5cb 100644 --- a/docker-compose/httpd/docker-compose.yml.j2 +++ b/docker-compose/httpd/docker-compose.yml.j2 @@ -9,8 +9,6 @@ services: - "{{ compose_dest_basedir }}/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf:ro" ports: - 3344:80 - labels: - com.centurylinklabs.watchtower.enable: true healthcheck: test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost/"] interval: 30s @@ -32,8 +30,6 @@ services: UPLOAD_DIRECTORY: /uploads AUTH_TOKEN: "{{ lookup('keepass', 'httpd-api-server-token', 'password') }}" ENABLE_WEBSERVER: false - labels: - com.centurylinklabs.watchtower.enable: true volumes: uploads: diff --git a/docker-compose/mail-relay/docker-compose.yml.j2 b/docker-compose/mail-relay/docker-compose.yml.j2 index 90664521..94a5c294 100644 --- a/docker-compose/mail-relay/docker-compose.yml.j2 +++ b/docker-compose/mail-relay/docker-compose.yml.j2 @@ -4,8 +4,6 @@ services: image: "registry.mgrote.net/postfix:master@sha256:40295c98aaf8736a0b5dced79df48caf8bf717019629a6c2147c5b10e64f6eba" container_name: mail-relay restart: always - labels: - com.centurylinklabs.watchtower.enable: true ports: - 1025:25 environment: diff --git a/docker-compose/miniflux/docker-compose.yml.j2 b/docker-compose/miniflux/docker-compose.yml.j2 index 7ddef421..1fa47a7c 100644 --- a/docker-compose/miniflux/docker-compose.yml.j2 +++ b/docker-compose/miniflux/docker-compose.yml.j2 @@ -31,9 +31,6 @@ services: traefik.http.routers.miniflux.entrypoints: entry_https traefik.http.services.miniflux.loadbalancer.server.port: 8080 - com.centurylinklabs.watchtower.enable: true - com.centurylinklabs.watchtower.depends-on: mf-db16 - ######## Postgres ######## mf-db16: container_name: "mf-db16" @@ -52,8 +49,6 @@ services: test: ["CMD", "pg_isready", "-U", "miniflux"] interval: 10s start_period: 30s - labels: - com.centurylinklabs.watchtower.enable: true ######## Miniflux-Filter ######## mf-filter: @@ -72,9 +67,6 @@ services: - ./filter.txt:/data/filter.txt networks: - intern - labels: - com.centurylinklabs.watchtower.enable: true - com.centurylinklabs.watchtower.depends-on: mf-frontend ######## Volumes ######## volumes: diff --git a/docker-compose/navidrome/docker-compose.yml.j2 b/docker-compose/navidrome/docker-compose.yml.j2 index fd06040c..c69e574b 100644 --- a/docker-compose/navidrome/docker-compose.yml.j2 +++ b/docker-compose/navidrome/docker-compose.yml.j2 @@ -35,8 +35,6 @@ services: traefik.http.routers.navidrome-mg.tls.certresolver: resolver_letsencrypt traefik.http.routers.navidrome-mg.entrypoints: entry_https traefik.http.services.navidrome-mg.loadbalancer.server.port: 4533 - - com.centurylinklabs.watchtower.enable: true ports: - "4533:4533" diff --git a/docker-compose/nextcloud/docker-compose.yml.j2 b/docker-compose/nextcloud/docker-compose.yml.j2 index cbb294a0..21a3ada7 100644 --- a/docker-compose/nextcloud/docker-compose.yml.j2 +++ b/docker-compose/nextcloud/docker-compose.yml.j2 @@ -28,8 +28,6 @@ services: "--connect", ] timeout: 30s - labels: - com.centurylinklabs.watchtower.enable: true # Error ## [ERROR] Incorrect definition of table mysql.column_stats: expected column 'histogram' at position 10 to have type longblob, found type varbinary(255). @@ -47,8 +45,6 @@ services: - intern restart: unless-stopped command: "redis-server --requirepass {{ lookup('keepass', 'nextcloud_redis_host_password', 'password') }}" - labels: - com.centurylinklabs.watchtower.enable: true healthcheck: test: ["CMD", "redis-cli", "--pass", "{{ lookup('keepass', 'nextcloud_redis_host_password', 'password') }}", "--no-auth-warning", "ping"] interval: 5s @@ -69,8 +65,6 @@ services: environment: NEXTCLOUD_CONTAINER_NAME: nextcloud-app NEXTCLOUD_CRON_MINUTE_INTERVAL: 1 - labels: - com.centurylinklabs.watchtower.enable: true ######## Nextcloud ######## nextcloud-app: @@ -112,9 +106,6 @@ services: timeout: 10s retries: 3 labels: - com.centurylinklabs.watchtower.enable: true - com.centurylinklabs.watchtower.depends-on: nextcloud-redis,nextcloud-db - traefik.http.routers.nextcloud.rule: Host(`nextcloud.mgrote.net`) traefik.enable: true traefik.http.routers.nextcloud.tls: true diff --git a/docker-compose/registry/docker-compose.yml.j2 b/docker-compose/registry/docker-compose.yml.j2 index b41caea3..217ae068 100644 --- a/docker-compose/registry/docker-compose.yml.j2 +++ b/docker-compose/registry/docker-compose.yml.j2 @@ -44,9 +44,6 @@ services: traefik.http.middlewares.registry-ipallowlist.ipallowlist.sourcerange: 192.168.2.0/24,10.25.25.0/24,192.168.48.0/24,172.18.0.0/16 # .48. ist Docker traefik.http.middlewares.registry-ipallowlist.ipallowlist.ipstrategy.depth: 0 # https://doc.traefik.io/traefik/middlewares/http/ipallowlist/#ipstrategydepth - com.centurylinklabs.watchtower.depends-on: oci-registry-redis - com.centurylinklabs.watchtower.enable: true - # registry aufräumen: docker exec -it oci-registry /bin/registry garbage-collect --delete-untagged=true /etc/docker/registry/config.yml # testen mit: @@ -64,8 +61,6 @@ services: environment: REDIS_PASSWORD: "{{ lookup('keepass', 'oci-registry-redis-pw', 'password') }}" MAXMEMORY POLICY: allkeys-lru - labels: - com.centurylinklabs.watchtower.enable: true healthcheck: test: ["CMD", "redis-cli", "ping"] interval: 30s @@ -105,11 +100,6 @@ services: traefik.http.middlewares.registry-ui-ipallowlist.ipallowlist.sourcerange: 192.168.2.0/24,10.25.25.0/24 # .48. ist Docker traefik.http.middlewares.registry-ui-ipallowlist.ipallowlist.ipstrategy.depth: 0 # https://doc.traefik.io/traefik/middlewares/http/ipallowlist/#ipstrategydepth - - com.centurylinklabs.watchtower.depends-on: oci-registry-redis,oci-registry - com.centurylinklabs.watchtower.enable: true - - ######## Networks ######## networks: traefik: diff --git a/docker-compose/statping-ng/docker-compose.yml.j2 b/docker-compose/statping-ng/docker-compose.yml.j2 index 9a41aec4..1d372f39 100644 --- a/docker-compose/statping-ng/docker-compose.yml.j2 +++ b/docker-compose/statping-ng/docker-compose.yml.j2 @@ -17,8 +17,6 @@ services: - 8083:8080 networks: - mail-relay - labels: - com.centurylinklabs.watchtower.enable: true volumes: statping_data: diff --git a/docker-compose/traefik/docker-compose.yml.j2 b/docker-compose/traefik/docker-compose.yml.j2 index 3855b459..813dcead 100644 --- a/docker-compose/traefik/docker-compose.yml.j2 +++ b/docker-compose/traefik/docker-compose.yml.j2 @@ -19,8 +19,6 @@ services: - "2222:2222" # SSH environment: TZ: Europe/Berlin - labels: - com.centurylinklabs.watchtower.enable: true healthcheck: test: ["CMD", "traefik", "healthcheck", "--ping"] interval: 30s @@ -45,9 +43,6 @@ services: traefik.http.routers.nforwardauth.tls: true traefik.http.routers.nforwardauth.tls.certresolver: resolver_letsencrypt traefik.http.routers.nforwardauth.entrypoints: entry_https - - com.centurylinklabs.watchtower.depends-on: traefik - com.centurylinklabs.watchtower.enable: true volumes: - "./passwd:/passwd:ro" # Mount local passwd file at /passwd as read only networks: diff --git a/docker-compose/unifi-network-application/docker-compose.yml.j2 b/docker-compose/unifi-network-application/docker-compose.yml.j2 index db2f605d..4520637b 100644 --- a/docker-compose/unifi-network-application/docker-compose.yml.j2 +++ b/docker-compose/unifi-network-application/docker-compose.yml.j2 @@ -28,9 +28,6 @@ services: - 6789:6789 #optional - 5514:5514/udp #optional restart: always - labels: - com.centurylinklabs.watchtower.enable: true - com.centurylinklabs.watchtower.depends-on: unifi-db networks: - mail-relay - unifi-internal @@ -53,8 +50,6 @@ services: restart: always environment: MARIADB_AUTO_UPGRADE: "1" - labels: - com.centurylinklabs.watchtower.enable: true networks: - unifi-internal healthcheck: diff --git a/docker-compose/watchtower/docker-compose.yml.j2 b/docker-compose/watchtower/docker-compose.yml.j2 deleted file mode 100644 index 707ad252..00000000 --- a/docker-compose/watchtower/docker-compose.yml.j2 +++ /dev/null @@ -1,42 +0,0 @@ -version: "3" -services: - watchtower: - restart: always - container_name: watchtower - image: "containrrr/watchtower:1.7.1@sha256:6dd50763bbd632a83cb154d5451700530d1e44200b268a4e9488fefdfcf2b038" - volumes: - - /var/run/docker.sock:/var/run/docker.sock - environment: - TZ: Europe/Berlin - WATCHTOWER_CLEANUP: true - WATCHTOWER_INCLUDE_RESTARTING: true - WATCHTOWER_INCLUDE_STOPPED: true - WATCHTOWER_REVIVE_STOPPED: false - WATCHTOWER_SCHEDULE: "0 20 3 * * *" # jeden Tag um 03:20 - WATCHTOWER_LABEL_ENABLE: true - WATCHTOWER_NOTIFICATIONS: email - WATCHTOWER_NOTIFICATION_EMAIL_FROM: info@mgrote.net - WATCHTOWER_NOTIFICATION_EMAIL_TO: info@mgrote.net - WATCHTOWER_NOTIFICATION_EMAIL_SERVER: mail-relay # "container_name" des Relays - # WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT: 25 # nicht benötigt, nur als Referenz stehen gelassen - # WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER: "" # nicht benötigt, nur als Referenz stehen gelassen - # WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD: "" # nicht benötigt, nur als Referenz stehen gelassen - WATCHTOWER_NOTIFICATION_EMAIL_DELAY: 2 - WATCHTOWER_NO_STARTUP_MESSAGE: true - labels: - com.centurylinklabs.watchtower.enable: true - networks: - - mail-relay # binde externe Netzwerk an Container - -# monitore diesen Container nur -# labels: -# com.centurylinklabs.watchtower.monitor-only: true -# dieser container hängt von x ab -# com.centurylinklabs.watchtower.depends-on: mf-db -# aktualisiere container -# com.centurylinklabs.watchtower.enable: true - -######## Networks ######## -networks: - mail-relay: # damit das mail-relaay im anderen Container erreicht werden kann - external: true diff --git a/docker-compose/wiki/docker-compose.yml.j2 b/docker-compose/wiki/docker-compose.yml.j2 index c865a874..35bd3c4b 100644 --- a/docker-compose/wiki/docker-compose.yml.j2 +++ b/docker-compose/wiki/docker-compose.yml.j2 @@ -28,8 +28,6 @@ services: traefik.http.routers.wiki.middlewares: nforwardauth - com.centurylinklabs.watchtower.enable: true - ######## Networks ######## networks: traefik: diff --git a/docker-compose/woodpecker/docker-compose.yml.j2 b/docker-compose/woodpecker/docker-compose.yml.j2 index 6c94be34..eb92a401 100644 --- a/docker-compose/woodpecker/docker-compose.yml.j2 +++ b/docker-compose/woodpecker/docker-compose.yml.j2 @@ -26,8 +26,6 @@ services: - intern - traefik labels: - com.centurylinklabs.watchtower.enable: true - traefik.http.routers.woodpecker.rule: Host(`ci.mgrote.net`) traefik.enable: true traefik.http.routers.woodpecker.tls: true @@ -61,8 +59,6 @@ services: WOODPECKER_LOG_LEVEL: info WOODPECKER_HEALTHCHECK: true WOODPECKER_BACKEND: docker - labels: - com.centurylinklabs.watchtower.enable: true networks: - intern diff --git a/host_vars/docker10.mgrote.net.yml b/host_vars/docker10.mgrote.net.yml index c868247d..537a3d1a 100644 --- a/host_vars/docker10.mgrote.net.yml +++ b/host_vars/docker10.mgrote.net.yml @@ -60,7 +60,7 @@ compose_files: state: present network: traefik - name: watchtower - state: present + state: absent - name: routeros-config-export state: present - name: mail-relay