Compare commits

...

2 commits

Author SHA1 Message Date
827cd9975d diun manuell aktivieren 2024-06-26 10:34:44 +00:00
bf87e33277 small improvements: script, nextclout, git 2024-06-26 10:14:14 +00:00
10 changed files with 42 additions and 7 deletions

View file

@ -16,6 +16,7 @@ services:
- "traefik.http.routers.ffs.tls.options=intermediate@file" - "traefik.http.routers.ffs.tls.options=intermediate@file"
- "traefik.http.services.ffs.loadbalancer.server.port=5000" - "traefik.http.services.ffs.loadbalancer.server.port=5000"
- "docker.group=firefoxsync" - "docker.group=firefoxsync"
- "diun.enable=true"
restart: unless-stopped restart: unless-stopped
environment: environment:
- SYNCSERVER_PUBLIC_URL=https://firefoxsync.${DOMAIN} - SYNCSERVER_PUBLIC_URL=https://firefoxsync.${DOMAIN}
@ -46,6 +47,7 @@ services:
timeout: 5s timeout: 5s
labels: labels:
- "docker.group=firefoxsync" - "docker.group=firefoxsync"
- "diun.enable=true"
networks: networks:

View file

@ -1,6 +1,6 @@
services: services:
web: forgejo:
image: codeberg.org/forgejo/forgejo:${FORGEJO_VERSION} image: codeberg.org/forgejo/forgejo:${FORGEJO_VERSION}
volumes: volumes:
- ${VOLUMES_PATH}/git/forgejo_data:/data - ${VOLUMES_PATH}/git/forgejo_data:/data
@ -39,6 +39,7 @@ services:
- "traefik.http.middlewares.gitearedir.redirectregex.permanent=true" - "traefik.http.middlewares.gitearedir.redirectregex.permanent=true"
- "traefik.http.services.forgejo.loadbalancer.server.port=3000" - "traefik.http.services.forgejo.loadbalancer.server.port=3000"
- "docker.group=git" - "docker.group=git"
- "diun.enable=true"
db: db:
@ -58,6 +59,7 @@ services:
timeout: 5s timeout: 5s
labels: labels:
- "docker.group=git" - "docker.group=git"
- "diun.enable=true"
networks: networks:

View file

@ -16,6 +16,7 @@ services:
- "traefik.http.services.grafana.loadbalancer.server.port=3000" - "traefik.http.services.grafana.loadbalancer.server.port=3000"
- "traefik.docker.network=web" - "traefik.docker.network=web"
- "docker.group=monitoring" - "docker.group=monitoring"
- "diun.enable=true"
environment: environment:
- GF_DEFAULT_INSTANCE_NAME=monitoring.${DOMAIN} - GF_DEFAULT_INSTANCE_NAME=monitoring.${DOMAIN}
- GF_SERVER_ROOT_URL=http://monitoring.${DOMAIN} - GF_SERVER_ROOT_URL=http://monitoring.${DOMAIN}
@ -34,6 +35,7 @@ services:
depends_on: depends_on:
- influxdb - influxdb
- grafanadb - grafanadb
grafanadb: grafanadb:
@ -53,6 +55,7 @@ services:
timeout: 5s timeout: 5s
labels: labels:
- "docker.group=monitoring" - "docker.group=monitoring"
- "diun.enable=true"
influxdb: influxdb:
@ -77,6 +80,7 @@ services:
- "traefik.http.routers.influxdb.middlewares=influxauth" - "traefik.http.routers.influxdb.middlewares=influxauth"
- "traefik.http.middlewares.influxauth.basicauth.users=${INFLUXDB_HTPASSWD}" - "traefik.http.middlewares.influxauth.basicauth.users=${INFLUXDB_HTPASSWD}"
- "docker.group=monitoring" - "docker.group=monitoring"
- "diun.enable=true"
prometheus: prometheus:
@ -91,6 +95,7 @@ services:
- ${VOLUMES_PATH}/monitoring/prometheus:/prometheus - ${VOLUMES_PATH}/monitoring/prometheus:/prometheus
labels: labels:
- "docker.group=monitoring" - "docker.group=monitoring"
- "diun.enable=true"
# https://github.com/xperimental/nextcloud-exporter # https://github.com/xperimental/nextcloud-exporter
nextcloud-exporter: nextcloud-exporter:
@ -103,6 +108,7 @@ services:
- NEXTCLOUD_LISTEN_ADDRESS=:9205 - NEXTCLOUD_LISTEN_ADDRESS=:9205
labels: labels:
- "docker.group=monitoring" - "docker.group=monitoring"
- "diun.enable=true"
diun: diun:
@ -119,11 +125,13 @@ services:
- "DIUN_WATCH_SCHEDULE=0 */6 * * *" - "DIUN_WATCH_SCHEDULE=0 */6 * * *"
- "DIUN_WATCH_JITTER=30s" - "DIUN_WATCH_JITTER=30s"
- "DIUN_PROVIDERS_DOCKER_ENDPOINT=tcp://docker-socket-proxy:2375" - "DIUN_PROVIDERS_DOCKER_ENDPOINT=tcp://docker-socket-proxy:2375"
- "DIUN_PROVIDERS_DOCKER_WATCHBYDEFAULT=true" - "DIUN_PROVIDERS_DOCKER_WATCHBYDEFAULT=false"
- "DIUN_NOTIF_NTFY_ENDPOINT=${NTFY_SERVER}" - "DIUN_NOTIF_NTFY_ENDPOINT=${NTFY_SERVER}"
- "DIUN_NOTIF_NTFY_TOPIC=${NTFY_TOPIC}" - "DIUN_NOTIF_NTFY_TOPIC=${NTFY_TOPIC}"
- "DIUN_NOTIF_NTFY_TOKEN=${NTFY_TOKEN}" - "DIUN_NOTIF_NTFY_TOKEN=${NTFY_TOKEN}"
restart: always restart: always
labels:
- "diun.enable=true"
################################################################## ##################################################################
@ -148,6 +156,7 @@ services:
network_mode: "host" network_mode: "host"
labels: labels:
- "docker.group=monitoring" - "docker.group=monitoring"
- "diun.enable=true"
depends_on: depends_on:
- influxdb - influxdb
@ -162,6 +171,7 @@ services:
- dockersocket - dockersocket
labels: labels:
- "docker.group=monitoring" - "docker.group=monitoring"
- "diun.enable=true"
depends_on: depends_on:
- influxdb - influxdb

View file

@ -29,6 +29,7 @@ services:
- "traefik.http.middlewares.nextcloudHeader.headers.customResponseHeaders.X-Robots-Tag=noindex,nofollow" - "traefik.http.middlewares.nextcloudHeader.headers.customResponseHeaders.X-Robots-Tag=noindex,nofollow"
- "traefik.http.routers.nextcloud.middlewares=nextcloudHeader" - "traefik.http.routers.nextcloud.middlewares=nextcloudHeader"
- "docker.group=netxtcloud" - "docker.group=netxtcloud"
- "diun.enable=true"
app: app:
@ -105,10 +106,11 @@ services:
- "traefik.http.routers.ncpush.middlewares=ncpushstrip" - "traefik.http.routers.ncpush.middlewares=ncpushstrip"
- "traefik.http.middlewares.ncpushstrip.stripprefix.prefixes=/push" - "traefik.http.middlewares.ncpushstrip.stripprefix.prefixes=/push"
- "docker.group=proxy" - "docker.group=proxy"
- "diun.enable=true"
db: db:
image: mariadb:10 image: mariadb:${MARIADB_VERSION}
command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --skip-innodb-read-only-compressed command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --skip-innodb-read-only-compressed
volumes: volumes:
- ${VOLUMES_PATH}/nextcloud/db:/var/lib/mysql - ${VOLUMES_PATH}/nextcloud/db:/var/lib/mysql
@ -136,6 +138,7 @@ services:
timeout: 3s timeout: 3s
labels: labels:
- "docker.group=netxtcloud" - "docker.group=netxtcloud"
- "diun.enable=true"
# adminer: # adminer:
@ -158,6 +161,7 @@ services:
# - "traefik.http.routers.adminer.middlewares=adminerauth" # - "traefik.http.routers.adminer.middlewares=adminerauth"
# - "traefik.http.middlewares.adminerauth.basicauth.users=${HTPASSWD_ADMINER}" # - "traefik.http.middlewares.adminerauth.basicauth.users=${HTPASSWD_ADMINER}"
# - "docker.group=netxtcloud" # - "docker.group=netxtcloud"
# - "diun.enable=true"
redis: redis:
@ -175,6 +179,7 @@ services:
timeout: 3s timeout: 3s
labels: labels:
- "docker.group=netxtcloud" - "docker.group=netxtcloud"
- "diun.enable=true"
collabora: collabora:
@ -203,6 +208,7 @@ services:
- "traefik.http.routers.collabora.tls.options=intermediate@file" - "traefik.http.routers.collabora.tls.options=intermediate@file"
- "traefik.http.services.collabora.loadbalancer.server.port=9980" - "traefik.http.services.collabora.loadbalancer.server.port=9980"
- "docker.group=netxtcloud" - "docker.group=netxtcloud"
- "diun.enable=true"
drawio-export: drawio-export:
@ -216,6 +222,7 @@ services:
restart: unless-stopped restart: unless-stopped
labels: labels:
- "docker.group=netxtcloud" - "docker.group=netxtcloud"
- "diun.enable=false" # not enabled becaus of spamming :)
drawio: drawio:
@ -245,6 +252,7 @@ services:
- "traefik.http.routers.drawio.tls.options=intermediate@file" - "traefik.http.routers.drawio.tls.options=intermediate@file"
- "traefik.http.services.drawio.loadbalancer.server.port=8080" - "traefik.http.services.drawio.loadbalancer.server.port=8080"
- "docker.group=netxtcloud" - "docker.group=netxtcloud"
- "diun.enable=false" # not enabled becaus of spamming :)
networks: networks:
web: web:

View file

@ -59,6 +59,7 @@ services:
- "traefik.http.routers.dashboard.middlewares=auth" - "traefik.http.routers.dashboard.middlewares=auth"
- "traefik.http.middlewares.auth.basicauth.users=${HTPASSWD}" - "traefik.http.middlewares.auth.basicauth.users=${HTPASSWD}"
- "docker.group=proxy" - "docker.group=proxy"
- "diun.enable=true"
docker-socket-proxy: docker-socket-proxy:
image: tecnativa/docker-socket-proxy image: tecnativa/docker-socket-proxy
@ -78,6 +79,9 @@ services:
interval: 10s interval: 10s
timeout: 3s timeout: 3s
privileged: true privileged: true
labels:
- "docker.group=proxy"
- "diun.enable=true"
# whoami: # whoami:

View file

@ -1,9 +1,11 @@
#/bin/bash/ #/bin/bash/
for dir in ./*/ ; do for dir in ./*/ ; do
( cd "$dir" && echo "[Building $dir]" && docker compose build --pull ); echo "[Building and Pulling $dir]"
cd "$dir";
docker compose pull --ignore-buildable
docker compose build --pull;
cd ..;
echo;
done done
for dir in ./*/ ; do
( cd "$dir" && echo "[Pulling $dir]" && docker compose pull --ignore-buildable );
done

View file

@ -32,6 +32,7 @@ services:
- "traefik.http.routers.push.tls.options=intermediate@file" - "traefik.http.routers.push.tls.options=intermediate@file"
- "traefik.http.services.push.loadbalancer.server.port=80" - "traefik.http.services.push.loadbalancer.server.port=80"
- "docker.group=push" - "docker.group=push"
- "diun.enable=true"
networks: networks:
push: push:

View file

@ -17,6 +17,7 @@ services:
restart: unless-stopped restart: unless-stopped
labels: labels:
- "docker.group=rustdesk" - "docker.group=rustdesk"
- "diun.enable=true"
hbbr: hbbr:
ports: ports:
@ -31,6 +32,7 @@ services:
restart: unless-stopped restart: unless-stopped
labels: labels:
- "docker.group=rustdesk" - "docker.group=rustdesk"
- "diun.enable=true"
networks: networks:
rustdesk: rustdesk:

View file

@ -32,6 +32,7 @@ services:
- "traefik.http.routers.wallabag.tls.certresolver=netcup" - "traefik.http.routers.wallabag.tls.certresolver=netcup"
- "traefik.http.routers.wallabag.tls.options=intermediate@file" - "traefik.http.routers.wallabag.tls.options=intermediate@file"
- "docker.group=wallabag" - "docker.group=wallabag"
- "diun.enable=true"
depends_on: depends_on:
- db - db
- redis - redis
@ -47,6 +48,7 @@ services:
- /var/dockervolumes/wallabag/db:/var/lib/mysql - /var/dockervolumes/wallabag/db:/var/lib/mysql
labels: labels:
- "docker.group=wallabag" - "docker.group=wallabag"
- "diun.enable=true"
redis: redis:
image: redis:7.2.4 image: redis:7.2.4
@ -59,6 +61,7 @@ services:
timeout: 3s timeout: 3s
labels: labels:
- "docker.group=wallabag" - "docker.group=wallabag"
- "diun.enable=true"
networks: networks:

View file

@ -27,6 +27,7 @@ services:
- "traefik.http.routers.www-secure.tls.certresolver=netcup" - "traefik.http.routers.www-secure.tls.certresolver=netcup"
- "traefik.http.routers.www-secure.tls.options=intermediate@file" - "traefik.http.routers.www-secure.tls.options=intermediate@file"
- "docker.group=www" - "docker.group=www"
- "diun.enable=true"
networks: networks:
web: web: