Skip to content

Commit

Permalink
Merge pull request #1586 from ksalerno99/master
Browse files Browse the repository at this point in the history
This patch adds ppc64le support back into the Jenkins CI Docker controller build
  • Loading branch information
dduportal authored May 14, 2023
2 parents d948f6d + c5f88b5 commit d23ea1a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export BUILDKIT_PROGRESS=plain
export COMMIT_SHA=$(shell git rev-parse HEAD)

current_arch := $(shell uname -m)
export ARCH ?= $(shell case $(current_arch) in (x86_64) echo "amd64" ;; (i386) echo "386";; (aarch64|arm64) echo "arm64" ;; (armv6*) echo "arm/v6";; (armv7*) echo "arm/v7";; (s390*|riscv*) echo $(current_arch);; (*) echo "UNKNOWN-CPU";; esac)
export ARCH ?= $(shell case $(current_arch) in (x86_64) echo "amd64" ;; (i386) echo "386";; (aarch64|arm64) echo "arm64" ;; (armv6*) echo "arm/v6";; (armv7*) echo "arm/v7";; (s390*|riscv*|ppc64le) echo $(current_arch);; (*) echo "UNKNOWN-CPU";; esac)

all: hadolint shellcheck build test

Expand Down
14 changes: 11 additions & 3 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ group "linux-s390x" {
]
}

group "linux-ppc64le" {
targets = [
"debian_jdk11",
"debian_jdk17",
"rhel_ubi9_jdk17",
]
}

# ---- variables ----

variable "JENKINS_VERSION" {
Expand Down Expand Up @@ -187,7 +195,7 @@ target "debian_jdk11" {
tag_lts(true, "lts"),
tag_lts(true, "lts-jdk11")
]
platforms = ["linux/amd64", "linux/arm64", "linux/s390x"]
platforms = ["linux/amd64", "linux/arm64", "linux/s390x", "linux/ppc64le"]
}

target "debian_jdk17" {
Expand All @@ -206,7 +214,7 @@ target "debian_jdk17" {
tag_lts(false, "lts-jdk17"),
tag_lts(true, "lts-jdk17")
]
platforms = ["linux/amd64", "linux/arm64"]
platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
}

target "debian_slim_jdk11" {
Expand Down Expand Up @@ -279,5 +287,5 @@ target "rhel_ubi9_jdk17" {
tag_lts(false, "lts-rhel-ubi9-jdk17"),
tag_lts(true, "lts-rhel-ubi9-jdk17")
]
platforms = ["linux/amd64", "linux/arm64"]
platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
}

0 comments on commit d23ea1a

Please sign in to comment.