From aa62bcce36911dade0c7615514a43797d10f3085 Mon Sep 17 00:00:00 2001
From: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
Date: Tue, 7 Mar 2023 10:53:44 +0100
Subject: [PATCH 1/3] Remove pg 10 for EOL

---
 docker-bake.hcl         | 22 +---------------------
 generate-docker-bake.sh |  2 +-
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 5b67efb..9fc5d1f 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,5 +1,5 @@
 group "default" {
-	targets = ["debian-latest", "alpine-latest", "debian-14", "debian-13", "debian-12", "debian-11", "debian-10", "alpine-14", "alpine-13", "alpine-12", "alpine-11", "alpine-10"]
+	targets = ["debian-latest", "alpine-latest", "debian-14", "debian-13", "debian-12", "debian-11", "alpine-14", "alpine-13", "alpine-12", "alpine-11"]
 }
 
 variable "REGISTRY_PREFIX" {
@@ -125,23 +125,3 @@ target "alpine-11" {
 		notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:11-alpine-${BUILD_REVISION}" : ""
 	]
 }
-
-target "debian-10" {
-	inherits = ["debian"]
-	platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7"]
-	args = {"BASETAG" = "10"}
-	tags = [
-		"${REGISTRY_PREFIX}${IMAGE_NAME}:10",
-		notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:10-debian-${BUILD_REVISION}" : ""
-	]
-}
-
-target "alpine-10" {
-	inherits = ["alpine"]
-	platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/s390x", "linux/ppc64le"]
-	args = {"BASETAG" = "10-alpine"}
-	tags = [
-		"${REGISTRY_PREFIX}${IMAGE_NAME}:10-alpine",
-		notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:10-alpine-${BUILD_REVISION}" : ""
-	]
-}
diff --git a/generate-docker-bake.sh b/generate-docker-bake.sh
index 72a2be2..3251f82 100755
--- a/generate-docker-bake.sh
+++ b/generate-docker-bake.sh
@@ -6,7 +6,7 @@ GOCRONVER="v0.0.10"
 MAIN_TAG="15"
 TAGS_EXTRA="14 13 12"
 PLATFORMS="linux/amd64 linux/arm64 linux/arm/v7 linux/s390x linux/ppc64le"
-TAGS_EXTRA_2="11 10"
+TAGS_EXTRA_2="11"
 PLATFORMS_DEBIAN_2="linux/amd64 linux/arm64 linux/arm/v7"
 DOCKER_BAKE_FILE="${1:-docker-bake.hcl}"
 

From 76e4310e938180b1a6fecb5e58d0d2539bd1e086 Mon Sep 17 00:00:00 2001
From: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
Date: Tue, 7 Mar 2023 19:11:03 +0100
Subject: [PATCH 2/3] Remove pg 11 since debian repos fail

---
 docker-bake.hcl         | 22 +---------------------
 generate-docker-bake.sh | 29 +----------------------------
 2 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 9fc5d1f..5d3ee20 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,5 +1,5 @@
 group "default" {
-	targets = ["debian-latest", "alpine-latest", "debian-14", "debian-13", "debian-12", "debian-11", "alpine-14", "alpine-13", "alpine-12", "alpine-11"]
+	targets = ["debian-latest", "alpine-latest", "debian-14", "debian-13", "debian-12", "alpine-14", "alpine-13", "alpine-12"]
 }
 
 variable "REGISTRY_PREFIX" {
@@ -105,23 +105,3 @@ target "alpine-12" {
 		notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:12-alpine-${BUILD_REVISION}" : ""
 	]
 }
-
-target "debian-11" {
-	inherits = ["debian"]
-	platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7"]
-	args = {"BASETAG" = "11"}
-	tags = [
-		"${REGISTRY_PREFIX}${IMAGE_NAME}:11",
-		notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:11-debian-${BUILD_REVISION}" : ""
-	]
-}
-
-target "alpine-11" {
-	inherits = ["alpine"]
-	platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/s390x", "linux/ppc64le"]
-	args = {"BASETAG" = "11-alpine"}
-	tags = [
-		"${REGISTRY_PREFIX}${IMAGE_NAME}:11-alpine",
-		notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:11-alpine-${BUILD_REVISION}" : ""
-	]
-}
diff --git a/generate-docker-bake.sh b/generate-docker-bake.sh
index 3251f82..2aee2fd 100755
--- a/generate-docker-bake.sh
+++ b/generate-docker-bake.sh
@@ -6,16 +6,13 @@ GOCRONVER="v0.0.10"
 MAIN_TAG="15"
 TAGS_EXTRA="14 13 12"
 PLATFORMS="linux/amd64 linux/arm64 linux/arm/v7 linux/s390x linux/ppc64le"
-TAGS_EXTRA_2="11"
-PLATFORMS_DEBIAN_2="linux/amd64 linux/arm64 linux/arm/v7"
 DOCKER_BAKE_FILE="${1:-docker-bake.hcl}"
 
 cd "$(dirname "$0")"
 
 P="\"$(echo $PLATFORMS | sed 's/ /", "/g')\""
-P2="\"$(echo $PLATFORMS_DEBIAN_2 | sed 's/ /", "/g')\""
 
-T="\"debian-latest\", \"alpine-latest\", \"$(echo debian-$TAGS_EXTRA $TAGS_EXTRA_2 | sed 's/ /", "debian-/g')\", \"$(echo alpine-$TAGS_EXTRA $TAGS_EXTRA_2 | sed 's/ /", "alpine-/g')\""
+T="\"debian-latest\", \"alpine-latest\", \"$(echo debian-$TAGS_EXTRA | sed 's/ /", "debian-/g')\", \"$(echo alpine-$TAGS_EXTRA | sed 's/ /", "alpine-/g')\""
 
 cat > "$DOCKER_BAKE_FILE" << EOF
 group "default" {
@@ -90,27 +87,3 @@ target "alpine-$TAG" {
 }
 EOF
 done
-
-for TAG in $TAGS_EXTRA_2; do cat >> "$DOCKER_BAKE_FILE" << EOF
-
-target "debian-$TAG" {
-	inherits = ["debian"]
-	platforms = [$P2]
-	args = {"BASETAG" = "$TAG"}
-	tags = [
-		"\${REGISTRY_PREFIX}\${IMAGE_NAME}:$TAG",
-		notequal("", BUILD_REVISION) ? "\${REGISTRY_PREFIX}\${IMAGE_NAME}:$TAG-debian-\${BUILD_REVISION}" : ""
-	]
-}
-
-target "alpine-$TAG" {
-	inherits = ["alpine"]
-	platforms = [$P]
-	args = {"BASETAG" = "$TAG-alpine"}
-	tags = [
-		"\${REGISTRY_PREFIX}\${IMAGE_NAME}:$TAG-alpine",
-		notequal("", BUILD_REVISION) ? "\${REGISTRY_PREFIX}\${IMAGE_NAME}:$TAG-alpine-\${BUILD_REVISION}" : ""
-	]
-}
-EOF
-done

From ca74121e00fc64f36e38c28a5d535f7800963bb6 Mon Sep 17 00:00:00 2001
From: Pau Rodriguez-Estivill <prodrigestivill@gmail.com>
Date: Tue, 7 Mar 2023 19:26:26 +0100
Subject: [PATCH 3/3] Implement curl retry in Dockerfile

---
 alpine.Dockerfile | 2 +-
 debian.Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/alpine.Dockerfile b/alpine.Dockerfile
index 1d93c95..edc9f9b 100644
--- a/alpine.Dockerfile
+++ b/alpine.Dockerfile
@@ -6,7 +6,7 @@ ARG TARGETOS
 ARG TARGETARCH
 RUN set -x \
 	&& apk update && apk add ca-certificates curl \
-	&& curl -L https://github.com/prodrigestivill/go-cron/releases/download/$GOCRONVER/go-cron-$TARGETOS-$TARGETARCH-static.gz | zcat > /usr/local/bin/go-cron \
+	&& curl --fail --retry 4 --retry-all-errors -L https://github.com/prodrigestivill/go-cron/releases/download/$GOCRONVER/go-cron-$TARGETOS-$TARGETARCH-static.gz | zcat > /usr/local/bin/go-cron \
 	&& chmod a+x /usr/local/bin/go-cron
 
 ENV POSTGRES_DB="**None**" \
diff --git a/debian.Dockerfile b/debian.Dockerfile
index 4ab3e3c..a4c2d86 100644
--- a/debian.Dockerfile
+++ b/debian.Dockerfile
@@ -20,7 +20,7 @@ RUN set -x \
 
 RUN set -x \
 	&& apt-get update && apt-get install -y --no-install-recommends ca-certificates curl && apt-get clean && rm -rf /var/lib/apt/lists/* \
-	&& curl -o /usr/local/bin/go-cron.gz -L https://github.com/prodrigestivill/go-cron/releases/download/$GOCRONVER/go-cron-$TARGETOS-$TARGETARCH.gz \
+	&& curl --fail --retry 4 --retry-all-errors -o /usr/local/bin/go-cron.gz -L https://github.com/prodrigestivill/go-cron/releases/download/$GOCRONVER/go-cron-$TARGETOS-$TARGETARCH.gz \
 	&& gzip -vnd /usr/local/bin/go-cron.gz && chmod a+x /usr/local/bin/go-cron
 
 ENV POSTGRES_DB="**None**" \