From 72c234d5261cf59df60928220574566d98e465ca Mon Sep 17 00:00:00 2001 From: Christian Elberfeld <elberfeld@web.de> Date: Thu, 21 Mar 2024 11:32:30 +0100 Subject: [PATCH] docker container auto update --- intern/docker_esphome/templates/docker-compose.yml | 2 +- intern/docker_grafana/templates/docker-compose.yml | 2 +- intern/docker_heimdall/templates/docker-compose.yml | 2 +- intern/docker_homeassistant/templates/docker-compose.yml | 4 ++-- intern/docker_mqtt/templates/docker-compose.yml | 8 ++++---- intern/docker_nodered/templates/docker-compose.yml | 2 +- intern/docker_omada/templates/docker-compose.yml | 2 +- remote/docker_homeassistant/templates/docker-compose.yml | 4 ++-- remote/docker_netdata/templates/docker-compose.yml | 2 +- remote/docker_prometheus/templates/docker-compose.yml | 4 ++-- remote/docker_unifi/templates/docker-compose.yml | 2 +- .../docker_dockerstats/templates/docker-compose.yml | 2 ++ testserver/docker_dokuwiki/templates/docker-compose.yml | 1 + testserver/docker_gitlab/templates/docker-compose.yml | 2 +- testserver/docker_icinga/templates/docker-compose.yml | 3 +++ testserver/docker_mail/templates/docker-compose.yml | 4 ++-- testserver/docker_traefik/templates/docker-compose.yml | 2 +- testserver/docker_uffd/templates/docker-compose.yml | 1 + testserver/docker_wordpress/templates/docker-compose.yml | 1 + verwaltung/docker_gitea/templates/docker-compose.yml | 4 ++-- verwaltung/docker_jameica/templates/docker-compose.yml | 4 ++-- verwaltung/docker_mysql/templates/docker-compose.yml | 2 +- verwaltung/docker_nextcloud/templates/docker-compose.yml | 6 +++--- 23 files changed, 37 insertions(+), 29 deletions(-) diff --git a/intern/docker_esphome/templates/docker-compose.yml b/intern/docker_esphome/templates/docker-compose.yml index 6d3d0efe..f1975dbc 100644 --- a/intern/docker_esphome/templates/docker-compose.yml +++ b/intern/docker_esphome/templates/docker-compose.yml @@ -4,7 +4,7 @@ services: app: - image: esphome/esphome:2023.12 + image: esphome/esphome:latest restart: always volumes: - "{{ basedir }}/config/:/config" diff --git a/intern/docker_grafana/templates/docker-compose.yml b/intern/docker_grafana/templates/docker-compose.yml index 139845d8..e8d66fe5 100644 --- a/intern/docker_grafana/templates/docker-compose.yml +++ b/intern/docker_grafana/templates/docker-compose.yml @@ -4,7 +4,7 @@ services: app: - image: grafana/grafana:10.2.3 + image: grafana/grafana:latest restart: always volumes: - "{{ basedir }}/grafana.ini:/etc/grafana/grafana.ini" diff --git a/intern/docker_heimdall/templates/docker-compose.yml b/intern/docker_heimdall/templates/docker-compose.yml index 049721a1..9722de41 100644 --- a/intern/docker_heimdall/templates/docker-compose.yml +++ b/intern/docker_heimdall/templates/docker-compose.yml @@ -4,7 +4,7 @@ version: "2.1" services: app: - image: lscr.io/linuxserver/heimdall:2.5.8 + image: lscr.io/linuxserver/heimdall:latest restart: always environment: - PUID=1000 diff --git a/intern/docker_homeassistant/templates/docker-compose.yml b/intern/docker_homeassistant/templates/docker-compose.yml index f4bf2c6f..b770ce40 100644 --- a/intern/docker_homeassistant/templates/docker-compose.yml +++ b/intern/docker_homeassistant/templates/docker-compose.yml @@ -5,7 +5,7 @@ services: app: - image: homeassistant/home-assistant:2024.2 + image: homeassistant/home-assistant:latest restart: always ports: - "{{ int_ip4 }}:{{ homematic_callback_port }}:{{ homematic_callback_port }}" @@ -26,7 +26,7 @@ services: influxdb: - image: influxdb:2.7.5 + image: influxdb:2 restart: always ports: - "{{ int_ip4 }}:{{ influxdb_port }}:8086" diff --git a/intern/docker_mqtt/templates/docker-compose.yml b/intern/docker_mqtt/templates/docker-compose.yml index 63b6fcd4..7edd906f 100644 --- a/intern/docker_mqtt/templates/docker-compose.yml +++ b/intern/docker_mqtt/templates/docker-compose.yml @@ -4,7 +4,7 @@ services: app: - image: eclipse-mosquitto:2.0.15 + image: eclipse-mosquitto:2 restart: always ports: - "{{mqtt_port}}:1883" @@ -16,7 +16,7 @@ services: influxdb: - image: influxdb:2.6.1 + image: influxdb:2 restart: always ports: - {{ int_ip4 }}:{{ influxdb_port }}:8086 @@ -34,7 +34,7 @@ services: tgbinary: - image: telegraf:1.25.3 + image: telegraf:latest restart: always depends_on: - app @@ -45,7 +45,7 @@ services: tgfloat: - image: telegraf:1.25.3 + image: telegraf:latest restart: always depends_on: - app diff --git a/intern/docker_nodered/templates/docker-compose.yml b/intern/docker_nodered/templates/docker-compose.yml index f2e8d4f1..98ed85b4 100644 --- a/intern/docker_nodered/templates/docker-compose.yml +++ b/intern/docker_nodered/templates/docker-compose.yml @@ -9,7 +9,7 @@ version: "3" services: app: - image: nodered/node-red:3.1.3 + image: nodered/node-red:latest restart: always volumes: - "{{ basedir }}/data:/data" diff --git a/intern/docker_omada/templates/docker-compose.yml b/intern/docker_omada/templates/docker-compose.yml index e981bada..4ccdfb95 100644 --- a/intern/docker_omada/templates/docker-compose.yml +++ b/intern/docker_omada/templates/docker-compose.yml @@ -5,7 +5,7 @@ services: app: - image: mbentley/omada-controller:5.12 + image: mbentley/omada-controller:latest restart: always ports: - {{ omada_port_http }}:8088 diff --git a/remote/docker_homeassistant/templates/docker-compose.yml b/remote/docker_homeassistant/templates/docker-compose.yml index 9b02cb4f..dd4c1e3f 100644 --- a/remote/docker_homeassistant/templates/docker-compose.yml +++ b/remote/docker_homeassistant/templates/docker-compose.yml @@ -5,7 +5,7 @@ services: app: - image: homeassistant/home-assistant:2024.1.2 + image: homeassistant/home-assistant:latest restart: always volumes: - "/etc/localtime:/etc/localtime:ro" @@ -24,7 +24,7 @@ services: influxdb: - image: influxdb:2.7.5 + image: influxdb:2 restart: always ports: - "{{ int_ip4 }}:{{ influxdb_port }}:8086" diff --git a/remote/docker_netdata/templates/docker-compose.yml b/remote/docker_netdata/templates/docker-compose.yml index bc1f81a5..e22fc139 100644 --- a/remote/docker_netdata/templates/docker-compose.yml +++ b/remote/docker_netdata/templates/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: app: - image: netdata/netdata:v1.38.1 + image: netdata/netdata:latest restart: always cap_add: - SYS_PTRACE diff --git a/remote/docker_prometheus/templates/docker-compose.yml b/remote/docker_prometheus/templates/docker-compose.yml index 94154cf9..06d5d333 100644 --- a/remote/docker_prometheus/templates/docker-compose.yml +++ b/remote/docker_prometheus/templates/docker-compose.yml @@ -5,7 +5,7 @@ services: app: - image: prom/prometheus:v2.48.1 + image: prom/prometheus:latest restart: always ports: - 9090:9090 @@ -27,7 +27,7 @@ services: - web snmp: - image: quay.io/prometheus/snmp-exporter:v0.25.0 + image: quay.io/prometheus/snmp-exporter:latest restart: always diff --git a/remote/docker_unifi/templates/docker-compose.yml b/remote/docker_unifi/templates/docker-compose.yml index af715748..b20c7e1a 100644 --- a/remote/docker_unifi/templates/docker-compose.yml +++ b/remote/docker_unifi/templates/docker-compose.yml @@ -5,7 +5,7 @@ services: app: - image: linuxserver/unifi-controller:8.0.24 + image: linuxserver/unifi-controller:latest restart: always ports: - 8443:8443 diff --git a/testserver/docker_dockerstats/templates/docker-compose.yml b/testserver/docker_dockerstats/templates/docker-compose.yml index 248d813d..b7b871e4 100644 --- a/testserver/docker_dockerstats/templates/docker-compose.yml +++ b/testserver/docker_dockerstats/templates/docker-compose.yml @@ -11,4 +11,6 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - /usr/bin/docker:/usr/bin/docker + labels: + - com.centurylinklabs.watchtower.enable=false diff --git a/testserver/docker_dokuwiki/templates/docker-compose.yml b/testserver/docker_dokuwiki/templates/docker-compose.yml index 5cef278a..f7d425f9 100644 --- a/testserver/docker_dokuwiki/templates/docker-compose.yml +++ b/testserver/docker_dokuwiki/templates/docker-compose.yml @@ -11,6 +11,7 @@ services: - /srv/dokuwiki/data/:/var/www/html - /srv/dokuwiki/pdftemplate/:/var/www/html/lib/plugins/dw2pdf/tpl/warpzone/ labels: + - com.centurylinklabs.watchtower.enable=false - traefik.enable=true - traefik.http.routers.{{ servicename }}.rule=Host(`{{ domain }}`) - traefik.http.routers.{{ servicename }}.entrypoints=websecure diff --git a/testserver/docker_gitlab/templates/docker-compose.yml b/testserver/docker_gitlab/templates/docker-compose.yml index 161ba773..6b623c7f 100644 --- a/testserver/docker_gitlab/templates/docker-compose.yml +++ b/testserver/docker_gitlab/templates/docker-compose.yml @@ -5,7 +5,7 @@ services: app: - image: gitlab/gitlab-ce:16.7.4-ce.0 + image: gitlab/gitlab-ce:latest restart: always ports: - "444:22" diff --git a/testserver/docker_icinga/templates/docker-compose.yml b/testserver/docker_icinga/templates/docker-compose.yml index 1edfcb28..998f5859 100644 --- a/testserver/docker_icinga/templates/docker-compose.yml +++ b/testserver/docker_icinga/templates/docker-compose.yml @@ -36,6 +36,7 @@ services: ICINGA2_FEATURE_GRAPHITE_PORT: 2003 ICINGA2_FEATURE_DIRECTOR: 0 labels: + - com.centurylinklabs.watchtower.enable=false - traefik.enable=true - traefik.http.routers.{{ servicename }}.middlewares={{ servicename }}-auth - traefik.http.routers.{{ servicename }}.rule=Host(`{{ domain }}`) @@ -46,6 +47,7 @@ services: - web + # TODO: Evaluate alternatives, possibly: mesosphere/traefik-forward-auth auth: image: thomseddon/traefik-forward-auth:2.2 restart: always @@ -62,6 +64,7 @@ services: PROVIDERS_GENERIC_OAUTH_SCOPE: profile PROVIDERS_GENERIC_OAUTH_TOKEN_STYLE: header labels: + - com.centurylinklabs.watchtower.enable=false - traefik.enable=true - traefik.http.middlewares.{{ servicename }}-auth.forwardauth.address=http://auth:4181 - traefik.http.middlewares.{{ servicename }}-auth.forwardauth.authResponseHeaders=X-Forwarded-User diff --git a/testserver/docker_mail/templates/docker-compose.yml b/testserver/docker_mail/templates/docker-compose.yml index 5c1dd812..2d8e4937 100644 --- a/testserver/docker_mail/templates/docker-compose.yml +++ b/testserver/docker_mail/templates/docker-compose.yml @@ -4,7 +4,7 @@ services: # External dependencies redis: - image: redis:alpine + image: redis:7-alpine restart: always volumes: - "{{ basedir }}/mailu/redis:/data" @@ -142,7 +142,7 @@ services: # Optional mailu services: Database db: - image: mariadb:11.2 + image: mariadb:11 command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci restart: always volumes: diff --git a/testserver/docker_traefik/templates/docker-compose.yml b/testserver/docker_traefik/templates/docker-compose.yml index 865cd732..51b6d708 100644 --- a/testserver/docker_traefik/templates/docker-compose.yml +++ b/testserver/docker_traefik/templates/docker-compose.yml @@ -3,7 +3,7 @@ version: '2.4' services: app: - image: traefik:v3.0.0-beta5 + image: traefik:3.0 restart: always ports: - "80:80" diff --git a/testserver/docker_uffd/templates/docker-compose.yml b/testserver/docker_uffd/templates/docker-compose.yml index ca0dbef3..b6cd606f 100644 --- a/testserver/docker_uffd/templates/docker-compose.yml +++ b/testserver/docker_uffd/templates/docker-compose.yml @@ -28,6 +28,7 @@ services: UFFD_INITIAL_ADMIN_PW: "{{ uffd_admin_pass }}" UFFD_INITIAL_ADMIN_MAIL: "uffdadmin@jabertwo.de" labels: + - com.centurylinklabs.watchtower.enable=false - traefik.enable=true - traefik.http.routers.{{ servicename }}.rule=Host(`{{ domain }}`) - traefik.http.routers.{{ servicename }}.entrypoints=websecure diff --git a/testserver/docker_wordpress/templates/docker-compose.yml b/testserver/docker_wordpress/templates/docker-compose.yml index bd06cf59..b15d26db 100644 --- a/testserver/docker_wordpress/templates/docker-compose.yml +++ b/testserver/docker_wordpress/templates/docker-compose.yml @@ -29,6 +29,7 @@ services: WORDPRESS_DB_USER: wordpress WORDPRESS_DB_PASSWORD: "{{ mysql_user_pass }}" labels: + - com.centurylinklabs.watchtower.enable=false - traefik.enable=true - traefik.http.routers.{{ servicename }}.rule=Host(`{{ domain }}`) - traefik.http.routers.{{ servicename }}.entrypoints=websecure diff --git a/verwaltung/docker_gitea/templates/docker-compose.yml b/verwaltung/docker_gitea/templates/docker-compose.yml index 6330d9e7..d1eef0b1 100644 --- a/verwaltung/docker_gitea/templates/docker-compose.yml +++ b/verwaltung/docker_gitea/templates/docker-compose.yml @@ -4,7 +4,7 @@ version: "2.4" services: app: - image: gitea/gitea:1.21.4 + image: gitea/gitea:1 restart: always depends_on: - db @@ -37,7 +37,7 @@ services: db: - image: mariadb:11.2.2 + image: mariadb:11 restart: always volumes: - /srv/gitea/db/:/var/lib/mysql diff --git a/verwaltung/docker_jameica/templates/docker-compose.yml b/verwaltung/docker_jameica/templates/docker-compose.yml index 6b762102..93f34e2e 100644 --- a/verwaltung/docker_jameica/templates/docker-compose.yml +++ b/verwaltung/docker_jameica/templates/docker-compose.yml @@ -18,7 +18,7 @@ services: ldap_auth: - image: pinepain/ldap-auth-proxy:0.2.0 + image: pinepain/ldap-auth-proxy:latest restart: always environment: LOG_LEVEL: "info" @@ -36,7 +36,7 @@ services: nginx: - image: nginx:1.25 + image: nginx:1 restart: always depends_on: - vnc diff --git a/verwaltung/docker_mysql/templates/docker-compose.yml b/verwaltung/docker_mysql/templates/docker-compose.yml index cd0603be..ad2b0fdb 100644 --- a/verwaltung/docker_mysql/templates/docker-compose.yml +++ b/verwaltung/docker_mysql/templates/docker-compose.yml @@ -5,7 +5,7 @@ services: app: - image: mariadb:11.2.2 + image: mariadb:11 restart: always ports: - 127.0.0.1:3306:3306 diff --git a/verwaltung/docker_nextcloud/templates/docker-compose.yml b/verwaltung/docker_nextcloud/templates/docker-compose.yml index a81e236a..b3ed7646 100644 --- a/verwaltung/docker_nextcloud/templates/docker-compose.yml +++ b/verwaltung/docker_nextcloud/templates/docker-compose.yml @@ -4,7 +4,7 @@ services: redis: - image: redis:7.2.4 + image: redis:7-alpine restart: always networks: - default @@ -12,7 +12,7 @@ services: mysql: - image: mariadb:11.2.2 + image: mariadb:11 restart: always volumes: - /srv/nextcloud/db/:/var/lib/mysql @@ -27,7 +27,7 @@ services: app: - image: nextcloud:28.0.1-apache + image: nextcloud:28-apache restart: always volumes: - /srv/nextcloud/data/:/var/www/html/ -- GitLab