Skip to content

Commit 3f71871

Browse files
authored
Merge pull request #129 from rake-compiler/flavorjones-ci-specify-oci-image-platform
ci: specify OCI image platform
2 parents c28c669 + 544f9c4 commit 3f71871

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,21 +382,27 @@ jobs:
382382
matrix:
383383
include:
384384
- from_image: amd64/centos
385+
image_platform: linux/amd64
385386
platform: x86_64-linux # centos-8 ships ruby 2.5, rubygems won't recognize -gnu suffix
386387
dockerfile: centos
387388
- from_image: navikey/raspbian-bullseye
389+
image_platform: linux/arm/v7
388390
platform: arm-linux # bullseye ships ruby 2.7, rubygems won't recognize -gnu suffix
389391
dockerfile: debian
390392
- from_image: arm64v8/ubuntu
393+
image_platform: linux/aarch64
391394
platform: aarch64-linux # arm64v8 ships ruby 3.0, rubygems won't recognize -gnu suffix
392395
dockerfile: debian
393396
- from_image: i386/alpine
397+
image_platform: linux/386
394398
platform: x86-linux-musl
395399
dockerfile: alpine
396400
- from_image: arm32v6/alpine
401+
image_platform: linux/arm/v6
397402
platform: arm-linux-musl
398403
dockerfile: alpine
399404
- from_image: alpine
405+
image_platform: linux/amd64
400406
platform: x86_64-linux-musl
401407
dockerfile: alpine
402408
runs-on: ubuntu-latest
@@ -409,6 +415,6 @@ jobs:
409415
- name: Build ${{ matrix.from_image }} image
410416
run: |
411417
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
412-
docker build --rm --build-arg from_image=${{ matrix.from_image }} -t ruby-test -f test/env/Dockerfile.${{ matrix.dockerfile }} .
418+
docker build --rm --build-arg from_image=${{ matrix.from_image }} --platform=${{ matrix.image_platform }} -t ruby-test -f test/env/Dockerfile.${{ matrix.dockerfile }} .
413419
- name: Run tests
414420
run: docker run --rm -t --network=host -v `pwd`:/build ruby-test

0 commit comments

Comments
 (0)