Skip to content

Commit

Permalink
Fixed build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Dark Decoy committed Mar 6, 2023
1 parent abccdd9 commit 78e8389
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 42 deletions.
62 changes: 21 additions & 41 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
@@ -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" {
Expand Down Expand Up @@ -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"]
Expand Down Expand Up @@ -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}" : ""
]
}
2 changes: 1 addition & 1 deletion generate-docker-bake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 78e8389

Please sign in to comment.