Merge pull request #414 from soltysh/inc_flag

Merged by openshift-bot

Author: OpenShift Bot

cmd/s2i/main.go

@@ -81,6 +81,9 @@ $ s2i build . centos/ruby-22-centos7 hello-world-app
 			if len(cfg.BuilderPullPolicy) == 0 {
 				cfg.BuilderPullPolicy = api.DefaultBuilderPullPolicy
 			}
+			if len(cfg.PreviousImagePullPolicy) == 0 {
+				cfg.PreviousImagePullPolicy = api.DefaultPreviousImagePullPolicy
+			}
 
 			if errs := validation.ValidateConfig(cfg); len(errs) > 0 {
 				for _, e := range errs {
@@ -215,6 +218,9 @@ func newCmdRebuild(cfg *api.Config) *cobra.Command {
 			if len(cfg.BuilderPullPolicy) == 0 {
 				cfg.BuilderPullPolicy = api.DefaultBuilderPullPolicy
 			}
+			if len(cfg.PreviousImagePullPolicy) == 0 {
+				cfg.PreviousImagePullPolicy = api.DefaultPreviousImagePullPolicy
+			}
 
 			if glog.V(2) {
 				fmt.Printf("\n%s\n", describe.DescribeConfig(cfg))
@@ -282,6 +288,9 @@ func newCmdUsage(cfg *api.Config) *cobra.Command {
 			if len(cfg.BuilderPullPolicy) == 0 {
 				cfg.BuilderPullPolicy = api.DefaultBuilderPullPolicy
 			}
+			if len(cfg.PreviousImagePullPolicy) == 0 {
+				cfg.PreviousImagePullPolicy = api.DefaultPreviousImagePullPolicy
+			}
 
 			uh, err := sti.NewUsage(cfg)
 			checkErr(err)

pkg/api/describe/describer.go

@@ -40,6 +40,7 @@ func DescribeConfig(config *api.Config) string {
 		}
 		fmt.Fprintf(out, "Remove Old Build:\t%s\n", printBool(config.RemovePreviousImage))
 		fmt.Fprintf(out, "Builder Pull Policy:\t%s\n", config.BuilderPullPolicy)
+		fmt.Fprintf(out, "Previous Image Pull Policy:\t%s\n", config.PreviousImagePullPolicy)
 		fmt.Fprintf(out, "Quiet:\t%s\n", printBool(config.Quiet))
 		fmt.Fprintf(out, "Layered Build:\t%s\n", printBool(config.LayeredBuild))
 		if len(config.Destination) > 0 {

pkg/api/types.go

@@ -35,7 +35,7 @@ const (
 
 	// DefaultPreviousImagePullPolicy specifies policy for pulling the previously
 	// build Docker image when doing incremental build
-	DefaultPreviousImagePullPolicy = PullAlways
+	DefaultPreviousImagePullPolicy = PullIfNotPresent
 )
 
 // Config contains essential fields for performing build.

pkg/cmd/util.go

@@ -24,6 +24,8 @@ func AddCommonFlags(c *cobra.Command, cfg *api.Config) {
 		"DEPRECATED: Always pull the builder image even if it is present locally")
 	c.Flags().VarP(&(cfg.BuilderPullPolicy), "pull-policy", "p",
 		"Specify when to pull the builder image (always, never or if-not-present)")
+	c.Flags().Var(&(cfg.PreviousImagePullPolicy), "incremental-pull-policy",
+		"Specify when to pull the previous image for incremental builds (always, never or if-not-present)")
 	c.Flags().BoolVar(&(cfg.PreserveWorkingDir), "save-temp-dir", false,
 		"Save the temporary directory used by S2I instead of deleting it")
 	c.Flags().StringVarP(&(cfg.DockerCfgPath), "dockercfg-path", "", filepath.Join(os.Getenv("HOME"), ".docker/config.json"),

pkg/docker/fake_docker.go

@@ -147,7 +147,10 @@ func (f *FakeDocker) PullImage(imageName string) (*dockerclient.Image, error) {
 
 // CheckAndPullImage pulls a fake docker image
 func (f *FakeDocker) CheckAndPullImage(name string) (*dockerclient.Image, error) {
-	return nil, nil
+	if f.PullResult {
+		return &dockerclient.Image{}, nil
+	}
+	return nil, f.PullError
 }
 
 // BuildImage builds image