Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add s390x support to docker images #1749

Merged
merged 8 commits into from
Jan 6, 2022
Merged

Add s390x support to docker images #1749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8d98aaf
Add s390x support to docker images
kun-lu20 Sep 17, 2021
bb6b683
Merge branch 'master' into add_s390x_docker_images
kun-lu20 Oct 18, 2021
c42996e
Merge branch 'master' into add_s390x_docker_images
kun-lu20 Oct 20, 2021
b1046b9
Add s390x support to all images except debug image
kun-lu20 Oct 20, 2021
c246f70
Merge branch 'master' into add_s390x_docker_images
kun-lu20 Jan 4, 2022
fa581ae
Add s390x support to images.yaml
kun-lu20 Jan 4, 2022
524a281
Fix ld64.so.1 not found issue on s390x
kun-lu20 Jan 4, 2022
ed6e2e5
Add a comment for copying /lib from busybox container on s390x
kun-lu20 Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ jobs:
include:
- image: executor
dockerfile: ./deploy/Dockerfile
platforms: linux/amd64,linux/arm64
platforms: linux/amd64,linux/arm64,linux/s390x
image-name: gcr.io/kaniko-project/executor
tag: ${{ github.sha }}
release-tag: latest

- image: executor-debug
dockerfile: ./deploy/Dockerfile_debug
platforms: linux/amd64,linux/arm64
platforms: linux/amd64,linux/arm64,linux/s390x
image-name: gcr.io/kaniko-project/executor
tag: ${{ github.sha }}-debug
release_tag: debug
Expand All @@ -54,7 +54,7 @@ jobs:

- image: warmer
dockerfile: ./deploy/Dockerfile_warmer
platforms: linux/amd64,linux/arm64
platforms: linux/amd64,linux/arm64,linux/s390x
image-name: gcr.io/kaniko-project/warmer
tag: ${{ github.sha }}
release-tag: latest
Expand Down
5 changes: 5 additions & 0 deletions deploy/Dockerfile_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ COPY --from=0 /usr/local/bin/docker-credential-gcr /kaniko/docker-credential-gcr
COPY --from=0 /usr/local/bin/docker-credential-ecr-login /kaniko/docker-credential-ecr-login
COPY --from=0 /usr/local/bin/docker-credential-acr-env /kaniko/docker-credential-acr-env
COPY --from=busybox:1.32.0 /bin /busybox
# Since busybox needs some lib files which lie in /lib directory to run the executables on s390x,
# the below COPY command is added to address "ld64.so.1 not found" issue. This extra copy action will not
# happen on amd64 or arm64 platforms since /lib does not exist in amd64 or arm64 version of busybox container.
# Similar issues could be found in https://github.com/multiarch/qemu-user-static/issues/110#issuecomment-652951564.
COPY --from=busybox:1.32.0 /*lib /lib
# Declare /busybox as a volume to get it automatically in the path to ignore
VOLUME /busybox

Expand Down