tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-27 07:34:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1417 from gtardif/build_labels

Browse Source 
Adding support for compose file attributes
This commit is contained in:
Guillaume Tardif 2021-03-11 17:36:36 +01:00 committed by GitHub
commit 4402ecf84e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
local/compose/build.go
View File

@ -189,6 +189,7 @@ func (s *composeService) toBuildOptions(service types.ServiceConfig, contextPath
Target: service.Build.Target, Target: service.Build.Target,
Exports: []bclient.ExportEntry{{Type: "image", Attrs: map[string]string{}}}, Exports: []bclient.ExportEntry{{Type: "image", Attrs: map[string]string{}}},
Platforms: plats, Platforms: plats,
Labels: service.Labels,
}, nil }, nil
} }

6
local/compose/create.go
View File

@ -289,6 +289,12 @@ func (s *composeService) getCreateOptions(ctx context.Context, p *types.Project,
Resources: resources, Resources: resources,
VolumeDriver: service.VolumeDriver, VolumeDriver: service.VolumeDriver,
VolumesFrom: service.VolumesFrom, VolumesFrom: service.VolumesFrom,
DNS: service.DNS,
DNSSearch: service.DNSSearch,
DNSOptions: service.DNSOpts,
ExtraHosts: service.ExtraHosts,
SecurityOpt: service.SecurityOpt,
UsernsMode: container.UsernsMode(service.UserNSMode),
} }
networkConfig := buildDefaultNetworkConfig(service, networkMode, getContainerName(p.Name, service, number)) networkConfig := buildDefaultNetworkConfig(service, networkMode, getContainerName(p.Name, service, number))