From a64ebe5feb84d65adbc23ee9d2119f5eab836079 Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Thu, 2 May 2013 02:51:14 -0700 Subject: [PATCH] Allow to stack multiple EXPOSE instructions --- builder.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/builder.go b/builder.go index 24e6dc1e67..3c76712226 100644 --- a/builder.go +++ b/builder.go @@ -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) { var ( image, base *Image + config *Config maintainer string tmpContainers 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 } } + config = &Config{} break case "mainainer": @@ -328,8 +330,10 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e } tmpContainers[c.Id] = struct{}{} + config.PortSpecs = append(ports, config.PortSpecs...) + // Commit the container - base, err = builder.Commit(c, "", "", "", maintainer, &Config{PortSpecs: ports}) + base, err = builder.Commit(c, "", "", "", maintainer, config) if err != nil { return nil, err }