Merge pull request #342 from kunalkushwaha/up-force-build

--build option for up command

Author: vdemeester

cli/app/app.go

@@ -142,6 +142,7 @@ func ProjectUp(p project.APIProject, c *cli.Context) error {
 			NoRecreate:    c.Bool("no-recreate"),
 			ForceRecreate: c.Bool("force-recreate"),
 			NoBuild:       c.Bool("no-build"),
+			ForceBuild:    c.Bool("build"),
 		},
 	}
 	ctx, cancelFun := context.WithCancel(context.Background())

cli/command/command.go

@@ -136,6 +136,10 @@ func UpCommand(factory app.ProjectFactory) cli.Command {
 				Name:  "force-recreate",
 				Usage: "Recreate containers even if their configuration and image haven't changed. Incompatible with --no-recreate.",
 			},
+			cli.BoolFlag{
+				Name:  "build",
+				Usage: "Build images before starting containers.",
+			},
 		},
 	}
 }

docker/service.go

@@ -76,7 +76,7 @@ func (s *Service) Create(ctx context.Context, options options.Create) error {
 		return err
 	}
 
-	if err := s.ensureImageExists(ctx, options.NoBuild); err != nil {
+	if err := s.ensureImageExists(ctx, options.NoBuild, options.ForceBuild); err != nil {
 		return err
 	}
 
@@ -135,7 +135,11 @@ func (s *Service) collectContainers(ctx context.Context) ([]*container.Container
 	return result, nil
 }
 
-func (s *Service) ensureImageExists(ctx context.Context, noBuild bool) error {
+func (s *Service) ensureImageExists(ctx context.Context, noBuild bool, forceBuild bool) error {
+	if forceBuild {
+		return s.build(ctx, options.Build{})
+	}
+
 	exists, err := s.ImageExists(ctx)
 	if err != nil {
 		return err
@@ -247,7 +251,7 @@ func (s *Service) Up(ctx context.Context, options options.Up) error {
 
 	var imageName = s.imageName()
 	if len(containers) == 0 || !options.NoRecreate {
-		if err = s.ensureImageExists(ctx, options.NoBuild); err != nil {
+		if err = s.ensureImageExists(ctx, options.NoBuild, options.ForceBuild); err != nil {
 			return err
 		}
 	}
@@ -258,7 +262,7 @@ func (s *Service) Up(ctx context.Context, options options.Up) error {
 // Run implements Service.Run. It runs a one of command within the service container.
 // It always create a new container.
 func (s *Service) Run(ctx context.Context, commandParts []string, options options.Run) (int, error) {
-	err := s.ensureImageExists(ctx, false)
+	err := s.ensureImageExists(ctx, false, false)
 	if err != nil {
 		return -1, err
 	}
@@ -617,7 +621,7 @@ func (s *Service) Scale(ctx context.Context, scale int, timeout int) error {
 	}
 
 	if len(containers) < scale {
-		err := s.ensureImageExists(ctx, false)
+		err := s.ensureImageExists(ctx, false, false)
 		if err != nil {
 			return err
 		}

project/options/types.go

@@ -25,7 +25,7 @@ type Create struct {
 	NoRecreate    bool
 	ForceRecreate bool
 	NoBuild       bool
-	// ForceBuild bool
+	ForceBuild    bool
 }
 
 // Run holds options of compose run.