Forráskód Böngészése

Merge pull request #1417 from gtardif/build_labels

Adding support for compose file attributes
Guillaume Tardif 4 éve
szülő
commit
4402ecf84e
2 módosított fájl, 7 hozzáadás és 0 törlés
  1. 1 0
      local/compose/build.go
  2. 6 0
      local/compose/create.go

+ 1 - 0
local/compose/build.go

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

+ 6 - 0
local/compose/create.go

@@ -289,6 +289,12 @@ func (s *composeService) getCreateOptions(ctx context.Context, p *types.Project,
 		Resources:    resources,
 		VolumeDriver: service.VolumeDriver,
 		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))