From 00a8475b97579b6180d09dc1f1749d6d46e2c7bc Mon Sep 17 00:00:00 2001 From: Alexandre Date: Fri, 10 Mar 2023 13:26:13 +0100 Subject: [PATCH] Healthcheck --- bitwarden/Dockerfile | 3 ++- elasticsearch/Dockerfile | 3 ++- emby/Dockerfile | 3 ++- jellyfin/Dockerfile | 3 ++- joal/CHANGELOG.md | 5 +++++ joal/Dockerfile | 13 +++++++++++++ nextcloud/Dockerfile | 3 ++- photoprism/Dockerfile | 9 +++++++++ portainer/Dockerfile | 3 ++- scrutiny/CHANGELOG.md | 2 ++ scrutiny/Dockerfile | 13 +++++++++++++ scrutiny_fa/CHANGELOG.md | 3 +++ scrutiny_fa/Dockerfile | 13 +++++++++++++ transmission/CHANGELOG.md | 22 ++++++++++++++++++++++ transmission/Dockerfile | 13 +++++++++++++ 15 files changed, 105 insertions(+), 6 deletions(-) diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile index 2a3892a76..67313fa5d 100644 --- a/bitwarden/Dockerfile +++ b/bitwarden/Dockerfile @@ -116,9 +116,10 @@ LABEL \ org.opencontainers.image.version=${BUILD_VERSION} ARG WEBUI_PORT="80" +ARG URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT" || curl --fail http://127.0.0.1:443 || exit 1 + CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" || curl --fail http://127.0.0.1:443 || exit 1 diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index e2f3e0c53..629f8cfbe 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -114,9 +114,10 @@ LABEL \ ################# ARG WEBUI_PORT="9200" +ARG URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT" || exit 1 + CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" || exit 1 diff --git a/emby/Dockerfile b/emby/Dockerfile index a6fba42a4..e32ec2d71 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -126,9 +126,10 @@ LABEL \ ################# ARG WEBUI_PORT="8096" +ARG URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT" || exit 1 + CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" || exit 1 diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 6da7c594a..817fa072e 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -140,9 +140,10 @@ LABEL \ ################# ARG WEBUI_PORT="8096" +ARG URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT" || exit 1 + CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" || exit 1 diff --git a/joal/CHANGELOG.md b/joal/CHANGELOG.md index 4e6ccd5cf..5519cd200 100644 --- a/joal/CHANGELOG.md +++ b/joal/CHANGELOG.md @@ -1,15 +1,20 @@ +- Implemented healthcheck ## 2.1.33 (01-12-2022) + - Update to latest version from anthonyraymond/joal - WARNING : update to supervisor 2022.11 before installing ## 2.1.32 (05-11-2022) + - Update to latest version from anthonyraymond/joal ## 2.1.31 (04-08-2022) + - Update to latest version from anthonyraymond/joal ## 2.1.30 (19-04-2022) + - Update to latest version from anthonyraymond/joal - Add codenotary sign diff --git a/joal/Dockerfile b/joal/Dockerfile index a22ebe157..8a9babdc2 100644 --- a/joal/Dockerfile +++ b/joal/Dockerfile @@ -112,3 +112,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ARG WEBUI_PORT="8081" +ARG URL="/joal/ui" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" || exit 1 diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index f5b479f71..867271bc2 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -162,9 +162,10 @@ LABEL \ org.opencontainers.image.version=${BUILD_VERSION} ARG WEBUI_PORT="80" +ARG URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT" || curl --fail http://127.0.0.1:443 || exit 1 + CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" || curl --fail http://127.0.0.1:443 || exit 1 diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile index dcb610a03..2dd65cd46 100644 --- a/photoprism/Dockerfile +++ b/photoprism/Dockerfile @@ -118,3 +118,12 @@ LABEL \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} \ traefik.http.middlewares.test-compress.compress=false + +ARG WEBUI_PORT="" +ARG URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD photoprism status || exit 1 diff --git a/portainer/Dockerfile b/portainer/Dockerfile index 964d8149d..09eceee6e 100644 --- a/portainer/Dockerfile +++ b/portainer/Dockerfile @@ -131,9 +131,10 @@ LABEL \ ################# ARG WEBUI_PORT="9000" +ARG URL="" HEALTHCHECK \ --interval=5s \ --retries=5 \ --start-period=30s \ --timeout=25s \ - CMD curl --fail http://127.0.0.1:"$WEBUI_PORT" || exit 1 + CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" || exit 1 diff --git a/scrutiny/CHANGELOG.md b/scrutiny/CHANGELOG.md index ba1354d71..7df36754c 100644 --- a/scrutiny/CHANGELOG.md +++ b/scrutiny/CHANGELOG.md @@ -1,5 +1,7 @@ +- Implemented healthcheck ## v0.6.0 (14-01-2023) + - Update to latest version from analogj/scrutiny - WARNING : update to supervisor 2022.11 before installing - New options SMARTCTL_COMMAND_DEVICE_TYPE & SMARTCTL_MEGARAID_DISK_NUM (@scavara) diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile index cd730f26d..3756abd2b 100644 --- a/scrutiny/Dockerfile +++ b/scrutiny/Dockerfile @@ -100,3 +100,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ARG WEBUI_PORT="8080" +ARG URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" || exit 1 diff --git a/scrutiny_fa/CHANGELOG.md b/scrutiny_fa/CHANGELOG.md index 8ff2919b9..350ea40f8 100644 --- a/scrutiny_fa/CHANGELOG.md +++ b/scrutiny_fa/CHANGELOG.md @@ -1,11 +1,14 @@ +- Implemented healthcheck ## v0.6.0 (14-01-2023) + - Update to latest version from analogj/scrutiny - WARNING : update to supervisor 2022.11 before installing - New options SMARTCTL_COMMAND_DEVICE_TYPE & SMARTCTL_MEGARAID_DISK_NUM (@scavara) - New option "Mode" : Collector+WebUI or Collector only ## v0.5.0 (26-08-2022) + - Update to latest version from analogj/scrutiny - BACKUP BEFORE UPDATE : major version change diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile index cd730f26d..3756abd2b 100644 --- a/scrutiny_fa/Dockerfile +++ b/scrutiny_fa/Dockerfile @@ -100,3 +100,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ARG WEBUI_PORT="8080" +ARG URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" || exit 1 diff --git a/transmission/CHANGELOG.md b/transmission/CHANGELOG.md index 65720ab5a..cf8421144 100644 --- a/transmission/CHANGELOG.md +++ b/transmission/CHANGELOG.md @@ -1,65 +1,87 @@ +- Implemented healthcheck ## 4.0.1-r0-ls158 (04-03-2023) + - Update to latest version from linuxserver/docker-transmission ## 4.0.1-r0-ls156 (25-02-2023) + - Update to latest version from linuxserver/docker-transmission ## 4.0.0-r6-ls155 (19-02-2023) + - Update to latest version from linuxserver/docker-transmission ## 4.0.0-r0-ls152 (11-02-2023) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r8-ls150 (28-01-2023) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r8-ls149 (21-01-2023) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r8-ls148 (14-01-2023) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r8-ls147 (07-01-2023) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r6-ls146 (25-12-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r6-ls145 (10-12-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r6-ls144 (01-12-2022) + - Update to latest version from linuxserver/docker-transmission - WARNING : update to supervisor 2022.11 before installing ## 3.00-r6-ls143 (19-11-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r6-ls142 (14-11-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r6-ls141 (11-11-2022) + - Update to latest version from linuxserver/docker-transmission - New alternative webui : transmissionic ## 3.00-r6-ls140 (05-11-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r5-ls138 (29-10-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r5-ls137 (30-09-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r5-ls136 (24-09-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r5-ls135 (09-09-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r5-ls134 (26-08-2022) + - Update to latest version from linuxserver/docker-transmission + ## 3.00-r5-ls133 (13-08-2022) - Update to latest version from linuxserver/docker-transmission diff --git a/transmission/Dockerfile b/transmission/Dockerfile index d40bc5d9f..c31392e6b 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -136,3 +136,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ARG WEBUI_PORT="9091" +ARG URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail http://127.0.0.1:"$WEBUI_PORT$URL" || exit 1