From 5a03b6ee0d29a614bebf42d83da4202e25a94c0d Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sun, 12 Mar 2023 15:16:30 +0100 Subject: [PATCH] Correct healthcheck endpoint --- arpspoof/Dockerfile | 6 +++--- baikal/Dockerfile | 6 +++--- bazarr/Dockerfile | 6 +++--- binance-trading-bot/Dockerfile | 6 +++--- bitwarden/Dockerfile | 6 +++--- booksonic_air/Dockerfile | 6 +++--- browserless_chrome/Dockerfile | 6 +++--- calibre/Dockerfile | 6 +++--- calibre_web/Dockerfile | 6 +++--- cloudcommander/Dockerfile | 6 +++--- code-server/Dockerfile | 6 +++--- elasticsearch/Dockerfile | 6 +++--- emby/Dockerfile | 6 +++--- enedisgateway2mqtt/Dockerfile | 6 +++--- enedisgateway2mqtt_dev/Dockerfile | 6 +++--- filebrowser/Dockerfile | 6 +++--- fireflyiii/Dockerfile | 6 +++--- fireflyiii_data_importer/Dockerfile | 6 +++--- fireflyiii_fints_importer/Dockerfile | 6 +++--- flaresolverr/Dockerfile | 6 +++--- flexget/Dockerfile | 6 +++--- gitea/Dockerfile | 6 +++--- grav/Dockerfile | 6 +++--- guacamole/Dockerfile | 6 +++--- immich/Dockerfile | 6 +++--- jackett/Dockerfile | 6 +++--- jellyfin/Dockerfile | 6 +++--- joal/Dockerfile | 6 +++--- joplin/Dockerfile | 6 +++--- lidarr/Dockerfile | 6 +++--- mealie/Dockerfile | 4 ++-- mylar3/Dockerfile | 6 +++--- nextcloud/Dockerfile | 6 +++--- photoprism/Dockerfile | 4 ++-- portainer/Dockerfile | 16 ++++++++-------- qbittorrent/Dockerfile | 4 ++-- scrutiny/Dockerfile | 6 +++--- scrutiny_fa/Dockerfile | 6 +++--- transmission/Dockerfile | 6 +++--- transmission_openvpn/Dockerfile | 4 ++-- wger/Dockerfile | 6 +++--- 41 files changed, 124 insertions(+), 124 deletions(-) diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile index 79b7d6d1b..98f821984 100644 --- a/arpspoof/Dockerfile +++ b/arpspoof/Dockerfile @@ -105,11 +105,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="7022" -ARG URL="" +ENV HEALTH_PORT="7022" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/baikal/Dockerfile b/baikal/Dockerfile index ba62f0774..da6fe0b4c 100644 --- a/baikal/Dockerfile +++ b/baikal/Dockerfile @@ -110,11 +110,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="80" -ARG URL="" +ENV HEALTH_PORT="80" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index 3ab711ca6..ba269ce8c 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -126,11 +126,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="6767" -ARG URL="" +ENV HEALTH_PORT="6767" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "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 4a63551ee..8525a58be 100644 --- a/binance-trading-bot/Dockerfile +++ b/binance-trading-bot/Dockerfile @@ -127,11 +127,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="80" -ARG URL="" +ENV HEALTH_PORT="80" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile index c9ef9c826..f0060b4cd 100644 --- a/bitwarden/Dockerfile +++ b/bitwarden/Dockerfile @@ -119,11 +119,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="80" -ARG URL="" +ENV HEALTH_PORT="80" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index caa018433..e20392626 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -137,11 +137,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="4040" -ARG URL="" +ENV HEALTH_PORT="4040" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/browserless_chrome/Dockerfile b/browserless_chrome/Dockerfile index 11f279c87..888159ae7 100644 --- a/browserless_chrome/Dockerfile +++ b/browserless_chrome/Dockerfile @@ -105,11 +105,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="3000" -ARG URL="" +ENV HEALTH_PORT="3000" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/calibre/Dockerfile b/calibre/Dockerfile index 8a4bdf58d..95623eeb6 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -137,11 +137,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8080" -ARG URL="" +ENV HEALTH_PORT="8080" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index bb07e83ad..ba8b91703 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -140,11 +140,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8083" -ARG URL="" +ENV HEALTH_PORT="8083" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile index 8a08dc9cc..04ad6bd3d 100644 --- a/cloudcommander/Dockerfile +++ b/cloudcommander/Dockerfile @@ -106,11 +106,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8000" -ARG URL="" +ENV HEALTH_PORT="8000" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/code-server/Dockerfile b/code-server/Dockerfile index 19986acaf..235b45c39 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -132,11 +132,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8443" -ARG URL="" +ENV HEALTH_PORT="8443" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 420947bf3..d5e65c602 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -113,11 +113,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="9200" -ARG URL="" +ENV HEALTH_PORT="9200" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/emby/Dockerfile b/emby/Dockerfile index 805121c8d..13840bd65 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -125,11 +125,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8096" -ARG URL="/emby/system/info/public?format=json" +ENV HEALTH_PORT="8096" \ + HEALTH_URL="/emby/system/info/public?format=json" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile index 657d52eb5..85a9101be 100644 --- a/enedisgateway2mqtt/Dockerfile +++ b/enedisgateway2mqtt/Dockerfile @@ -105,11 +105,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="5000" -ARG URL="" +ENV HEALTH_PORT="5000" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile index 657d52eb5..85a9101be 100644 --- a/enedisgateway2mqtt_dev/Dockerfile +++ b/enedisgateway2mqtt_dev/Dockerfile @@ -105,11 +105,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="5000" -ARG URL="" +ENV HEALTH_PORT="5000" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile index e1eceb6af..d4da793ea 100644 --- a/filebrowser/Dockerfile +++ b/filebrowser/Dockerfile @@ -107,11 +107,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8080" -ARG URL="" +ENV HEALTH_PORT="8080" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index d34e4c8c7..d73599f4a 100644 --- a/fireflyiii/Dockerfile +++ b/fireflyiii/Dockerfile @@ -115,11 +115,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8080" -ARG URL="/health" +ENV HEALTH_PORT="8080" \ + HEALTH_URL="/health" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "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 5a0080d1b..4279276ac 100644 --- a/fireflyiii_data_importer/Dockerfile +++ b/fireflyiii_data_importer/Dockerfile @@ -111,11 +111,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8080" -ARG URL="/health" +ENV HEALTH_PORT="8080" \ + HEALTH_URL="/health" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "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 e18a18f39..575f28596 100644 --- a/fireflyiii_fints_importer/Dockerfile +++ b/fireflyiii_fints_importer/Dockerfile @@ -105,11 +105,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8080" -ARG URL="/health" +ENV HEALTH_PORT="8080" \ + HEALTH_URL="/health" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile index 25fe9e841..efbf4d84a 100644 --- a/flaresolverr/Dockerfile +++ b/flaresolverr/Dockerfile @@ -107,11 +107,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8191" -ARG URL="" +ENV HEALTH_PORT="8191" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/flexget/Dockerfile b/flexget/Dockerfile index 258237610..e4184f8fb 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -142,11 +142,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="5050" -ARG URL="" +ENV HEALTH_PORT="5050" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/gitea/Dockerfile b/gitea/Dockerfile index 4330af577..ab83684e8 100644 --- a/gitea/Dockerfile +++ b/gitea/Dockerfile @@ -107,11 +107,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="3000" -ARG URL="" +ENV HEALTH_PORT="3000" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/grav/Dockerfile b/grav/Dockerfile index f1599bfc4..de1960680 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -128,11 +128,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="80" -ARG URL="/health" +ENV HEALTH_PORT="80" \ + HEALTH_URL="/health" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile index 2e05ac5ad..11d49d089 100644 --- a/guacamole/Dockerfile +++ b/guacamole/Dockerfile @@ -138,11 +138,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8080" -ARG URL="" +ENV HEALTH_PORT="8080" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/immich/Dockerfile b/immich/Dockerfile index 719d6f6ed..7e0c6c322 100644 --- a/immich/Dockerfile +++ b/immich/Dockerfile @@ -149,11 +149,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8080" -ARG URL="/api/server-info/ping" +ENV HEALTH_PORT="8080" \ + HEALTH_URL="/api/server-info/ping" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/jackett/Dockerfile b/jackett/Dockerfile index c01baccf0..450fa220d 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -128,11 +128,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="9117" -ARG URL="/UI/Dashboard" +ENV HEALTH_PORT="9117" \ + HEALTH_URL="/UI/Dashboard" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index e0b632fa8..926d0b546 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -139,11 +139,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8096" -ARG URL="/health" +ENV HEALTH_PORT="8096" \ + HEALTH_URL="/health" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/joal/Dockerfile b/joal/Dockerfile index 8a923e9c1..2cc3d691e 100644 --- a/joal/Dockerfile +++ b/joal/Dockerfile @@ -117,11 +117,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8081" -ARG URL="/joal/ui" +ENV HEALTH_PORT="8081" \ + HEALTH_URL="/joal/ui" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/joplin/Dockerfile b/joplin/Dockerfile index 148d484fd..6ed5624be 100644 --- a/joplin/Dockerfile +++ b/joplin/Dockerfile @@ -114,11 +114,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="22300" -ARG URL="/health" +ENV HEALTH_PORT="22300" \ + HEALTH_URL="/health" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD [[ $(curl -s http://127.0.0.1:"$WEBUI_PORT$URL") == *"Invalid"* ]] || exit 1 + CMD [[ $(curl -s "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}") == *"Invalid"* ]] || exit 1 diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index ac9a1f547..9a7a15ce6 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -130,11 +130,11 @@ LABEL \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} -ARG WEBUI_PORT="8686" -ARG URL="" +ENV HEALTH_PORT="8686" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || curl --fail http://127.0.0.1:443 || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || curl --fail http://127.0.0.1:443 || exit 1 diff --git a/mealie/Dockerfile b/mealie/Dockerfile index df44d00cd..8eab5001f 100644 --- a/mealie/Dockerfile +++ b/mealie/Dockerfile @@ -118,8 +118,8 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="" -ARG URL="" +ENV HEALTH_PORT="" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index cc85ebc84..bb09bb9b2 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -130,11 +130,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8090" -ARG URL="" +ENV HEALTH_PORT="8090" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index f3091e49d..36cc45d14 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -165,11 +165,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="80" -ARG URL="" +ENV HEALTH_PORT="80" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || curl --fail http://127.0.0.1:443 || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || curl --fail http://127.0.0.1:443 || exit 1 diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile index d03d1da90..ce796c5c1 100644 --- a/photoprism/Dockerfile +++ b/photoprism/Dockerfile @@ -123,8 +123,8 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="" -ARG URL="" +ENV HEALTH_PORT="" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ diff --git a/portainer/Dockerfile b/portainer/Dockerfile index 9d1072f74..e754a8ba9 100644 --- a/portainer/Dockerfile +++ b/portainer/Dockerfile @@ -130,11 +130,11 @@ LABEL \ # 6 Healthcheck # ################# -#ARG WEBUI_PORT="9000" -#ARG URL="/api/status" -#HEALTHCHECK \ -# --interval=5s \ -# --retries=5 \ -# --start-period=30s \ -# --timeout=25s \ -# CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 +ENV HEALTH_PORT="9000" \ + HEALTH_URL="/api/system/status" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index a9e6dcd73..c1f8265b9 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -163,8 +163,8 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="" -ARG URL="" +ENV HEALTH_PORT="" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile index 26ad99030..be62754c0 100644 --- a/scrutiny/Dockerfile +++ b/scrutiny/Dockerfile @@ -105,11 +105,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8080" -ARG URL="/api/health" +ENV HEALTH_PORT="8080" \ + HEALTH_URL="/api/health" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile index 26ad99030..be62754c0 100644 --- a/scrutiny_fa/Dockerfile +++ b/scrutiny_fa/Dockerfile @@ -105,11 +105,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="8080" -ARG URL="/api/health" +ENV HEALTH_PORT="8080" \ + HEALTH_URL="/api/health" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/transmission/Dockerfile b/transmission/Dockerfile index 6b47db9dc..3497c67a4 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -141,11 +141,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="9091" -ARG URL="" +ENV HEALTH_PORT="9091" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/transmission_openvpn/Dockerfile b/transmission_openvpn/Dockerfile index b917b19a6..a702093f8 100644 --- a/transmission_openvpn/Dockerfile +++ b/transmission_openvpn/Dockerfile @@ -134,8 +134,8 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="" -ARG URL="" +ENV HEALTH_PORT="" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ diff --git a/wger/Dockerfile b/wger/Dockerfile index aaa560be9..b5b3e7f7f 100644 --- a/wger/Dockerfile +++ b/wger/Dockerfile @@ -109,11 +109,11 @@ LABEL \ # 6 Healthcheck # ################# -ARG WEBUI_PORT="80" -ARG URL="" +ENV HEALTH_PORT="80" \ + HEALTH_URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" &>/dev/null || exit 1 + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1