Merge pull request #13562 from oatmealraisin/rymurphy/12666

Merged by openshift-bot

Author: OpenShift Bot

Diff for: pkg/build/builder/docker_test.go

@@ -2,6 +2,7 @@ package builder
 
 import (
 	"bytes"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -318,6 +319,66 @@ func TestEmptySource(t *testing.T) {
 		}
 	}
 }
+
+// We should not be able to try to pull from scratch
+func TestDockerfileFromScratch(t *testing.T) {
+	dockerFile := `FROM scratch
+USER 1001`
+
+	dockerClient := &FakeDocker{
+		buildImageFunc: func(opts docker.BuildImageOptions) error {
+			return nil
+		},
+		pullImageFunc: func(opts docker.PullImageOptions, auth docker.AuthConfiguration) error {
+			if opts.Repository == "scratch" && opts.Registry == "" {
+				return fmt.Errorf("cannot pull scratch")
+			}
+			return nil
+		},
+	}
+
+	build := &api.Build{
+		Spec: api.BuildSpec{
+			CommonSpec: api.CommonSpec{
+				Source: api.BuildSource{
+					ContextDir: "",
+					Dockerfile: &dockerFile,
+				},
+				Strategy: api.BuildStrategy{
+					DockerStrategy: &api.DockerBuildStrategy{
+						DockerfilePath: "",
+						From: &kapi.ObjectReference{
+							Kind: "DockerImage",
+							Name: "scratch",
+						},
+					},
+				},
+				Output: api.BuildOutput{
+					To: &kapi.ObjectReference{
+						Kind: "ImageStreamTag",
+						Name: "scratch",
+					},
+				},
+			},
+		},
+	}
+
+	dockerBuilder := &DockerBuilder{
+		build:        build,
+		dockerClient: dockerClient,
+		gitClient:    git.NewRepository(),
+		tar:          tar.New(s2iutil.NewFileSystem()),
+	}
+
+	if err := dockerBuilder.Build(); err != nil {
+		if strings.Contains(err.Error(), "cannot pull scratch") {
+			t.Errorf("Docker build should not have attempted to pull from scratch")
+		} else {
+			t.Errorf("Received unexpected error: %v", err)
+		}
+	}
+}
+
 func TestGetDockerfileFrom(t *testing.T) {
 	tests := map[string]struct {
 		dockerfileContent string

Diff for: test/extended/builds/dockerfile.go

@@ -18,6 +18,10 @@ USER 1001
 		testDockerfile2 = `
 FROM centos:7
 USER 1001
+`
+		testDockerfile3 = `
+FROM scratch
+USER 1001
 `
 	)
 
@@ -38,7 +42,6 @@ USER 1001
 			bc, err := oc.Client().BuildConfigs(oc.Namespace()).Get("busybox")
 			o.Expect(err).NotTo(o.HaveOccurred())
 			o.Expect(bc.Spec.Source.Git).To(o.BeNil())
-			o.Expect(bc.Spec.Source.Dockerfile).NotTo(o.BeNil())
 			o.Expect(*bc.Spec.Source.Dockerfile).To(o.Equal(testDockerfile))
 
 			buildName := "busybox-1"
@@ -65,7 +68,6 @@ USER 1001
 			bc, err := oc.Client().BuildConfigs(oc.Namespace()).Get("centos")
 			o.Expect(err).NotTo(o.HaveOccurred())
 			o.Expect(bc.Spec.Source.Git).To(o.BeNil())
-			o.Expect(bc.Spec.Source.Dockerfile).NotTo(o.BeNil())
 			o.Expect(*bc.Spec.Source.Dockerfile).To(o.Equal(testDockerfile2))
 			o.Expect(bc.Spec.Output.To).ToNot(o.BeNil())
 			o.Expect(bc.Spec.Output.To.Name).To(o.Equal("centos:latest"))
@@ -88,5 +90,25 @@ USER 1001
 			_, err = oc.Client().ImageStreamTags(oc.Namespace()).Get("centos", "7")
 			o.Expect(err).NotTo(o.HaveOccurred())
 		})
+
+		g.It("should be able to start a build from Dockerfile with FROM reference to scratch", func() {
+			g.By("calling oc new-build with Dockerfile that uses scratch")
+			err := oc.Run("new-build").Args("-D", "-").InputString(testDockerfile3).Execute()
+			o.Expect(err).NotTo(o.HaveOccurred())
+
+			g.By("starting a test build")
+			bc, err := oc.Client().BuildConfigs(oc.Namespace()).Get("scratch")
+			o.Expect(err).NotTo(o.HaveOccurred())
+			o.Expect(*bc.Spec.Source.Dockerfile).To(o.Equal(testDockerfile3))
+
+			buildName := "scratch-1"
+			g.By("expecting the Dockerfile build is in Complete phase")
+			err = exutil.WaitForABuild(oc.Client().Builds(oc.Namespace()), buildName, nil, nil, nil)
+			//debug for failures
+			if err != nil {
+				exutil.DumpBuildLogs("scratch", oc)
+			}
+			o.Expect(err).NotTo(o.HaveOccurred())
+		})
 	})
 })