Skip to content

Commit 83e8b1d

Browse files
committed
Add ubuntu arm64 pwsh runner helper image
1 parent 1af011e commit 83e8b1d

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

dockerfiles/runner-helper/docker-bake.hcl

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,18 @@ target "ubuntu" {
9595
target "ubuntu-pwsh" {
9696
inherits = ["base"]
9797

98-
platforms = ["linux/amd64"]
98+
name = "ubuntu-${replace(platform, "/", "-")}-pwsh"
99+
100+
matrix = {
101+
platform = ["linux/amd64", "linux/arm64"]
102+
}
103+
104+
platforms = [platform]
99105
args = {
100106
BASE_IMAGE = "${RUNNER_IMAGES_REGISTRY}/runner-helper:${RUNNER_IMAGES_VERSION}-ubuntu-pwsh"
101107
}
102108

103-
output = ["type=oci,dest=./../../out/helper-images/ubuntu-x86_64-pwsh.tar,tar=true"]
109+
output = ["type=oci,dest=./../../out/helper-images/ubuntu-${split("/", platform)[1] == "amd64" ? "x86_64" : split("/", platform)[1]}-pwsh.tar,tar=true"]
104110
}
105111

106112
target "ubi-fips" {

scripts/pusher/helper-images.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@
128128
"ubuntu-x86_64-pwsh": [
129129
"ubuntu-x86_64-%-pwsh"
130130
],
131+
"ubuntu-arm64-pwsh": [
132+
"ubuntu-arm64-%-pwsh"
133+
],
131134
"ubuntu-x86_64": [
132135
"ubuntu-x86_64-%"
133136
],

0 commit comments

Comments
 (0)