From 4e8aae7c061326cfd99b82cfaa8d65580987f233 Mon Sep 17 00:00:00 2001 From: Tejal Desai Date: Tue, 19 Oct 2021 12:40:14 -0700 Subject: [PATCH] Revert ppce4 and other unintentional changes (#1781) * Revert "fix dockefiles for deploy" This reverts commit 63613adb822fc5669e270b2b04af5365452992a0. * revert unintentional test changes --- .github/workflows/release.yaml | 14 +++++++------- deploy/Dockerfile | 2 +- deploy/Dockerfile_debug | 2 +- deploy/Dockerfile_warmer | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5d3187cc9..c35c0c0b7 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/s390x" + 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/s390x + 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/s390x + 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/s390x" + 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/s390x + 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/s390x" + 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/s390x + 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 331b10622..572b4a76c 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -33,7 +33,7 @@ RUN GOARCH=$(cat /goarch) && CGO_ENABLED=0 && \ git clone https://github.com/GoogleCloudPlatform/docker-credential-gcr.git && \ cd /go/src/github.com/GoogleCloudPlatform/docker-credential-gcr && \ git checkout 4cdd60d0f2d8a69bc70933f4d7718f9c4e956ff8 && \ - go build -o /usr/local/bin/docker-credential-gcr main.go + 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/deploy/Dockerfile_debug b/deploy/Dockerfile_debug index 25eb0cdcc..af205d03e 100644 --- a/deploy/Dockerfile_debug +++ b/deploy/Dockerfile_debug @@ -36,7 +36,7 @@ RUN GOARCH=$(cat /goarch) && CGO_ENABLED=0 && \ git clone https://github.com/GoogleCloudPlatform/docker-credential-gcr.git && \ cd /go/src/github.com/GoogleCloudPlatform/docker-credential-gcr && \ git checkout 4cdd60d0f2d8a69bc70933f4d7718f9c4e956ff8 && \ - go build -o /usr/local/bin/docker-credential-gcr main.go + 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/deploy/Dockerfile_warmer b/deploy/Dockerfile_warmer index 42d411486..884ec5f9b 100644 --- a/deploy/Dockerfile_warmer +++ b/deploy/Dockerfile_warmer @@ -33,7 +33,7 @@ RUN GOARCH=$(cat /goarch) && CGO_ENABLED=0 && \ git clone https://github.com/GoogleCloudPlatform/docker-credential-gcr.git && \ cd /go/src/github.com/GoogleCloudPlatform/docker-credential-gcr && \ git checkout 4cdd60d0f2d8a69bc70933f4d7718f9c4e956ff8 && \ - go build -o /usr/local/bin/docker-credential-gcr main.go + 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 && \