From 007ec5afeef06aedc1319ce1546ccb1b07c22f6d Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Tue, 31 Aug 2021 14:04:31 +0200 Subject: [PATCH] set proxy env vars based on CLI config Signed-off-by: Nicolas De Loof --- pkg/compose/create.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/compose/create.go b/pkg/compose/create.go index 8df74dcb4..3f477ee4f 100644 --- a/pkg/compose/create.go +++ b/pkg/compose/create.go @@ -269,6 +269,9 @@ func (s *composeService) getCreateOptions(ctx context.Context, p *types.Project, return nil, nil, nil, err } + proxyConfig := types.MappingWithEquals(s.configFile.ParseProxyConfig(s.apiClient.DaemonHost(), nil)) + env := proxyConfig.OverrideBy(service.Environment) + containerConfig := container.Config{ Hostname: service.Hostname, Domainname: service.DomainName, @@ -288,7 +291,7 @@ func (s *composeService) getCreateOptions(ctx context.Context, p *types.Project, MacAddress: service.MacAddress, Labels: labels, StopSignal: service.StopSignal, - Env: ToMobyEnv(service.Environment), + Env: ToMobyEnv(env), Healthcheck: ToMobyHealthCheck(service.HealthCheck), Volumes: volumeMounts, StopTimeout: ToSeconds(service.StopGracePeriod),