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 8c2ff9c..b35318e --- 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.22 +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 \ @@ -13,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/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 index d37a11e..67ebb20 --- a/README.md +++ b/README.md @@ -5,9 +5,7 @@ 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/willfarrell/docker-autoheal/blob/main/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") diff --git a/docker-entrypoint b/docker-entrypoint index cf6c0cb..24556eb 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 <