diff --git a/cmd/kaniko-docker/main.go b/cmd/kaniko-docker/main.go index 93ea319..23f2261 100644 --- a/cmd/kaniko-docker/main.go +++ b/cmd/kaniko-docker/main.go @@ -15,7 +15,8 @@ import ( ) const ( - // Docker config file path + // Docker file path + dockerPath string = "/kaniko/.docker" dockerConfigPath string = "/kaniko/.docker/config.json" ) @@ -129,10 +130,15 @@ func createDockerCfgFile(username, password, registry string) error { return fmt.Errorf("Registry must be specified") } + err := os.MkdirAll(dockerPath, 0600) + if err != nil { + return errors.Wrap(err, fmt.Sprintf("failed to create %s directory", dockerPath)) + } + authBytes := []byte(fmt.Sprintf("%s:%s", username, password)) encodedString := base64.StdEncoding.EncodeToString(authBytes) jsonBytes := []byte(fmt.Sprintf(`{"auths": {"%s": {"auth": "%s"}}}`, registry, encodedString)) - err := ioutil.WriteFile(dockerConfigPath, jsonBytes, 0644) + err = ioutil.WriteFile(dockerConfigPath, jsonBytes, 0644) if err != nil { return errors.Wrap(err, "failed to create docker config file") } diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64 index 0cd40aa..10d6590 100644 --- a/docker/docker/Dockerfile.linux.amd64 +++ b/docker/docker/Dockerfile.linux.amd64 @@ -1,4 +1,4 @@ -FROM gcr.io/kaniko-project/executor:debug-v0.19.0 +FROM gcr.io/kaniko-project/executor:amd64-v1.3.0 ENV HOME /root ENV USER root diff --git a/docker/docker/Dockerfile.linux.arm64 b/docker/docker/Dockerfile.linux.arm64 index f0f8bd7..9291db8 100644 --- a/docker/docker/Dockerfile.linux.arm64 +++ b/docker/docker/Dockerfile.linux.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/kaniko-project/executor:arm64-v0.19.0 +FROM gcr.io/kaniko-project/executor:arm64-v1.3.0 ENV HOME /root ENV USER root diff --git a/docker/ecr/Dockerfile.linux.amd64 b/docker/ecr/Dockerfile.linux.amd64 index a08de40..3584d67 100644 --- a/docker/ecr/Dockerfile.linux.amd64 +++ b/docker/ecr/Dockerfile.linux.amd64 @@ -1,4 +1,4 @@ -FROM gcr.io/kaniko-project/executor:debug-v0.19.0 +FROM gcr.io/kaniko-project/executor:amd64-v1.3.0 ENV HOME /root ENV USER root diff --git a/docker/ecr/Dockerfile.linux.arm64 b/docker/ecr/Dockerfile.linux.arm64 index c34139e..3b2259f 100644 --- a/docker/ecr/Dockerfile.linux.arm64 +++ b/docker/ecr/Dockerfile.linux.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/kaniko-project/executor:arm64-v0.19.0 +FROM gcr.io/kaniko-project/executor:arm64-v1.3.0 ENV HOME /root ENV USER root diff --git a/docker/gcr/Dockerfile.linux.amd64 b/docker/gcr/Dockerfile.linux.amd64 index 15a777b..ac5ba0d 100644 --- a/docker/gcr/Dockerfile.linux.amd64 +++ b/docker/gcr/Dockerfile.linux.amd64 @@ -1,4 +1,4 @@ -FROM gcr.io/kaniko-project/executor:debug-v0.19.0 +FROM gcr.io/kaniko-project/executor:amd64-v1.3.0 ENV HOME /root ENV USER root diff --git a/docker/gcr/Dockerfile.linux.arm64 b/docker/gcr/Dockerfile.linux.arm64 index a21b032..521564a 100644 --- a/docker/gcr/Dockerfile.linux.arm64 +++ b/docker/gcr/Dockerfile.linux.arm64 @@ -1,4 +1,4 @@ -FROM gcr.io/kaniko-project/executor:arm64-v0.19.0 +FROM gcr.io/kaniko-project/executor:arm64-v1.3.0 ENV HOME /root ENV USER root