From b530a7341c147bcad0e97beaa891a6a999562bfa Mon Sep 17 00:00:00 2001 From: Ben Parees Date: Thu, 18 Feb 2016 10:10:14 -0500 Subject: [PATCH] always pull the previous image for s2i builds when doing an incremental build, we always want to ensure we are using the latest previous image. --- pkg/build/builder/sti.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/build/builder/sti.go b/pkg/build/builder/sti.go index 737d6fc40995..28ea4c95ee65 100644 --- a/pkg/build/builder/sti.go +++ b/pkg/build/builder/sti.go @@ -178,13 +178,12 @@ func (s *S2IBuilder) Build() error { if s.build.Spec.Strategy.SourceStrategy.ForcePull { glog.V(4).Infof("With force pull true, setting policies to %s", s2iapi.PullAlways) - config.PreviousImagePullPolicy = s2iapi.PullAlways config.BuilderPullPolicy = s2iapi.PullAlways } else { glog.V(4).Infof("With force pull false, setting policies to %s", s2iapi.PullIfNotPresent) - config.PreviousImagePullPolicy = s2iapi.PullIfNotPresent config.BuilderPullPolicy = s2iapi.PullIfNotPresent } + config.PreviousImagePullPolicy = s2iapi.PullAlways allowedUIDs := os.Getenv("ALLOWED_UIDS") glog.V(2).Infof("The value of ALLOWED_UIDS is [%s]", allowedUIDs)