diff --git a/.templates/ha_entrypoint.sh b/.templates/ha_entrypoint.sh index e47949da4..e93c5cdd5 100755 --- a/.templates/ha_entrypoint.sh +++ b/.templates/ha_entrypoint.sh @@ -40,9 +40,9 @@ for SCRIPTS in /etc/cont-init.d/*; do sed -i "s/(.*\s|^)exit ([0-9]+)/\1 return \2 || exit \2/g" "$SCRIPTS" sed -i "s/bashio::exit.nok/return 1/g" "$SCRIPTS" sed -i "s/bashio::exit.ok/return 0/g" "$SCRIPTS" - source "$SCRIPTS" || echo -e "\033[0;31mError\033[0m : $SCRIPTS exiting $?" + source "$SCRIPTS" || { echo -e "\033[0;31mError\033[0m : $SCRIPTS exiting $?"; exit $?; } else - "$SCRIPTS" || echo -e "\033[0;31mError\033[0m : $SCRIPTS exiting $?" + "$SCRIPTS" || { echo -e "\033[0;31mError\033[0m : $SCRIPTS exiting $?"; exit $?; } fi # Cleanup diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile index 1b08dc430..7dd5492a5 100644 --- a/arpspoof/Dockerfile +++ b/arpspoof/Dockerfile @@ -111,4 +111,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/autobrr/Dockerfile b/autobrr/Dockerfile index ccaa95a5c..ba9eb4963 100644 --- a/autobrr/Dockerfile +++ b/autobrr/Dockerfile @@ -120,4 +120,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/baikal/Dockerfile b/baikal/Dockerfile index 3ac92429b..71769cbef 100644 --- a/baikal/Dockerfile +++ b/baikal/Dockerfile @@ -117,4 +117,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/battybirdnet-pi/Dockerfile b/battybirdnet-pi/Dockerfile index d8e4c3ade..1cf2a0aa5 100644 --- a/battybirdnet-pi/Dockerfile +++ b/battybirdnet-pi/Dockerfile @@ -202,4 +202,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index 408f6e34f..45398fe00 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -112,4 +112,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/binance-trading-bot/Dockerfile b/binance-trading-bot/Dockerfile index e118bdbd8..6dfa1af77 100644 --- a/binance-trading-bot/Dockerfile +++ b/binance-trading-bot/Dockerfile @@ -133,4 +133,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/birdnet-go/Dockerfile b/birdnet-go/Dockerfile index 8c0a5ba14..cf21e1950 100644 --- a/birdnet-go/Dockerfile +++ b/birdnet-go/Dockerfile @@ -113,4 +113,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/birdnet-pi/Dockerfile b/birdnet-pi/Dockerfile index fc07f36e3..4b5feda43 100644 --- a/birdnet-pi/Dockerfile +++ b/birdnet-pi/Dockerfile @@ -236,4 +236,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index fee36d632..daa45b6da 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -124,4 +124,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/browserless_chrome/Dockerfile b/browserless_chrome/Dockerfile index 6536e7f72..8f4918a2a 100644 --- a/browserless_chrome/Dockerfile +++ b/browserless_chrome/Dockerfile @@ -111,4 +111,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/calibre/Dockerfile b/calibre/Dockerfile index 7f39eb990..4cfc2edcc 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -127,4 +127,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index 5c3c49b6e..0f4a48450 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -132,4 +132,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile index 3bed6f9f6..0742a39c6 100644 --- a/cloudcommander/Dockerfile +++ b/cloudcommander/Dockerfile @@ -112,4 +112,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 434712778..00c6c5b9d 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -120,4 +120,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/emby/Dockerfile b/emby/Dockerfile index ecd07b49c..f38f87439 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -111,4 +111,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile index e7d98fea3..6b71ce8cb 100644 --- a/enedisgateway2mqtt/Dockerfile +++ b/enedisgateway2mqtt/Dockerfile @@ -111,4 +111,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile index 18bc0efb4..17efeb70e 100644 --- a/enedisgateway2mqtt_dev/Dockerfile +++ b/enedisgateway2mqtt_dev/Dockerfile @@ -111,4 +111,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile index 62d7c8ec7..7fff9156c 100644 --- a/filebrowser/Dockerfile +++ b/filebrowser/Dockerfile @@ -113,4 +113,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || curl -k --fail "https://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || curl -k --fail "https://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index ad1d15ab3..a8cda79eb 100644 --- a/fireflyiii/Dockerfile +++ b/fireflyiii/Dockerfile @@ -122,4 +122,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile index 81309d483..a620904f1 100644 --- a/fireflyiii_data_importer/Dockerfile +++ b/fireflyiii_data_importer/Dockerfile @@ -118,4 +118,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/fireflyiii_fints_importer/Dockerfile b/fireflyiii_fints_importer/Dockerfile index 7c02fcd60..0306dcac5 100644 --- a/fireflyiii_fints_importer/Dockerfile +++ b/fireflyiii_fints_importer/Dockerfile @@ -115,4 +115,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile index 8bc189e11..caa920a72 100644 --- a/flaresolverr/Dockerfile +++ b/flaresolverr/Dockerfile @@ -114,4 +114,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/flexget/Dockerfile b/flexget/Dockerfile index c6c9d6592..bad528abc 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -129,4 +129,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/gitea/Dockerfile b/gitea/Dockerfile index dd65dbfcf..67fd04aab 100644 --- a/gitea/Dockerfile +++ b/gitea/Dockerfile @@ -114,4 +114,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/grav/Dockerfile b/grav/Dockerfile index d87070756..2bb6ad456 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -115,4 +115,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile index c663890a2..52d2a2e53 100644 --- a/guacamole/Dockerfile +++ b/guacamole/Dockerfile @@ -141,4 +141,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/immich/Dockerfile b/immich/Dockerfile index 99a6bb84e..7b8f6d37e 100644 --- a/immich/Dockerfile +++ b/immich/Dockerfile @@ -136,4 +136,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 373acd05e..4ea6d282d 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -114,4 +114,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || curl --fail "http://127.0.0.1:8889${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || curl --fail "http://127.0.0.1:8889${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 973a78b1a..0469db0e4 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -128,4 +128,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/joal/Dockerfile b/joal/Dockerfile index 874e88783..0be157489 100644 --- a/joal/Dockerfile +++ b/joal/Dockerfile @@ -123,4 +123,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index dfc2a938e..d133dff74 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -120,4 +120,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || curl --fail http://127.0.0.1:443 || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || curl --fail http://127.0.0.1:443 || exit 1 diff --git a/linkwarden/Dockerfile b/linkwarden/Dockerfile index 471b4ee88..72cc518e6 100644 --- a/linkwarden/Dockerfile +++ b/linkwarden/Dockerfile @@ -129,4 +129,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/monica/Dockerfile b/monica/Dockerfile index 70ac9e3a3..a7d094ae1 100644 --- a/monica/Dockerfile +++ b/monica/Dockerfile @@ -116,4 +116,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index a63c0d398..62c177135 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -116,4 +116,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/navidrome/Dockerfile b/navidrome/Dockerfile index 322803afa..47ed207c8 100644 --- a/navidrome/Dockerfile +++ b/navidrome/Dockerfile @@ -112,4 +112,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/netalertx/icon.png b/netalertx/icon.png index b9ff16972..bf2b3d078 100644 Binary files a/netalertx/icon.png and b/netalertx/icon.png differ diff --git a/netalertx/logo.png b/netalertx/logo.png index b9ff16972..bf2b3d078 100644 Binary files a/netalertx/logo.png and b/netalertx/logo.png differ diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 4e0fbac14..b6c769229 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -166,4 +166,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=720s \ --timeout=45s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || curl --fail http://127.0.0.1:443 || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || curl --fail http://127.0.0.1:443 || exit 1 diff --git a/openproject/Dockerfile b/openproject/Dockerfile index e4dca2ecb..620fb0081 100644 --- a/openproject/Dockerfile +++ b/openproject/Dockerfile @@ -122,4 +122,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/plex/Dockerfile b/plex/Dockerfile index 3f78161bf..b2f193970 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -131,4 +131,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || curl --fail http://127.0.0.1:443 || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || curl --fail http://127.0.0.1:443 || exit 1 diff --git a/portainer/Dockerfile b/portainer/Dockerfile index 9361125a8..1ff086d2b 100644 --- a/portainer/Dockerfile +++ b/portainer/Dockerfile @@ -137,4 +137,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/radarr/Dockerfile b/radarr/Dockerfile index 81cac6858..15c15df33 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -121,4 +121,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile index ae0d902ce..8c01c5e43 100644 --- a/scrutiny/Dockerfile +++ b/scrutiny/Dockerfile @@ -111,4 +111,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile index ed3033caf..a4e24e26d 100644 --- a/scrutiny_fa/Dockerfile +++ b/scrutiny_fa/Dockerfile @@ -108,4 +108,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/signalk/Dockerfile b/signalk/Dockerfile index 49b0229d8..98d740cc5 100644 --- a/signalk/Dockerfile +++ b/signalk/Dockerfile @@ -121,4 +121,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index ef94a3857..2feb59112 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -121,4 +121,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/spotweb/stats.png b/spotweb/stats.png index 94400121e..5d9761233 100644 Binary files a/spotweb/stats.png and b/spotweb/stats.png differ diff --git a/tdarr/Dockerfile b/tdarr/Dockerfile index 5e1119ab3..a79654d26 100644 --- a/tdarr/Dockerfile +++ b/tdarr/Dockerfile @@ -106,4 +106,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 \ No newline at end of file + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 \ No newline at end of file diff --git a/transmission/Dockerfile b/transmission/Dockerfile index 7b203deb9..2476ec610 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -128,4 +128,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/webtrees/CHANGELOG.md b/webtrees/CHANGELOG.md index a3d6788a0..cec2b70f8 100644 --- a/webtrees/CHANGELOG.md +++ b/webtrees/CHANGELOG.md @@ -1,5 +1,5 @@ - BREAKING CHANGE : please be sure to backup your system (HA, and backup from webtrees UI) before updating - - Major code refactor + - Major code refactor : there is no automatic first user creation, it now opens the wizard and provides additional instructions in the addon log (detecting if it is a first launch or not) - Data location change : the data location is now configurable through an option. It will now by default move files to /config/data ; accessible by an external editor through /addon_configs/xxx-webtrees/data. I haven't tested it with all configurations (including mariadb) so be careful before updating! However, it will be much more robust & reliable in the future. And should allow to move data storage location - Database logic change : database selection (sqlite, mysql, psql) is done through the initial startup wizard. If you want to change it, you need to modify manually the config.php.ini file in /config/data (mapped to /addon_configs/xxx-webtrees/data when accessing using a third party tool) diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile index ff3853ed3..7c9911f2b 100644 --- a/webtrees/Dockerfile +++ b/webtrees/Dockerfile @@ -47,10 +47,7 @@ RUN \ && sed -i 's|/var/www/webtrees|/var2/www/webtrees|g' /docker-entrypoint.py \ && mkdir -p /var2 \ && cp -rf /var/* /var2/ \ - && chown -R www-data:www-data /var2/www/webtrees \ - # Allow healthcheck - && for file in /etc/apache2/sites-*/*.conf; do \ - sed -i '//dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/whatsapper/Dockerfile b/whatsapper/Dockerfile index 2ae05649e..e4fb6de96 100644 --- a/whatsapper/Dockerfile +++ b/whatsapper/Dockerfile @@ -113,4 +113,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/zzz_archived_bitwarden/Dockerfile b/zzz_archived_bitwarden/Dockerfile index 8a99a76dc..c3dc06d3c 100644 --- a/zzz_archived_bitwarden/Dockerfile +++ b/zzz_archived_bitwarden/Dockerfile @@ -123,4 +123,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/zzz_archived_code-server/Dockerfile b/zzz_archived_code-server/Dockerfile index 23190fe74..457468122 100644 --- a/zzz_archived_code-server/Dockerfile +++ b/zzz_archived_code-server/Dockerfile @@ -118,4 +118,4 @@ HEALTHCHECK \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 + CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1