Refactor port mapping functions for build simplicity

This commit is contained in:
Ross Cadogan 2016-11-07 19:21:47 +00:00
parent e75236414e
commit 6a56597d45
3 changed files with 7 additions and 13 deletions

View file

@ -136,7 +136,12 @@ func (c Container) runtimeConfig() *dockercontainer.Config {
config.Volumes = structMapSubtract(config.Volumes, imageConfig.Volumes)
config.ExposedPorts = structMapPortSubtract(config.ExposedPorts, imageConfig.ExposedPorts)
// subtract ports exposed in image from container
for k, _ := range config.ExposedPorts {
if _, ok := imageConfig.ExposedPorts[k]; ok {
delete(config.ExposedPorts, k)
}
}
for p := range c.containerInfo.HostConfig.PortBindings {
config.ExposedPorts[p] = struct{}{}
}