Skip to content

Commit 754ce0d

Browse files
authored
Use arm images to build the base image (#633)
When ARM runners for OSS projects got released, we switched builds for ARM images to use these, but we missed updating the base image. This will hopefully fix the issue seen in #631
1 parent 0549d73 commit 754ce0d

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,17 @@ jobs:
272272
273273
base:
274274
name: Base image
275-
runs-on: ubuntu-latest
276275
strategy:
277276
fail-fast: false
278277
matrix:
279278
os: ["debian", "ubi"]
279+
arch: ["arm64", "amd64"]
280+
include:
281+
- arch: amd64
282+
runner: ubuntu-24.04
283+
- arch: arm64
284+
runner: ubuntu-24.04-arm
285+
runs-on: ${{ matrix.runner }}
280286
steps:
281287
# If no version of Pulumi is supplied by the incoming event (e.g. in the
282288
# case of a PR or merge to main), we use the latest production version:
@@ -296,7 +302,7 @@ jobs:
296302
run: |
297303
docker build \
298304
-f docker/base/Dockerfile.${{ matrix.os }} \
299-
--platform linux/arm64,linux/amd64 \
305+
--platform linux/${{ matrix.arch }} \
300306
. \
301307
-t ${{ env.DOCKER_ORG }}/pulumi-base:${{ env.PULUMI_VERSION }}-${{ matrix.os }} \
302308
--build-arg PULUMI_VERSION=${{ env.PULUMI_VERSION }} \

.github/workflows/release.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,12 +352,17 @@ jobs:
352352
353353
base:
354354
name: Base image
355-
runs-on: ubuntu-latest
356355
strategy:
357356
fail-fast: false
358357
matrix:
359358
os: ["debian", "ubi"]
360359
arch: ["arm64", "amd64"]
360+
include:
361+
- arch: amd64
362+
runner: ubuntu-24.04
363+
- arch: arm64
364+
runner: ubuntu-24.04-arm
365+
runs-on: ${{ matrix.runner }}
361366
steps:
362367
- name: Fetch secrets from ESC
363368
id: esc-secrets

0 commit comments

Comments
 (0)