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

Merge pull request #2466 from dotcloud/hot-fix-restart-public-mappings 

Hotfix: Migrate public mappings after upgrade
This commit is contained in:
Michael Crosby 2013-10-30 09:35:56 -07:00
parent 2a9c18af52 746ba127bf
commit bb662bc12c
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
container.go
View File

@ -1054,10 +1054,13 @@ func (container *Container) allocateNetwork(hostConfig *HostConfig) error {
if container.Config.PortSpecs != nil { if container.Config.PortSpecs != nil {
utils.Debugf("Migrating port mappings for container: %s", strings.Join(container.Config.PortSpecs, ", ")) utils.Debugf("Migrating port mappings for container: %s", strings.Join(container.Config.PortSpecs, ", "))
if err := migratePortMappings(container.Config); err != nil { if err := migratePortMappings(container.Config, hostConfig); err != nil {
return err return err
} }
container.Config.PortSpecs = nil container.Config.PortSpecs = nil
if err := container.SaveHostConfig(hostConfig); err != nil {
return err
}
} }
portSpecs := make(map[Port]struct{}) portSpecs := make(map[Port]struct{})

12
utils.go
View File

@ -265,15 +265,19 @@ func parsePort(rawPort string) (int, error) {
return int(port), nil return int(port), nil
} }
func migratePortMappings(config *Config) error { func migratePortMappings(config *Config, hostConfig *HostConfig) error {
if config.PortSpecs != nil { if config.PortSpecs != nil {
// We don't have to worry about migrating the bindings to the host ports, bindings, err := parsePortSpecs(config.PortSpecs)
// This is our breaking change
ports, _, err := parsePortSpecs(config.PortSpecs)
if err != nil { if err != nil {
return err return err
} }
config.PortSpecs = nil config.PortSpecs = nil
if len(bindings) > 0 {
if hostConfig == nil {
hostConfig = &HostConfig{}
}
hostConfig.PortBindings = bindings
}
if config.ExposedPorts == nil { if config.ExposedPorts == nil {
config.ExposedPorts = make(map[Port]struct{}, len(ports)) config.ExposedPorts = make(map[Port]struct{}, len(ports))