From 348018d0e9d2ae6445d59887ffffbfd4d6344030 Mon Sep 17 00:00:00 2001
From: chenggui53 <chenggui53@gmail.com>
Date: Sat, 13 Aug 2022 02:34:19 +0800
Subject: [PATCH] fix(KanikoDir): update DOCKER_CONFIG env when use custom
 kanikoDir (#2202)

* Fix(KanikoDIr): update DOCKER_CONFIG env when user defined new KanikoDIr

* Update root.go

* Update root.go
---
 cmd/executor/cmd/root.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cmd/executor/cmd/root.go b/cmd/executor/cmd/root.go
index 43ae566df..3f2d05c9a 100644
--- a/cmd/executor/cmd/root.go
+++ b/cmd/executor/cmd/root.go
@@ -260,6 +260,10 @@ func checkKanikoDir(dir string) error {
 		if err := os.RemoveAll(constants.DefaultKanikoPath); err != nil {
 			return err
 		}
+		// After remove DefaultKankoPath, the DOKCER_CONFIG env will point to a non-exist dir, so we should update DOCKER_CONFIG env to new dir
+		if err := os.Setenv("DOCKER_CONFIG", filepath.Join(dir, "/.docker")); err != nil {
+			return err
+		}
 	}
 	return nil
 }