Browse code

Rebase fix

Guillaume J. Charmes authored on 2013/05/07 09:07:56
Showing 1 changed files
... ...
@@ -277,10 +277,6 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
277 277
 				fmt.Fprintf(stdout, "===> %s\n", image.ShortId())
278 278
 				break
279 279
 			}
280
-			config, err := ParseRun([]string{image.Id, "/bin/sh", "-c", tmp[1]}, nil, builder.runtime.capabilities)
281
-			if err != nil {
282
-				return err
283
-			}
284 280
 
285 281
 			// Create the container and start it
286 282
 			c, err := builder.Create(config)
... ...
@@ -290,9 +286,6 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
290 290
 			if err := c.Start(); err != nil {
291 291
 				return nil, err
292 292
 			}
293
-			if err := c.Start(); err != nil {
294
-				return err
295
-			}
296 293
 			tmpContainers[c.Id] = struct{}{}
297 294
 
298 295
 			// Wait for it to finish