tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2053 from ndeloof/proxy-config 

set proxy env vars based on CLI config
This commit is contained in:
Ulysses Souza 2021-08-31 07:44:02 -07:00 committed by GitHub
parent 2a6791e807 007ec5afee
commit 61338d3477
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/compose/create.go
View File

@ -269,6 +269,9 @@ func (s *composeService) getCreateOptions(ctx context.Context, p *types.Project,
return nil, nil, nil, err return nil, nil, nil, err
} }
proxyConfig := types.MappingWithEquals(s.configFile.ParseProxyConfig(s.apiClient.DaemonHost(), nil))
env := proxyConfig.OverrideBy(service.Environment)
containerConfig := container.Config{ containerConfig := container.Config{
Hostname: service.Hostname, Hostname: service.Hostname,
Domainname: service.DomainName, Domainname: service.DomainName,
@ -288,7 +291,7 @@ func (s *composeService) getCreateOptions(ctx context.Context, p *types.Project,
MacAddress: service.MacAddress, MacAddress: service.MacAddress,
Labels: labels, Labels: labels,
StopSignal: service.StopSignal, StopSignal: service.StopSignal,
Env: ToMobyEnv(service.Environment), Env: ToMobyEnv(env),
Healthcheck: ToMobyHealthCheck(service.HealthCheck), Healthcheck: ToMobyHealthCheck(service.HealthCheck),
Volumes: volumeMounts, Volumes: volumeMounts,
StopTimeout: ToSeconds(service.StopGracePeriod), StopTimeout: ToSeconds(service.StopGracePeriod),