docker: fix proxy env vars propagation (#915)

Co-authored-by: Michele D'Avino <[email protected]>
abiosoft · Dec 6, 2023 · 79c49e7 · 79c49e7
1 parent 814bca5
commit 79c49e7
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/environment/container/docker/daemon.go b/environment/container/docker/daemon.go
@@ -32,15 +32,17 @@ func (d dockerRuntime) createDaemonFile(conf map[string]any, env map[string]stri
 	// add proxy vars if set
 	// according to https://docs.docker.com/config/daemon/systemd/#httphttps-proxy
 	if vars := d.proxyEnvVars(env); !vars.empty() {
+		proxyConf := map[string]any{}
 		if vars.http != "" {
-			conf["http-proxy"] = vars.http
+			proxyConf["http-proxy"] = vars.http
 		}
 		if vars.https != "" {
-			conf["https-proxy"] = vars.https
+			proxyConf["https-proxy"] = vars.https
 		}
 		if vars.no != "" {
-			conf["no-proxy"] = vars.https
+			proxyConf["no-proxy"] = vars.no
 		}
+		conf["proxies"] = proxyConf
 	}
 
 	b, err := json.MarshalIndent(conf, "", "  ")