Compare commits
No commits in common. "827cd9975d7366741545837e63e1e9f814ba2c52" and "ddeab1fe89ad2a003ce594616a10d4c82c06f2f8" have entirely different histories.
827cd9975d
...
ddeab1fe89
10 changed files with 7 additions and 42 deletions
|
@ -16,7 +16,6 @@ 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}
|
||||||
|
@ -47,7 +46,6 @@ services:
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
labels:
|
labels:
|
||||||
- "docker.group=firefoxsync"
|
- "docker.group=firefoxsync"
|
||||||
- "diun.enable=true"
|
|
||||||
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
services:
|
services:
|
||||||
|
|
||||||
forgejo:
|
web:
|
||||||
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,7 +39,6 @@ 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:
|
||||||
|
@ -59,7 +58,6 @@ services:
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
labels:
|
labels:
|
||||||
- "docker.group=git"
|
- "docker.group=git"
|
||||||
- "diun.enable=true"
|
|
||||||
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
|
|
|
@ -16,7 +16,6 @@ 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}
|
||||||
|
@ -35,7 +34,6 @@ services:
|
||||||
depends_on:
|
depends_on:
|
||||||
- influxdb
|
- influxdb
|
||||||
- grafanadb
|
- grafanadb
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
grafanadb:
|
grafanadb:
|
||||||
|
@ -55,7 +53,6 @@ services:
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
labels:
|
labels:
|
||||||
- "docker.group=monitoring"
|
- "docker.group=monitoring"
|
||||||
- "diun.enable=true"
|
|
||||||
|
|
||||||
|
|
||||||
influxdb:
|
influxdb:
|
||||||
|
@ -80,7 +77,6 @@ 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:
|
||||||
|
@ -95,7 +91,6 @@ 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:
|
||||||
|
@ -108,7 +103,6 @@ services:
|
||||||
- NEXTCLOUD_LISTEN_ADDRESS=:9205
|
- NEXTCLOUD_LISTEN_ADDRESS=:9205
|
||||||
labels:
|
labels:
|
||||||
- "docker.group=monitoring"
|
- "docker.group=monitoring"
|
||||||
- "diun.enable=true"
|
|
||||||
|
|
||||||
|
|
||||||
diun:
|
diun:
|
||||||
|
@ -125,13 +119,11 @@ 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=false"
|
- "DIUN_PROVIDERS_DOCKER_WATCHBYDEFAULT=true"
|
||||||
- "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"
|
|
||||||
|
|
||||||
|
|
||||||
##################################################################
|
##################################################################
|
||||||
|
@ -156,7 +148,6 @@ services:
|
||||||
network_mode: "host"
|
network_mode: "host"
|
||||||
labels:
|
labels:
|
||||||
- "docker.group=monitoring"
|
- "docker.group=monitoring"
|
||||||
- "diun.enable=true"
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- influxdb
|
- influxdb
|
||||||
|
|
||||||
|
@ -171,7 +162,6 @@ services:
|
||||||
- dockersocket
|
- dockersocket
|
||||||
labels:
|
labels:
|
||||||
- "docker.group=monitoring"
|
- "docker.group=monitoring"
|
||||||
- "diun.enable=true"
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- influxdb
|
- influxdb
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,6 @@ 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:
|
||||||
|
@ -106,11 +105,10 @@ 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:${MARIADB_VERSION}
|
image: mariadb:10
|
||||||
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
|
||||||
|
@ -138,7 +136,6 @@ services:
|
||||||
timeout: 3s
|
timeout: 3s
|
||||||
labels:
|
labels:
|
||||||
- "docker.group=netxtcloud"
|
- "docker.group=netxtcloud"
|
||||||
- "diun.enable=true"
|
|
||||||
|
|
||||||
|
|
||||||
# adminer:
|
# adminer:
|
||||||
|
@ -161,7 +158,6 @@ 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:
|
||||||
|
@ -179,7 +175,6 @@ services:
|
||||||
timeout: 3s
|
timeout: 3s
|
||||||
labels:
|
labels:
|
||||||
- "docker.group=netxtcloud"
|
- "docker.group=netxtcloud"
|
||||||
- "diun.enable=true"
|
|
||||||
|
|
||||||
|
|
||||||
collabora:
|
collabora:
|
||||||
|
@ -208,7 +203,6 @@ 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:
|
||||||
|
@ -222,7 +216,6 @@ 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:
|
||||||
|
@ -252,7 +245,6 @@ 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:
|
||||||
|
|
|
@ -59,7 +59,6 @@ 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
|
||||||
|
@ -79,9 +78,6 @@ services:
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 3s
|
timeout: 3s
|
||||||
privileged: true
|
privileged: true
|
||||||
labels:
|
|
||||||
- "docker.group=proxy"
|
|
||||||
- "diun.enable=true"
|
|
||||||
|
|
||||||
|
|
||||||
# whoami:
|
# whoami:
|
||||||
|
|
10
pull-all.sh
10
pull-all.sh
|
@ -1,11 +1,9 @@
|
||||||
#/bin/bash/
|
#/bin/bash/
|
||||||
|
|
||||||
for dir in ./*/ ; do
|
for dir in ./*/ ; do
|
||||||
echo "[Building and Pulling $dir]"
|
( cd "$dir" && echo "[Building $dir]" && docker compose build --pull );
|
||||||
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
|
||||||
|
|
|
@ -32,7 +32,6 @@ 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:
|
||||||
|
|
|
@ -17,7 +17,6 @@ services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
labels:
|
labels:
|
||||||
- "docker.group=rustdesk"
|
- "docker.group=rustdesk"
|
||||||
- "diun.enable=true"
|
|
||||||
|
|
||||||
hbbr:
|
hbbr:
|
||||||
ports:
|
ports:
|
||||||
|
@ -32,7 +31,6 @@ services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
labels:
|
labels:
|
||||||
- "docker.group=rustdesk"
|
- "docker.group=rustdesk"
|
||||||
- "diun.enable=true"
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
rustdesk:
|
rustdesk:
|
||||||
|
|
|
@ -32,7 +32,6 @@ 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
|
||||||
|
@ -48,7 +47,6 @@ 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
|
||||||
|
@ -61,7 +59,6 @@ services:
|
||||||
timeout: 3s
|
timeout: 3s
|
||||||
labels:
|
labels:
|
||||||
- "docker.group=wallabag"
|
- "docker.group=wallabag"
|
||||||
- "diun.enable=true"
|
|
||||||
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
|
|
|
@ -27,7 +27,6 @@ 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:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue