Merge pull request openshift#16018 from bparees/image_pullsecrets

setup docker pull secrets in image extraction init container
cucushift · Aug 29, 2017 · 077983e · 077983e
2 parents 47b27d9 + 40d80f0
commit 077983e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/pkg/build/controller/strategy/docker.go b/pkg/build/controller/strategy/docker.go
@@ -130,6 +130,7 @@ func (bs *DockerBuildStrategy) CreateBuildPod(build *buildapi.Build) (*v1.Pod, e
 			ImagePullPolicy: v1.PullIfNotPresent,
 			Resources:       buildutil.CopyApiResourcesToV1Resources(&build.Spec.Resources),
 		}
+		setupDockerSecrets(pod, &extractImageContentContainer, build.Spec.Output.PushSecret, strategy.PullSecret, build.Spec.Source.Images)
 		pod.Spec.InitContainers = append(pod.Spec.InitContainers, extractImageContentContainer)
 	}
 	pod.Spec.InitContainers = append(pod.Spec.InitContainers,

diff --git a/pkg/build/controller/strategy/sti.go b/pkg/build/controller/strategy/sti.go
@@ -152,6 +152,7 @@ func (bs *SourceBuildStrategy) CreateBuildPod(build *buildapi.Build) (*v1.Pod, e
 			ImagePullPolicy: v1.PullIfNotPresent,
 			Resources:       buildutil.CopyApiResourcesToV1Resources(&build.Spec.Resources),
 		}
+		setupDockerSecrets(pod, &extractImageContentContainer, build.Spec.Output.PushSecret, strategy.PullSecret, build.Spec.Source.Images)
 		pod.Spec.InitContainers = append(pod.Spec.InitContainers, extractImageContentContainer)
 	}
 	pod.Spec.InitContainers = append(pod.Spec.InitContainers,