From 76e4310e938180b1a6fecb5e58d0d2539bd1e086 Mon Sep 17 00:00:00 2001 From: Pau Rodriguez-Estivill Date: Tue, 7 Mar 2023 19:11:03 +0100 Subject: [PATCH] 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