From ee562a4a1b44112a82b01a7977569d17797bf20b Mon Sep 17 00:00:00 2001 From: Shubham Agrawal Date: Thu, 26 Nov 2020 23:47:00 +0530 Subject: [PATCH] Fix kaniko-gcr docker file --- cmd/kaniko-gcr/main.go | 2 +- docker/docker/Dockerfile.linux.amd64 | 5 +---- docker/ecr/Dockerfile.linux.amd64 | 5 +---- docker/gcr/Dockerfile.linux.amd64 | 5 +---- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/cmd/kaniko-gcr/main.go b/cmd/kaniko-gcr/main.go index d4a235e..a7ec8a5 100644 --- a/cmd/kaniko-gcr/main.go +++ b/cmd/kaniko-gcr/main.go @@ -15,7 +15,7 @@ import ( const ( // GCR JSON key file path - gcrKeyPath string = "/kaniko/gcr.json" + gcrKeyPath string = "/kaniko/config.json" gcrEnvVariable string = "GOOGLE_APPLICATION_CREDENTIALS" ) diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64 index 10d6590..5d60858 100644 --- a/docker/docker/Dockerfile.linux.amd64 +++ b/docker/docker/Dockerfile.linux.amd64 @@ -1,7 +1,4 @@ -FROM gcr.io/kaniko-project/executor:amd64-v1.3.0 - -ENV HOME /root -ENV USER root +FROM gcr.io/kaniko-project/executor:v1.3.0 ADD release/linux/amd64/kaniko-docker /kaniko/ ENTRYPOINT ["/kaniko/kaniko-docker"] diff --git a/docker/ecr/Dockerfile.linux.amd64 b/docker/ecr/Dockerfile.linux.amd64 index 3584d67..4d78821 100644 --- a/docker/ecr/Dockerfile.linux.amd64 +++ b/docker/ecr/Dockerfile.linux.amd64 @@ -1,7 +1,4 @@ -FROM gcr.io/kaniko-project/executor:amd64-v1.3.0 - -ENV HOME /root -ENV USER root +FROM gcr.io/kaniko-project/executor:v1.3.0 ADD release/linux/amd64/kaniko-ecr /kaniko/ ENTRYPOINT ["/kaniko/kaniko-ecr"] diff --git a/docker/gcr/Dockerfile.linux.amd64 b/docker/gcr/Dockerfile.linux.amd64 index ac5ba0d..2866593 100644 --- a/docker/gcr/Dockerfile.linux.amd64 +++ b/docker/gcr/Dockerfile.linux.amd64 @@ -1,7 +1,4 @@ -FROM gcr.io/kaniko-project/executor:amd64-v1.3.0 - -ENV HOME /root -ENV USER root +FROM gcr.io/kaniko-project/executor:v1.3.0 ADD release/linux/amd64/kaniko-gcr /kaniko/ ENTRYPOINT ["/kaniko/kaniko-gcr"] \ No newline at end of file