From ee23d43ca7127fcaf7f3033dfb32e52139d46473 Mon Sep 17 00:00:00 2001 From: Apoorv Parle <19315187+apparle@users.noreply.github.com> Date: Wed, 11 Jun 2025 22:48:52 -0700 Subject: [PATCH] Update watchtower to a well-maintained fork and add podman support Signed-off-by: Apoorv Parle <19315187+apparle@users.noreply.github.com> --- Containers/watchtower/Dockerfile | 2 +- Containers/watchtower/start.sh | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Containers/watchtower/Dockerfile b/Containers/watchtower/Dockerfile index 16331f70..173ef09f 100644 --- a/Containers/watchtower/Dockerfile +++ b/Containers/watchtower/Dockerfile @@ -5,7 +5,7 @@ RUN set -ex; \ apk upgrade --no-cache -a; \ apk add --no-cache \ build-base; \ - go install github.com/containrrr/watchtower@76f9cea516593fabb8ca91ff13de55caa6aa0a8b; + go install github.com/nicholas-fedor/watchtower@v1.11.3; FROM alpine:3.21.3 diff --git a/Containers/watchtower/start.sh b/Containers/watchtower/start.sh index 2c7a1835..bec4d3a2 100644 --- a/Containers/watchtower/start.sh +++ b/Containers/watchtower/start.sh @@ -9,6 +9,13 @@ elif ! test -r /var/run/docker.sock; then exit 1 fi +if [ -f /run/.containerenv ]; then + # If running under podman disable memory_swappiness setting in watchtower. + # It is a necessary workaround until https://github.com/containers/podman/issues/23824 gets fixed. + echo "Running under Podman. Setting WATCHTOWER_DISABLE_MEMORY_SWAPPINESS to 1." + export WATCHTOWER_DISABLE_MEMORY_SWAPPINESS=1 +fi + if [ -n "$CONTAINER_TO_UPDATE" ]; then exec /watchtower --cleanup --debug --run-once "$CONTAINER_TO_UPDATE" else