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

Allow to stack multiple EXPOSE instructions

This commit is contained in:
Guillaume J. Charmes 2013-05-02 02:51:14 -07:00
parent 602786cd60
commit a64ebe5feb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder.go
View File

@ -197,6 +197,7 @@ func (builder *Builder) getCachedImage(image *Image, config *Config) (*Image, er
func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, error) { func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, error) {
var ( var (
image, base *Image image, base *Image
config *Config
maintainer string maintainer string
tmpContainers map[string]struct{} = make(map[string]struct{}) tmpContainers map[string]struct{} = make(map[string]struct{})
tmpImages map[string]struct{} = make(map[string]struct{}) tmpImages map[string]struct{} = make(map[string]struct{})
@ -251,6 +252,7 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
return nil, err return nil, err
} }
} }
config = &Config{}
break break
case "mainainer": case "mainainer":
@ -328,8 +330,10 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
} }
tmpContainers[c.Id] = struct{}{} tmpContainers[c.Id] = struct{}{}
config.PortSpecs = append(ports, config.PortSpecs...)
// Commit the container // Commit the container
base, err = builder.Commit(c, "", "", "", maintainer, &Config{PortSpecs: ports}) base, err = builder.Commit(c, "", "", "", maintainer, config)
if err != nil { if err != nil {
return nil, err return nil, err
} }