Merge pull request #28299 from vdemeester/compose-swarm-extra_hosts
Add support for extra_hosts in compose to swarm Upstream-commit: e0280c568aa8055d7179afd5928d000726136bed Component: engine
This commit is contained in:
@ -498,6 +498,7 @@ func convertService(
|
||||
Command: service.Entrypoint,
|
||||
Args: service.Command,
|
||||
Hostname: service.Hostname,
|
||||
Hosts: convertExtraHosts(service.ExtraHosts),
|
||||
Env: convertEnvironment(service.Environment),
|
||||
Labels: getStackLabels(namespace.name, service.Labels),
|
||||
Dir: service.WorkingDir,
|
||||
@ -521,6 +522,14 @@ func convertService(
|
||||
return serviceSpec, nil
|
||||
}
|
||||
|
||||
func convertExtraHosts(extraHosts map[string]string) []string {
|
||||
hosts := []string{}
|
||||
for host, ip := range extraHosts {
|
||||
hosts = append(hosts, fmt.Sprintf("%s %s", host, ip))
|
||||
}
|
||||
return hosts
|
||||
}
|
||||
|
||||
func convertRestartPolicy(restart string, source *composetypes.RestartPolicy) (*swarm.RestartPolicy, error) {
|
||||
// TODO: log if restart is being ignored
|
||||
if source == nil {
|
||||
|
||||
Reference in New Issue
Block a user