From 3b8755d15070368a2a043007588535fb0612f12b Mon Sep 17 00:00:00 2001 From: Pau Rodriguez-Estivill Date: Sun, 16 Oct 2022 11:44:46 +0200 Subject: [PATCH] Add pg version 15 (fixes #120) --- docker-bake.hcl | 30 +++++++++++++++++++++++++----- generate-docker-bake.sh | 4 ++-- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index aee17c5..5b67efb 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,5 +1,5 @@ group "default" { - targets = ["debian-latest", "alpine-latest", "debian-13", "debian-12", "debian-11", "debian-10", "alpine-13", "alpine-12", "alpine-11", "alpine-10"] + 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"] } variable "REGISTRY_PREFIX" { @@ -27,20 +27,40 @@ target "alpine" { target "debian-latest" { inherits = ["debian"] platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/s390x", "linux/ppc64le"] - args = {"BASETAG" = "14"} + args = {"BASETAG" = "15"} tags = [ "${REGISTRY_PREFIX}${IMAGE_NAME}:latest", - "${REGISTRY_PREFIX}${IMAGE_NAME}:14", - notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:14-debian-${BUILD_REVISION}" : "" + "${REGISTRY_PREFIX}${IMAGE_NAME}:15", + notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:15-debian-${BUILD_REVISION}" : "" ] } target "alpine-latest" { inherits = ["alpine"] platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/s390x", "linux/ppc64le"] - args = {"BASETAG" = "14-alpine"} + args = {"BASETAG" = "15-alpine"} tags = [ "${REGISTRY_PREFIX}${IMAGE_NAME}:alpine", + "${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"] + args = {"BASETAG" = "14"} + tags = [ + "${REGISTRY_PREFIX}${IMAGE_NAME}:14", + notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:14-debian-${BUILD_REVISION}" : "" + ] +} + +target "alpine-14" { + inherits = ["alpine"] + platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/s390x", "linux/ppc64le"] + args = {"BASETAG" = "14-alpine"} + tags = [ "${REGISTRY_PREFIX}${IMAGE_NAME}:14-alpine", notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:14-alpine-${BUILD_REVISION}" : "" ] diff --git a/generate-docker-bake.sh b/generate-docker-bake.sh index abeba3e..e8193f2 100755 --- a/generate-docker-bake.sh +++ b/generate-docker-bake.sh @@ -3,8 +3,8 @@ set -e GOCRONVER="v0.0.10" -MAIN_TAG="14" -TAGS_EXTRA="13 12" +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" PLATFORMS_DEBIAN_2="linux/amd64 linux/arm64 linux/arm/v7"