From 8d98aaf8676ac5340e2a705bf8795a919e8a1578 Mon Sep 17 00:00:00 2001 From: Kun-Lu Date: Fri, 17 Sep 2021 16:20:15 -0400 Subject: [PATCH] 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 --- .github/workflows/release.yaml | 14 +++++++------- deploy/Dockerfile | 4 ++-- deploy/Dockerfile_debug | 11 ++++++++--- deploy/Dockerfile_warmer | 9 +++++++-- hack/install_golint.sh | 1 + 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 924e5dd6ea..c35c0c0b7b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,7 +10,7 @@ jobs: env: GITHUB_SHA: ${{ github.sha }} GITHUB_REF: ${{ github.ref }} - PLATFORMS: "linux/amd64,linux/arm64,linux/ppc64le" + PLATFORMS: "linux/amd64,linux/arm64,linux/ppc64le,linux/s390x" runs-on: ubuntu-latest steps: - name: Clone source code @@ -56,7 +56,7 @@ jobs: with: context: . file: ./deploy/Dockerfile_slim - platforms: linux/amd64,linux/arm64,linux/ppc64le + platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x push: true tags: | gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }}-slim @@ -67,7 +67,7 @@ jobs: with: context: . file: ./deploy/Dockerfile - platforms: linux/amd64,linux/arm64,linux/ppc64le + platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x push: true tags: | gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }} @@ -94,7 +94,7 @@ jobs: env: GITHUB_SHA: ${{ github.sha }} GITHUB_REF: ${{ github.ref }} - PLATFORMS: "linux/amd64,linux/arm64,linux/ppc64le" + PLATFORMS: "linux/amd64,linux/arm64,linux/ppc64le,linux/s390x" runs-on: ubuntu-latest steps: - name: Clone source code @@ -140,7 +140,7 @@ jobs: with: context: . file: ./deploy/Dockerfile_debug - platforms: linux/amd64,linux/arm64,linux/ppc64le + platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x push: true tags: | gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }}-debug @@ -163,7 +163,7 @@ jobs: env: GITHUB_SHA: ${{ github.sha }} GITHUB_REF: ${{ github.ref }} - PLATFORMS: "linux/amd64,linux/arm64,linux/ppc64le" + PLATFORMS: "linux/amd64,linux/arm64,linux/ppc64le,linux/s390x" runs-on: ubuntu-latest steps: - name: Clone source code @@ -208,7 +208,7 @@ jobs: with: context: . file: ./deploy/Dockerfile_warmer - platforms: linux/amd64,linux/arm64,linux/ppc64le + platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x push: true tags: | gcr.io/kaniko-project/warmer:${{ env.GITHUB_SHA }} diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 37c4a059d2..01ad4e8242 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -32,7 +32,7 @@ RUN GOARCH=$(cat /goarch) && CGO_ENABLED=0 && \ cd /go/src/github.com/GoogleCloudPlatform && \ git clone https://github.com/GoogleCloudPlatform/docker-credential-gcr.git && \ cd /go/src/github.com/GoogleCloudPlatform/docker-credential-gcr && \ - make deps OUT_DIR=/usr/local/bin && \ + go get -u -t ./... && \ go build -ldflags "-linkmode external -extldflags -static" -i -o /usr/local/bin/docker-credential-gcr main.go # Get Amazon ECR credential helper @@ -50,7 +50,7 @@ RUN GOARCH=$(cat /goarch) && (mkdir -p /go/src/github.com/chrismellard || true) RUN mkdir -p /kaniko/.docker COPY . . -RUN make GOARCH=$(cat /goarch.txt) +RUN make GOARCH=$(cat /goarch) # Generate latest ca-certificates diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug index 21d4354ea3..64836af5ee 100644 --- a/deploy/Dockerfile_debug +++ b/deploy/Dockerfile_debug @@ -30,8 +30,13 @@ RUN cat /goarch # Get GCR credential helper -ADD https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v2.0.1/docker-credential-gcr_linux_$GOARCH-2.0.1.tar.gz /usr/local/bin/ - RUN tar --no-same-owner -C /usr/local/bin/ -xvzf /usr/local/bin/docker-credential-gcr_linux_$GOARCH-2.0.1.tar.gz +RUN GOARCH=$(cat /goarch) && CGO_ENABLED=0 && \ + (mkdir -p /go/src/github.com/GoogleCloudPlatform || true) && \ + cd /go/src/github.com/GoogleCloudPlatform && \ + git clone https://github.com/GoogleCloudPlatform/docker-credential-gcr.git && \ + cd /go/src/github.com/GoogleCloudPlatform/docker-credential-gcr && \ + go get -u -t ./... && \ + go build -ldflags "-linkmode external -extldflags -static" -i -o /usr/local/bin/docker-credential-gcr main.go # Get Amazon ECR credential helper RUN GOARCH=$(cat /goarch) && go get -u github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login && \ @@ -48,7 +53,7 @@ RUN GOARCH=$(cat /goarch) && (mkdir -p /go/src/github.com/chrismellard || true) RUN mkdir -p /kaniko/.docker COPY . . -RUN make GOARCH=$(cat /goarch) && make GOARCH=$(cat /goarch.txt) out/warmer +RUN make GOARCH=$(cat /goarch) && make GOARCH=$(cat /goarch) out/warmer # Generate latest ca-certificates diff --git a/deploy/Dockerfile_warmer b/deploy/Dockerfile_warmer index f8ddca1519..36e350f63c 100644 --- a/deploy/Dockerfile_warmer +++ b/deploy/Dockerfile_warmer @@ -27,8 +27,13 @@ RUN [ ! "x" = "x$TARGETPLATFORM" ] && `echo $TARGETPLATFORM | awk '{split($0,a, RUN echo "I am runninng $TARGETPLATFORM with $(cat /goarch)" # Get GCR credential helper -ADD https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v2.0.1/docker-credential-gcr_linux_$GOARCH-2.0.1.tar.gz /usr/local/bin/ - RUN tar --no-same-owner -C /usr/local/bin/ -xvzf /usr/local/bin/docker-credential-gcr_linux_$GOARCH-2.0.1.tar.gz +RUN GOARCH=$(cat /goarch) && CGO_ENABLED=0 && \ + (mkdir -p /go/src/github.com/GoogleCloudPlatform || true) && \ + cd /go/src/github.com/GoogleCloudPlatform && \ + git clone https://github.com/GoogleCloudPlatform/docker-credential-gcr.git && \ + cd /go/src/github.com/GoogleCloudPlatform/docker-credential-gcr && \ + go get -u -t ./... && \ + go build -ldflags "-linkmode external -extldflags -static" -i -o /usr/local/bin/docker-credential-gcr main.go # Get Amazon ECR credential helper RUN GOARCH=$(cat /goarch) && go get -u github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login && \ diff --git a/hack/install_golint.sh b/hack/install_golint.sh index d0b0697704..64e00fb485 100755 --- a/hack/install_golint.sh +++ b/hack/install_golint.sh @@ -70,6 +70,7 @@ is_supported_platform() { linux/amd64) found=0 ;; linux/386) found=0 ;; linux/ppc64le) found=0 ;; + linux/s390x) found=0 ;; esac return $found }