From 5aec20408d36359fc4acf0d368f0ba2b73aaf70e Mon Sep 17 00:00:00 2001 From: Pau RE Date: Wed, 4 Sep 2024 13:27:55 +0200 Subject: [PATCH] Upgrade to go-cron 11 to avoid zombie processes --- alpine.Dockerfile | 2 +- debian.Dockerfile | 2 +- docker-bake.hcl | 4 ++-- generate-docker-bake.sh | 2 +- init.sh | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/alpine.Dockerfile b/alpine.Dockerfile index e345ec4..ff2ecc7 100644 --- a/alpine.Dockerfile +++ b/alpine.Dockerfile @@ -1,7 +1,7 @@ ARG BASETAG=alpine FROM postgres:$BASETAG -ARG GOCRONVER=v0.0.10 +ARG GOCRONVER=v0.0.11 ARG TARGETOS ARG TARGETARCH RUN set -x \ diff --git a/debian.Dockerfile b/debian.Dockerfile index 0019334..9bb78e4 100644 --- a/debian.Dockerfile +++ b/debian.Dockerfile @@ -1,7 +1,7 @@ ARG BASETAG=latest FROM postgres:$BASETAG -ARG GOCRONVER=v0.0.10 +ARG GOCRONVER=v0.0.11 ARG TARGETOS ARG TARGETARCH diff --git a/docker-bake.hcl b/docker-bake.hcl index 654a3a6..27ff39e 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -15,12 +15,12 @@ variable "BUILD_REVISION" { } target "debian" { - args = {"GOCRONVER" = "v0.0.10"} + args = {"GOCRONVER" = "v0.0.11"} dockerfile = "debian.Dockerfile" } target "alpine" { - args = {"GOCRONVER" = "v0.0.10"} + args = {"GOCRONVER" = "v0.0.11"} dockerfile = "alpine.Dockerfile" } diff --git a/generate-docker-bake.sh b/generate-docker-bake.sh index 6da3c72..15d1ff4 100755 --- a/generate-docker-bake.sh +++ b/generate-docker-bake.sh @@ -2,7 +2,7 @@ set -e -GOCRONVER="v0.0.10" +GOCRONVER="v0.0.11" MAIN_TAG="16" TAGS_EXTRA="15 14 13 12" PLATFORMS="linux/amd64 linux/arm64 linux/arm/v7 linux/s390x linux/ppc64le" diff --git a/init.sh b/init.sh index 055973f..0e5bd69 100755 --- a/init.sh +++ b/init.sh @@ -4,11 +4,11 @@ set -Eeo pipefail # Prevalidate configuration (don't source) /env.sh +EXTRA_ARGS="" # Initial background backup if [ "${BACKUP_ON_START}" = "TRUE" ]; then - echo "Launching an startup backup as a background job..." - /backup.sh & + EXTRA_ARGS="-i" fi echo "Starting go-cron ($SCHEDULE)..." -exec /usr/local/bin/go-cron -s "$SCHEDULE" -p "$HEALTHCHECK_PORT" -- /backup.sh +exec /usr/local/bin/go-cron -s "$SCHEDULE" -p "$HEALTHCHECK_PORT" $EXTRA_ARGS -- /backup.sh