From 78e838905bc937a6898592910aff431cdf3e931f Mon Sep 17 00:00:00 2001 From: Dark Decoy Date: Mon, 6 Mar 2023 23:34:50 +0000 Subject: [PATCH] Fixed build errors --- docker-bake.hcl | 62 ++++++++++++++--------------------------- generate-docker-bake.sh | 2 +- 2 files changed, 22 insertions(+), 42 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 5b67efb..7188206 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", "alpine-14", "alpine-13", "alpine-12"] } variable "REGISTRY_PREFIX" { @@ -46,6 +46,26 @@ target "alpine-latest" { ] } +target "debian-15" { + inherits = ["debian"] + platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/s390x", "linux/ppc64le"] + args = {"BASETAG" = "15"} + tags = [ + "${REGISTRY_PREFIX}${IMAGE_NAME}:15", + notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:15-debian-${BUILD_REVISION}" : "" + ] +} + +target "alpine-15" { + inherits = ["alpine"] + platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/s390x", "linux/ppc64le"] + args = {"BASETAG" = "15-alpine"} + tags = [ + "${REGISTRY_PREFIX}${IMAGE_NAME}:15-alpine", + notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:15-alpine-${BUILD_REVISION}" : "" + ] +} + target "debian-14" { inherits = ["debian"] platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/s390x", "linux/ppc64le"] @@ -105,43 +125,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}" : "" - ] -} - -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 e8193f2..70fcae8 100755 --- a/generate-docker-bake.sh +++ b/generate-docker-bake.sh @@ -4,7 +4,7 @@ set -e GOCRONVER="v0.0.10" MAIN_TAG="15" -TAGS_EXTRA="14 13 12" +TAGS_EXTRA="15 14 13 12" PLATFORMS="linux/amd64 linux/arm64 linux/arm/v7 linux/s390x linux/ppc64le" TAGS_EXTRA_2="11 10" PLATFORMS_DEBIAN_2="linux/amd64 linux/arm64 linux/arm/v7"