From 5e5e96e74364b4ef4cfbf44fcbf6244c765198e8 Mon Sep 17 00:00:00 2001 From: Justin Alvarez Date: Tue, 24 Jun 2025 16:42:48 +0000 Subject: [PATCH] refactor: move BUILDKIT_HOST to buildkitutil Signed-off-by: Justin Alvarez --- cmd/nerdctl/builder/builder_build.go | 8 -------- pkg/buildkitutil/buildkitutil.go | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cmd/nerdctl/builder/builder_build.go b/cmd/nerdctl/builder/builder_build.go index 8b9691fb8a3..32a2937ed75 100644 --- a/cmd/nerdctl/builder/builder_build.go +++ b/cmd/nerdctl/builder/builder_build.go @@ -19,7 +19,6 @@ package builder import ( "errors" "fmt" - "os" "strconv" "strings" @@ -263,13 +262,6 @@ func GetBuildkitHost(cmd *cobra.Command, namespace string) (string, error) { return buildkitHost, nil } - if buildkitHost := os.Getenv("BUILDKIT_HOST"); buildkitHost != "" { - if err := buildkitutil.PingBKDaemon(buildkitHost); err != nil { - return "", err - } - return buildkitHost, nil - - } return buildkitutil.GetBuildkitHost(namespace) } diff --git a/pkg/buildkitutil/buildkitutil.go b/pkg/buildkitutil/buildkitutil.go index ecf050e4ed8..10ed05379b1 100644 --- a/pkg/buildkitutil/buildkitutil.go +++ b/pkg/buildkitutil/buildkitutil.go @@ -60,6 +60,13 @@ func BuildctlBaseArgs(buildkitHost string) []string { } func GetBuildkitHost(namespace string) (string, error) { + if buildkitHost := os.Getenv("BUILDKIT_HOST"); buildkitHost != "" { + if _, err := pingBKDaemon(buildkitHost); err != nil { + return "", err + } + return buildkitHost, nil + } + paths, err := getBuildkitHostCandidates(namespace) if err != nil { return "", err