Skip to content
This repository was archived by the owner on Jun 3, 2025. It is now read-only.

Commit ccaa38d

Browse files
authored
Add s390x support to docker images (#1749)
* Add s390x support to docker images 1. add s390x support to docker images `executor`, `executor(slim)`, `executor(debug)` and `warmer`. Fixes #1462 and #1665. 2. Address the building issue of dependency `docker-credential-gcr` in Dockerfiles. This issue was introduced when recent commits in `docker-credential-gcr` removed the Makefile. Signed-off-by: Kun-Lu <kun.lu@ibm.com> * Add s390x support to all images except debug image * Add s390x support to images.yaml * Fix ld64.so.1 not found issue on s390x * Add a comment for copying /lib from busybox container on s390x
1 parent ee2249b commit ccaa38d

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

.github/workflows/images.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
include:
3434
- image: executor
3535
dockerfile: ./deploy/Dockerfile
36-
platforms: linux/amd64,linux/arm64
36+
platforms: linux/amd64,linux/arm64,linux/s390x
3737
image-name: gcr.io/kaniko-project/executor
3838
tag: ${{ github.sha }}
3939
release-tag: latest
4040

4141
- image: executor-debug
4242
dockerfile: ./deploy/Dockerfile_debug
43-
platforms: linux/amd64,linux/arm64
43+
platforms: linux/amd64,linux/arm64,linux/s390x
4444
image-name: gcr.io/kaniko-project/executor
4545
tag: ${{ github.sha }}-debug
4646
release_tag: debug
@@ -54,7 +54,7 @@ jobs:
5454

5555
- image: warmer
5656
dockerfile: ./deploy/Dockerfile_warmer
57-
platforms: linux/amd64,linux/arm64
57+
platforms: linux/amd64,linux/arm64,linux/s390x
5858
image-name: gcr.io/kaniko-project/warmer
5959
tag: ${{ github.sha }}
6060
release-tag: latest

deploy/Dockerfile_debug

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ COPY --from=0 /usr/local/bin/docker-credential-gcr /kaniko/docker-credential-gcr
5757
COPY --from=0 /usr/local/bin/docker-credential-ecr-login /kaniko/docker-credential-ecr-login
5858
COPY --from=0 /usr/local/bin/docker-credential-acr-env /kaniko/docker-credential-acr-env
5959
COPY --from=busybox:1.32.0 /bin /busybox
60+
# Since busybox needs some lib files which lie in /lib directory to run the executables on s390x,
61+
# the below COPY command is added to address "ld64.so.1 not found" issue. This extra copy action will not
62+
# happen on amd64 or arm64 platforms since /lib does not exist in amd64 or arm64 version of busybox container.
63+
# Similar issues could be found in https://github.com/multiarch/qemu-user-static/issues/110#issuecomment-652951564.
64+
COPY --from=busybox:1.32.0 /*lib /lib
6065
# Declare /busybox as a volume to get it automatically in the path to ignore
6166
VOLUME /busybox
6267

0 commit comments

Comments
 (0)