konveyor#107 Ensure that env variable PODMAN_BIN wins (konveyor#108)

Signed-off-by: Gerd Aschemann <[email protected]> Signed-off-by: Emily McMullan <[email protected]>
eemcmullan · Nov 17, 2023 · 8268ba6 · 8268ba6
1 parent 65a5822
commit 8268ba6
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/cmd/settings.go b/cmd/settings.go
@@ -26,10 +26,14 @@ type Config struct {
 }
 
 func (c *Config) Load() error {
-	podmanPath, _ := exec.LookPath("podman")
-	if podmanPath != c.PodmanBinary && (podmanPath != "" || len(podmanPath) > 0) {
-		os.Setenv("PODMAN_BIN", podmanPath)
+	envValue := os.Getenv("PODMAN_BIN")
+	if envValue == "" {
+		podmanPath, _ := exec.LookPath("podman")
+		if podmanPath != c.PodmanBinary && (podmanPath != "" || len(podmanPath) > 0) {
+			os.Setenv("PODMAN_BIN", podmanPath)
+		}
 	}
+
 	err := env.Set(c)
 	if err != nil {
 		return err