Merge pull request #123 from vdemeester/carry-pr-58

Carry #58 : Add support build no cache

Author: vdemeester

cli/command/command.go

@@ -21,6 +21,12 @@ func BuildCommand(factory app.ProjectFactory) cli.Command {
 		Name:   "build",
 		Usage:  "Build or rebuild services.",
 		Action: app.WithProject(factory, app.ProjectBuild),
+		Flags: []cli.Flag{
+			cli.BoolFlag{
+				Name:  "no-cache",
+				Usage: "Do not use cache when building the image",
+			},
+		},
 	}
 }
 
@@ -243,5 +249,7 @@ func Populate(context *project.Context, c *cli.Context) {
 		context.Signal = c.Int("signal")
 	} else if c.Command.Name == "rm" {
 		context.Volume = c.Bool("v")
+	} else if c.Command.Name == "build" {
+		context.NoCache = c.Bool("no-cache")
 	}
 }

docker/builder.go

@@ -63,6 +63,7 @@ func (d *DaemonBuilder) Build(p *project.Project, service project.Service) (stri
 		Name:           tag,
 		RmTmpContainer: true,
 		Dockerfile:     service.Config().Dockerfile,
+		NoCache:        d.context.NoCache,
 	})
 
 	if err != nil {

integration/build_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"strings"
 
 	. "gopkg.in/check.v1"
 )
@@ -30,3 +31,58 @@ func (s *RunSuite) TestBuild(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(two.Config.Cmd, DeepEquals, []string{"echo", "two"})
 }
+
+func (s *RunSuite) TestBuildWithNoCache1(c *C) {
+	p := s.RandomProject()
+	cmd := exec.Command(s.command, "-f", "./assets/build/docker-compose.yml", "-p", p, "build")
+
+	output, err := cmd.Output()
+	c.Assert(err, IsNil)
+
+	cmd = exec.Command(s.command, "-f", "./assets/build/docker-compose.yml", "-p", p, "build")
+	output, err = cmd.Output()
+	c.Assert(err, IsNil)
+	out := string(output[:])
+	c.Assert(strings.Contains(out,
+		"Using cache"),
+		Equals, true, Commentf("%s", out))
+}
+
+func (s *RunSuite) TestBuildWithNoCache2(c *C) {
+	p := s.RandomProject()
+	cmd := exec.Command(s.command, "-f", "./assets/build/docker-compose.yml", "-p", p, "build")
+
+	output, err := cmd.Output()
+	c.Assert(err, IsNil)
+
+	cmd = exec.Command(s.command, "-f", "./assets/build/docker-compose.yml", "-p", p, "build", "--no-cache")
+	output, err = cmd.Output()
+	c.Assert(err, IsNil)
+	out := string(output[:])
+	c.Assert(strings.Contains(out,
+		"Using cache"),
+		Equals, false, Commentf("%s", out))
+}
+
+func (s *RunSuite) TestBuildWithNoCache3(c *C) {
+	p := s.RandomProject()
+	cmd := exec.Command(s.command, "-f", "./assets/build/docker-compose.yml", "-p", p, "build", "--no-cache")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	cmd.Stdin = os.Stdin
+	err := cmd.Run()
+
+	oneImageName := fmt.Sprintf("%s_one", p)
+	twoImageName := fmt.Sprintf("%s_two", p)
+
+	c.Assert(err, IsNil)
+
+	client := GetClient(c)
+	one, err := client.InspectImage(oneImageName)
+	c.Assert(err, IsNil)
+	c.Assert(one.Config.Cmd, DeepEquals, []string{"echo", "one"})
+
+	two, err := client.InspectImage(twoImageName)
+	c.Assert(err, IsNil)
+	c.Assert(two.Config.Cmd, DeepEquals, []string{"echo", "two"})
+}

project/context.go

@@ -23,6 +23,7 @@ type Context struct {
 	Volume              bool
 	ForceRecreate       bool
 	NoRecreate          bool
+	NoCache             bool
 	Signal              int
 	ComposeFile         string
 	ComposeBytes        []byte