fix(build, buildah): support custom docker config path (#6421)

Fix bug #4957
werf · Nov 18, 2024 · 720e3d3 · 720e3d3
1 parent 7d2cbb3
commit 720e3d3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/cmd/werf/common/container_backend.go b/cmd/werf/common/container_backend.go
@@ -121,6 +121,11 @@ func InitProcessContainerBackend(ctx context.Context, cmdData *CmdData, registry
 			return nil, ctx, fmt.Errorf("unable to get buildah client: %w", err)
 		}
 
+		err = docker.InitDockerConfig(docker.InitOptions{DockerConfigDir: *cmdData.DockerConfig})
+		if err != nil {
+			return nil, ctx, fmt.Errorf("unable to set docker config for buildah client: %w", err)
+		}
+
 		return wrapContainerBackend(container_backend.NewBuildahBackend(b, container_backend.BuildahBackendOptions{TmpDir: filepath.Join(werf.GetServiceDir(), "tmp", "buildah")})), ctx, nil
 	}
 
@@ -141,7 +146,7 @@ func InitProcessDocker(ctx context.Context, cmdData *CmdData) (context.Context,
 	}
 
 	if err := docker.Init(ctx, opts); err != nil {
-		return ctx, fmt.Errorf("unable to init docker for buildah container backend: %w", err)
+		return ctx, fmt.Errorf("unable to init docker: %w", err)
 	}
 
 	ctxWithDockerCli, err := docker.NewContext(ctx)

diff --git a/pkg/docker/main.go b/pkg/docker/main.go
@@ -48,16 +48,9 @@ type InitOptions struct {
 }
 
 func Init(ctx context.Context, opts InitOptions) error {
-	if opts.DockerConfigDir != "" {
-		DockerConfigDir = opts.DockerConfigDir
-		cliconfig.SetDir(opts.DockerConfigDir)
-	} else {
-		DockerConfigDir = filepath.Join(os.Getenv("HOME"), ".docker")
-	}
-
-	err := os.Setenv("DOCKER_CONFIG", DockerConfigDir)
+	err := InitDockerConfig(opts)
 	if err != nil {
-		return fmt.Errorf("cannot set DOCKER_CONFIG to %s: %w", DockerConfigDir, err)
+		return err
 	}
 
 	isDebug = os.Getenv("WERF_DEBUG_DOCKER") == "1"
@@ -96,6 +89,22 @@ func Init(ctx context.Context, opts InitOptions) error {
 	return nil
 }
 
+func InitDockerConfig(opts InitOptions) error {
+	if opts.DockerConfigDir != "" {
+		DockerConfigDir = opts.DockerConfigDir
+		cliconfig.SetDir(opts.DockerConfigDir)
+	} else {
+		DockerConfigDir = filepath.Join(os.Getenv("HOME"), ".docker")
+	}
+
+	err := os.Setenv("DOCKER_CONFIG", DockerConfigDir)
+	if err != nil {
+		return fmt.Errorf("cannot set DOCKER_CONFIG to %s: %w", DockerConfigDir, err)
+	}
+
+	return nil
+}
+
 func ClaimTargetPlatforms(claimPlatforms []string) {
 	if defaultPlatform != "" {
 		claimPlatforms = append(claimPlatforms, defaultPlatform)