diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml index d37e548..4c14b36 100644 --- a/monitoring/docker-compose.yaml +++ b/monitoring/docker-compose.yaml @@ -104,27 +104,6 @@ services: labels: - "docker.group=monitoring" - - diun: - image: crazymax/diun:latest - command: serve - volumes: - - "${VOLUMES_PATH}/monitoring/diun/data:/data" - networks: - - dockersocket - environment: - - "TZ=Europe/Berlin" - - "DIUN_WATCH_WORKERS=10" - - "DIUN_WATCH_SCHEDULE=0 */6 * * *" - - "DIUN_WATCH_JITTER=30s" - - "DIUN_PROVIDERS_DOCKER_ENDPOINT=tcp://docker-socket-proxy:2375" - - "DIUN_PROVIDERS_DOCKER_WATCHBYDEFAULT=true" - - "DIUN_NOTIF_NTFY_ENDPOINT=${NTFY_SERVER}" - - "DIUN_NOTIF_NTFY_TOPIC=${NTFY_TOPIC}" - - "DIUN_NOTIF_NTFY_TOKEN=${NTFY_TOKEN}" - restart: always - - ################################################################## # here starts data collection of local host diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml index f93b614..8a50b11 100644 --- a/nextcloud/docker-compose.yaml +++ b/nextcloud/docker-compose.yaml @@ -11,10 +11,10 @@ services: networks: - web - nextcloud -# healthcheck: -# test: curl -sSf 'http://localhost/status.php' | grep '"installed":true' | grep '"maintenance":false' | grep '"needsDbUpgrade":false' || exit 1 -# interval: 5s -# timeout: 3s + healthcheck: + test: curl -sSf 'http://localhost/status.php' | grep '"installed":true' | grep '"maintenance":false' | grep '"needsDbUpgrade":false' || exit 1 + interval: 5s + timeout: 3s labels: - "traefik.enable=true" - "traefik.http.routers.nextcloud.rule=Host(`cloud.${DOMAIN}`)" @@ -138,26 +138,26 @@ services: - "docker.group=netxtcloud" -# adminer: -# image: adminer -# restart: unless-stopped -# networks: -# - web -# - mariadb -# environment: -# - ADMINER_DEFAULT_SERVER=db -# - ADMINER_DESIGN=flat -# depends_on: -# - db -# labels: -# - "traefik.enable=true" -# - "traefik.http.routers.adminer.rule=Host(`adminer.${DOMAIN}`)" -# - "traefik.http.routers.adminer.entrypoints=websecure" -# - "traefik.http.routers.adminer.tls.certresolver=netcup" -# - "traefik.http.routers.adminer.tls.options=intermediate@file" -# - "traefik.http.routers.adminer.middlewares=adminerauth" -# - "traefik.http.middlewares.adminerauth.basicauth.users=${HTPASSWD_ADMINER}" -# - "docker.group=netxtcloud" + adminer: + image: adminer + restart: unless-stopped + networks: + - web + - mariadb + environment: + - ADMINER_DEFAULT_SERVER=db + - ADMINER_DESIGN=flat + depends_on: + - db + labels: + - "traefik.enable=true" + - "traefik.http.routers.adminer.rule=Host(`adminer.${DOMAIN}`)" + - "traefik.http.routers.adminer.entrypoints=websecure" + - "traefik.http.routers.adminer.tls.certresolver=netcup" + - "traefik.http.routers.adminer.tls.options=intermediate@file" + - "traefik.http.routers.adminer.middlewares=adminerauth" + - "traefik.http.middlewares.adminerauth.basicauth.users=${HTPASSWD_ADMINER}" + - "docker.group=netxtcloud" redis: diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml index f934863..4fe6cd3 100755 --- a/proxy/docker-compose.yaml +++ b/proxy/docker-compose.yaml @@ -3,7 +3,7 @@ services: traefik: image: traefik:${TRAEFIK_VERSION} restart: unless-stopped - environment: + environment: - NETCUP_ENDPOINT=${NETCUP_ENDPOINT} - NETCUP_CUSTOMER_NUMBER=${NETCUP_CUSTOMER_NUMBER} - NETCUP_API_KEY=${NETCUP_API_KEY} @@ -63,13 +63,12 @@ services: docker-socket-proxy: image: tecnativa/docker-socket-proxy restart: unless-stopped - volumes: + volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: # grant privileges as environment variables: https://github.com/Tecnativa/docker-socket-proxy#grant-or-revoke-access-to-certain-api-sections - CONTAINERS=1 - INFO=1 - - IMAGES=1 # for diun networks: - dockersocket healthcheck: