use src distinct directory for context-dir builds

Author: bparees

pkg/build/builder/sti.go

@@ -127,6 +127,14 @@ func (s *S2IBuilder) Build() error {
 		if contextDir == "." || contextDir == "/" {
 			contextDir = ""
 		}
+		if len(contextDir) > 0 {
+			// if we're building out of a context dir, we need to use a different working
+			// directory from where we put the source code because s2i is going to copy
+			// from the context dir to the workdir, and if the workdir is a parent of the
+			// context dir, we end up with a directory that contains 2 copies of the
+			// input source code.
+			buildDir, err = ioutil.TempDir("", "s2i-build-context")
+		}
 		if sourceInfo != nil {
 			sourceInfo.ContextDir = s.build.Spec.Source.ContextDir
 		}

test/extended/builds/contextdir.go

@@ -73,6 +73,12 @@ var _ = g.Describe("[builds][Slow] builds with a context directory", func() {
 			pods, err := oc.KubeClient().Core().Pods(oc.Namespace()).List(kapi.ListOptions{LabelSelector: dcLabel})
 			o.Expect(err).NotTo(o.HaveOccurred())
 			o.Expect(len(pods.Items)).To(o.Equal(1))
+
+			g.By("expecting the pod not to contain two copies of the source")
+			pod := pods.Items[0]
+			out, err := oc.Run("exec").Args(pod.Name, "-c", pod.Spec.Containers[0].Name, "--", "ls", "/opt/app-root/src").Output()
+			o.Expect(err).NotTo(o.HaveOccurred())
+			o.Expect(out).To(o.ContainSubstring("2.3"))
 		})
 	})