public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert ppce4 and other unintentional changes (#1781) 

* Revert "fix dockefiles for deploy"

This reverts commit 63613adb82.

* revert unintentional test changes
This commit is contained in:
Tejal Desai 2021-10-19 12:40:14 -07:00 committed by GitHub
parent cf4822c31c
commit 4e8aae7c06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/release.yaml vendored
View File

@ -10,7 +10,7 @@ jobs:
env: env:
GITHUB_SHA: ${{ github.sha }} GITHUB_SHA: ${{ github.sha }}
GITHUB_REF: ${{ github.ref }} GITHUB_REF: ${{ github.ref }}
PLATFORMS: "linux/amd64,linux/arm64,linux/s390x" PLATFORMS: "linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Clone source code - name: Clone source code
@ -56,7 +56,7 @@ jobs:
with: with:
context: . context: .
file: ./deploy/Dockerfile_slim file: ./deploy/Dockerfile_slim
platforms: linux/amd64,linux/arm64,linux/s390x platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
push: true push: true
tags: | tags: |
gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }}-slim gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }}-slim
@ -67,7 +67,7 @@ jobs:
with: with:
context: . context: .
file: ./deploy/Dockerfile file: ./deploy/Dockerfile
platforms: linux/amd64,linux/arm64,linux/s390x platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
push: true push: true
tags: | tags: |
gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }} gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }}
@ -94,7 +94,7 @@ jobs:
env: env:
GITHUB_SHA: ${{ github.sha }} GITHUB_SHA: ${{ github.sha }}
GITHUB_REF: ${{ github.ref }} GITHUB_REF: ${{ github.ref }}
PLATFORMS: "linux/amd64,linux/arm64,linux/s390x" PLATFORMS: "linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Clone source code - name: Clone source code
@ -140,7 +140,7 @@ jobs:
with: with:
context: . context: .
file: ./deploy/Dockerfile_debug file: ./deploy/Dockerfile_debug
platforms: linux/amd64,linux/arm64,linux/s390x platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
push: true push: true
tags: | tags: |
gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }}-debug gcr.io/kaniko-project/executor:${{ env.GITHUB_SHA }}-debug
@ -163,7 +163,7 @@ jobs:
env: env:
GITHUB_SHA: ${{ github.sha }} GITHUB_SHA: ${{ github.sha }}
GITHUB_REF: ${{ github.ref }} GITHUB_REF: ${{ github.ref }}
PLATFORMS: "linux/amd64,linux/arm64,linux/s390x" PLATFORMS: "linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Clone source code - name: Clone source code
@ -208,7 +208,7 @@ jobs:
with: with:
context: . context: .
file: ./deploy/Dockerfile_warmer file: ./deploy/Dockerfile_warmer
platforms: linux/amd64,linux/arm64,linux/s390x platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
push: true push: true
tags: | tags: |
gcr.io/kaniko-project/warmer:${{ env.GITHUB_SHA }} gcr.io/kaniko-project/warmer:${{ env.GITHUB_SHA }}

2
deploy/Dockerfile
View File

@ -33,7 +33,7 @@ RUN GOARCH=$(cat /goarch) && CGO_ENABLED=0 && \
git clone https://github.com/GoogleCloudPlatform/docker-credential-gcr.git && \ git clone https://github.com/GoogleCloudPlatform/docker-credential-gcr.git && \
cd /go/src/github.com/GoogleCloudPlatform/docker-credential-gcr && \ cd /go/src/github.com/GoogleCloudPlatform/docker-credential-gcr && \
git checkout 4cdd60d0f2d8a69bc70933f4d7718f9c4e956ff8 && \ 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 # 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 && \ RUN GOARCH=$(cat /goarch) && go get -u github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login && \

2
deploy/Dockerfile_debug
View File

@ -36,7 +36,7 @@ RUN GOARCH=$(cat /goarch) && CGO_ENABLED=0 && \
git clone https://github.com/GoogleCloudPlatform/docker-credential-gcr.git && \ git clone https://github.com/GoogleCloudPlatform/docker-credential-gcr.git && \
cd /go/src/github.com/GoogleCloudPlatform/docker-credential-gcr && \ cd /go/src/github.com/GoogleCloudPlatform/docker-credential-gcr && \
git checkout 4cdd60d0f2d8a69bc70933f4d7718f9c4e956ff8 && \ 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 # 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 && \ RUN GOARCH=$(cat /goarch) && go get -u github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login && \

2
deploy/Dockerfile_warmer
View File

@ -33,7 +33,7 @@ RUN GOARCH=$(cat /goarch) && CGO_ENABLED=0 && \
git clone https://github.com/GoogleCloudPlatform/docker-credential-gcr.git && \ git clone https://github.com/GoogleCloudPlatform/docker-credential-gcr.git && \
cd /go/src/github.com/GoogleCloudPlatform/docker-credential-gcr && \ cd /go/src/github.com/GoogleCloudPlatform/docker-credential-gcr && \
git checkout 4cdd60d0f2d8a69bc70933f4d7718f9c4e956ff8 && \ 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 # 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 && \ RUN GOARCH=$(cat /goarch) && go get -u github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login && \