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}"