public_git/kaniko
1
0
Fork 0
mirror of https://github.com/GoogleContainerTools/kaniko synced 2026-09-30 10:01:35 +02:00
Code Issues Releases Wiki Activity

Revert ppce4 and other unintentional changes (#1781)

Browse Source 
* 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
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/release.yaml
+7 -7
View File
@@ -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 }}
deploy/Dockerfile
+1 -1
View File
@@ -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 && \
deploy/Dockerfile_debug
+1 -1
View File
@@ -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 && \
deploy/Dockerfile_warmer
+1 -1
View File
@@ -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 && \