From 452785ae307d39b227edad788f1774d4c4778644 Mon Sep 17 00:00:00 2001 From: Christian Tosta Date: Tue, 5 Mar 2024 10:54:49 -0300 Subject: [PATCH 1/8] Rebase to Alpine 3.19 --- Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8c2ff9c..536174b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,13 @@ # syntax = docker/dockerfile:latest -ARG ALPINE_VERSION=3.18 - -FROM alpine:${ALPINE_VERSION} - +ARG ALPINE_VERSION=3.19 +FROM alpine:${ALPINE_VERSION} AS updated-base +RUN apk -U upgrade --no-cache RUN apk add --no-cache curl jq +FROM scratch +COPY --from=updated-base / / + ENV AUTOHEAL_CONTAINER_LABEL=autoheal \ AUTOHEAL_START_PERIOD=0 \ AUTOHEAL_INTERVAL=5 \ From 36f0df3a406ef7ffc9cd3f41eac09dc82ddd0a70 Mon Sep 17 00:00:00 2001 From: Christian Tosta Date: Tue, 5 Mar 2024 11:01:20 -0300 Subject: [PATCH 2/8] Specific README bits for this fork --- README.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d37a11e..4ddf4b8 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,11 @@ This functionality was proposed to be included with the addition of `HEALTHCHECK This container is a stand-in till there is native support for `--exit-on-unhealthy` https://github.com/docker/docker/pull/22719. ## Supported tags and Dockerfile links -- [`latest` (*Dockerfile*)](https://github.com/willfarrell/docker-autoheal/blob/main/Dockerfile) - Built daily -- [`1.1.0` (*Dockerfile*)](https://github.com/willfarrell/docker-autoheal/blob/1.1.0/Dockerfile) -- [`v0.7.0` (*Dockerfile*)](https://github.com/willfarrell/docker-autoheal/blob/v0.7.0/Dockerfile) +- [`latest` (*Dockerfile*)](https://github.com/infra7ti/docker-autoheal/blob/main/Dockerfile) +- [`1.3.0` (*Dockerfile*)](https://github.com/willfarrell/docker-autoheal/blob/1.3.0/Dockerfile) -![](https://img.shields.io/docker/pulls/willfarrell/autoheal "Total docker pulls") [![](https://images.microbadger.com/badges/image/willfarrell/autoheal.svg)](http://microbadger.com/images/willfarrell/autoheal "Docker layer breakdown") +![](https://img.shields.io/docker/pulls/infra7/autoheal "Total docker pulls") [![](https://images.microbadger.com/badges/image/infra7/autoheal.svg)](http://microbadger.com/images/infra7/autoheal "Docker layer breakdown") ## How to use @@ -22,7 +21,7 @@ docker run -d \ --restart=always \ -e AUTOHEAL_CONTAINER_LABEL=all \ -v /var/run/docker.sock:/var/run/docker.sock \ - willfarrell/autoheal + infra7/autoheal ``` #### TCP socket ```bash @@ -32,7 +31,7 @@ docker run -d \ -e AUTOHEAL_CONTAINER_LABEL=all \ -e DOCKER_SOCK=tcp://$HOST:$PORT \ -v /path/to/certs/:/certs/:ro \ - willfarrell/autoheal + infra7/autoheal ``` #### TCP with mTLS (HTTPS) ```bash @@ -47,7 +46,7 @@ docker run -d \ -e DOCKER_SOCK=tcps://$HOST:2376 \ -e DOCKER_TLS_VERIFY=1 \ -v /path/to/certs/:/certs/:ro \ - willfarrell/autoheal + infra7/autoheal ``` The certificates and keys need these names and resides under /certs inside the container: * ca.pem @@ -87,7 +86,7 @@ services: replicas: 1 environment: AUTOHEAL_CONTAINER_LABEL: autoheal-app - image: willfarrell/autoheal:latest + image: infra7/autoheal:latest network_mode: none restart: always volumes: From 1a9e43d05c21f9a6a82960f3e23e84636d007d49 Mon Sep 17 00:00:00 2001 From: Christian Tosta Date: Fri, 25 Oct 2024 09:02:34 -0300 Subject: [PATCH 3/8] Updated base to Alpine 3.20 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 536174b..7eb0a47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax = docker/dockerfile:latest -ARG ALPINE_VERSION=3.19 +ARG ALPINE_VERSION=3.20 FROM alpine:${ALPINE_VERSION} AS updated-base RUN apk -U upgrade --no-cache RUN apk add --no-cache curl jq From 057b7ac8d5327b3fa4dc833a6f59b40df1a74079 Mon Sep 17 00:00:00 2001 From: Christian Tosta <7252968+christiantosta@users.noreply.github.com> Date: Tue, 8 Jul 2025 22:02:30 -0300 Subject: [PATCH 4/8] Alpine 3.21 --- .dockerignore | 0 .github/FUNDING.yml | 0 .gitignore | 0 Dockerfile | 2 +- LICENSE | 0 README.md | 0 6 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 .dockerignore mode change 100644 => 100755 .github/FUNDING.yml mode change 100644 => 100755 .gitignore mode change 100644 => 100755 Dockerfile mode change 100644 => 100755 LICENSE mode change 100644 => 100755 README.md diff --git a/.dockerignore b/.dockerignore old mode 100644 new mode 100755 diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 index 7eb0a47..f417c10 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax = docker/dockerfile:latest -ARG ALPINE_VERSION=3.20 +ARG ALPINE_VERSION=3.21 FROM alpine:${ALPINE_VERSION} AS updated-base RUN apk -U upgrade --no-cache RUN apk add --no-cache curl jq diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 From 9598f9389288c556bf967f69536fd37edcb09d74 Mon Sep 17 00:00:00 2001 From: Christian Tosta <7252968+christiantosta@users.noreply.github.com> Date: Thu, 30 Oct 2025 00:14:13 -0300 Subject: [PATCH 5/8] Docker lint fix --- Dockerfile | 2 +- docker-entrypoint | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f417c10..573cfee 100755 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ENV AUTOHEAL_CONTAINER_LABEL=autoheal \ DOCKER_SOCK=/var/run/docker.sock \ CURL_TIMEOUT=30 \ WEBHOOK_URL="" \ - WEBHOOK_JSON_KEY="content" \ + WEBHOOK_JSON_ENTRY="content" \ APPRISE_URL="" \ POST_RESTART_SCRIPT="" diff --git a/docker-entrypoint b/docker-entrypoint index cdff426..2c9da04 100755 --- a/docker-entrypoint +++ b/docker-entrypoint @@ -8,7 +8,7 @@ DOCKER_SOCK=${DOCKER_SOCK:-/var/run/docker.sock} UNIX_SOCK="" CURL_TIMEOUT=${CURL_TIMEOUT:-30} WEBHOOK_URL=${WEBHOOK_URL:-""} -WEBHOOK_JSON_KEY=${WEBHOOK_JSON_KEY:-"text"} +WEBHOOK_JSON_ENTRY=${WEBHOOK_JSON_ENTRY:-"text"} APPRISE_URL=${APPRISE_URL:-""} # only use unix domain socket if no TCP endpoint is defined @@ -104,7 +104,7 @@ generate_webhook_payload() { local text="$@" cat < Date: Thu, 30 Oct 2025 00:14:49 -0300 Subject: [PATCH 6/8] Update alpine to 3.22 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 573cfee..b35318e 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax = docker/dockerfile:latest -ARG ALPINE_VERSION=3.21 +ARG ALPINE_VERSION=3.22 FROM alpine:${ALPINE_VERSION} AS updated-base RUN apk -U upgrade --no-cache RUN apk add --no-cache curl jq From 0b0a0824a31f659ef19b33f5906d7ad8fe44783b Mon Sep 17 00:00:00 2001 From: Christian Tosta <7252968+christiantosta@users.noreply.github.com> Date: Thu, 30 Oct 2025 00:26:37 -0300 Subject: [PATCH 7/8] Removed link to broken tag --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 4ddf4b8..ddb5ef8 100755 --- a/README.md +++ b/README.md @@ -6,7 +6,6 @@ This container is a stand-in till there is native support for `--exit-on-unhealt ## Supported tags and Dockerfile links - [`latest` (*Dockerfile*)](https://github.com/infra7ti/docker-autoheal/blob/main/Dockerfile) -- [`1.3.0` (*Dockerfile*)](https://github.com/willfarrell/docker-autoheal/blob/1.3.0/Dockerfile) ![](https://img.shields.io/docker/pulls/infra7/autoheal "Total docker pulls") [![](https://images.microbadger.com/badges/image/infra7/autoheal.svg)](http://microbadger.com/images/infra7/autoheal "Docker layer breakdown") From a6a7c77e9df60b30c1acffdb6a560e5734bab295 Mon Sep 17 00:00:00 2001 From: Christian Tosta <7252968+christiantosta@users.noreply.github.com> Date: Thu, 30 Oct 2025 00:32:32 -0300 Subject: [PATCH 8/8] Changed README.md for upstream --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ddb5ef8..67ebb20 100755 --- a/README.md +++ b/README.md @@ -5,10 +5,10 @@ This functionality was proposed to be included with the addition of `HEALTHCHECK This container is a stand-in till there is native support for `--exit-on-unhealthy` https://github.com/docker/docker/pull/22719. ## Supported tags and Dockerfile links -- [`latest` (*Dockerfile*)](https://github.com/infra7ti/docker-autoheal/blob/main/Dockerfile) +- [`latest` (*Dockerfile*)](https://github.com/willfarrell/docker-autoheal/blob/main/Dockerfile) -![](https://img.shields.io/docker/pulls/infra7/autoheal "Total docker pulls") [![](https://images.microbadger.com/badges/image/infra7/autoheal.svg)](http://microbadger.com/images/infra7/autoheal "Docker layer breakdown") +![](https://img.shields.io/docker/pulls/willfarrell/autoheal "Total docker pulls") [![](https://images.microbadger.com/badges/image/willfarrell/autoheal.svg)](http://microbadger.com/images/willfarrell/autoheal "Docker layer breakdown") ## How to use @@ -20,7 +20,7 @@ docker run -d \ --restart=always \ -e AUTOHEAL_CONTAINER_LABEL=all \ -v /var/run/docker.sock:/var/run/docker.sock \ - infra7/autoheal + willfarrell/autoheal ``` #### TCP socket ```bash @@ -30,7 +30,7 @@ docker run -d \ -e AUTOHEAL_CONTAINER_LABEL=all \ -e DOCKER_SOCK=tcp://$HOST:$PORT \ -v /path/to/certs/:/certs/:ro \ - infra7/autoheal + willfarrell/autoheal ``` #### TCP with mTLS (HTTPS) ```bash @@ -45,7 +45,7 @@ docker run -d \ -e DOCKER_SOCK=tcps://$HOST:2376 \ -e DOCKER_TLS_VERIFY=1 \ -v /path/to/certs/:/certs/:ro \ - infra7/autoheal + willfarrell/autoheal ``` The certificates and keys need these names and resides under /certs inside the container: * ca.pem @@ -85,7 +85,7 @@ services: replicas: 1 environment: AUTOHEAL_CONTAINER_LABEL: autoheal-app - image: infra7/autoheal:latest + image: willfarrell/autoheal:latest network_mode: none restart: always volumes: