*: change the way the dockerfiles are used

Author: AlexNPavel

commands/operator-sdk/cmd/build.go

@@ -127,9 +127,8 @@ func verifyDeploymentImage(yamlFile []byte, imageName string) string {
 }
 
 const (
-	build       = "./tmp/build/build.sh"
-	dockerBuild = "./tmp/build/docker_build.sh"
-	configYaml  = "./config/config.yaml"
+	build      = "./tmp/build/build.sh"
+	configYaml = "./config/config.yaml"
 )
 
 func buildFunc(cmd *cobra.Command, args []string) {
@@ -149,6 +148,7 @@ func buildFunc(cmd *cobra.Command, args []string) {
 	namespacedRolesBytes := make([]byte, 0)
 	genWarning := ""
 	image := args[0]
+	intermediateImageName := image
 	if enableTests {
 		if namespacedManBuild == "" {
 			os.Mkdir("deploy/test", os.FileMode(int(0775)))
@@ -191,20 +191,24 @@ func buildFunc(cmd *cobra.Command, args []string) {
 		if err = generator.RenderTestYaml(c, string(global), string(namespacedRolesBytes), image); err != nil {
 			cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("failed to generate deploy/test-gen.yaml: (%v)", err))
 		}
-		os.Link("tmp/build/dockerfiles/Dockerfile_Tests", "tmp/build/Dockerfile")
-	} else {
-		os.Link("tmp/build/dockerfiles/Dockerfile_Standard", "tmp/build/Dockerfile")
+		intermediateImageName += "-intermediate"
 	}
-	defer os.Remove("tmp/build/Dockerfile")
-	dbcmd := exec.Command(dockerBuild)
-	dbcmd.Env = append(os.Environ(), fmt.Sprintf("IMAGE=%v", image))
-	dbcmd.Env = append(dbcmd.Env, fmt.Sprintf("NAMESPACEDMAN=%v", namespacedManBuild))
+	dbcmd := exec.Command("docker", "build", ".", "-f", "tmp/build/Dockerfile", "-t", intermediateImageName)
 	o, err = dbcmd.CombinedOutput()
 	if err != nil {
-		cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("failed to output build image %v: (%v)", image, string(o)))
+		cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("failed to output build image %v: (%v)", intermediateImageName, string(o)))
 	}
 	fmt.Fprintln(os.Stdout, string(o))
-	if genWarning != "" {
-		fmt.Printf("%s\n", genWarning)
+
+	if enableTests {
+		testDbcmd := exec.Command("docker", "build", ".", "-f", "tmp/build/test-framework/Dockerfile", "-t", image, "--build-arg", "NAMESPACEDMAN="+namespacedManBuild, "--build-arg", "BASEIMAGE="+intermediateImageName)
+		o, err = testDbcmd.CombinedOutput()
+		if err != nil {
+			cmdError.ExitWithError(cmdError.ExitError, fmt.Errorf("failed to output build image %v: (%v)", image, string(o)))
+		}
+		fmt.Fprintln(os.Stdout, string(o))
+		if genWarning != "" {
+			fmt.Printf("%s\n", genWarning)
+		}
 	}
 }

pkg/generator/generator.go

@@ -39,7 +39,7 @@ const (
 	tmpDir        = "tmp"
 	buildDir      = tmpDir + "/build"
 	codegenDir    = tmpDir + "/codegen"
-	dockerDir     = buildDir + "/dockerfiles"
+	dockerTestDir = buildDir + "/test-framework"
 	pkgDir        = "pkg"
 	apisDir       = pkgDir + "/apis"
 	stubDir       = pkgDir + "/stub"
@@ -53,7 +53,7 @@ const (
 	types              = "types.go"
 	build              = "build.sh"
 	dockerBuild        = "docker_build.sh"
-	standardDockerfile = "Dockerfile_Standard"
+	dockerfile         = "Dockerfile"
 	testingDockerfile  = "Dockerfile_Testing"
 	goTest             = "go-test.sh"
 	boilerplate        = "boilerplate.go.txt"
@@ -358,11 +358,11 @@ func renderBuildFiles(buildDir, repoPath, projectName string) error {
 		ProjectName: projectName,
 	}
 
-	if err := renderWriteFile(filepath.Join(buildDir, "dockerfiles", standardDockerfile), "tmp/build/dockerfiles/Dockerfile_Standard", standardDockerFileTmpl, dTd); err != nil {
+	if err := renderWriteFile(filepath.Join(buildDir, dockerfile), "tmp/build/Dockerfile", dockerFileTmpl, dTd); err != nil {
 		return err
 	}
 
-	if err := renderWriteFile(filepath.Join(buildDir, "dockerfiles", testingDockerfile), "tmp/build/dockerfiles/Dockerfile_Testing", testingDockerFileTmpl, dTd); err != nil {
+	if err := renderWriteFile(filepath.Join(buildDir, "test-framework", testingDockerfile), "tmp/build/test-framework/Dockerfile", testingDockerFileTmpl, dTd); err != nil {
 		return err
 	}
 
@@ -495,7 +495,7 @@ func (g *Generator) generateDirStructure() error {
 		filepath.Join(g.projectName, olmCatalogDir),
 		filepath.Join(g.projectName, buildDir),
 		filepath.Join(g.projectName, codegenDir),
-		filepath.Join(g.projectName, dockerDir),
+		filepath.Join(g.projectName, dockerTestDir),
 		filepath.Join(g.projectName, versionDir),
 		filepath.Join(g.projectName, apisDir, apiDirName(g.apiVersion), version(g.apiVersion)),
 		filepath.Join(g.projectName, stubDir),

pkg/generator/templates.go

@@ -616,28 +616,20 @@ const goTestScript = `#!/bin/sh
 memcached-operator-test -test.parallel=1 -test.failfast -root=/ -kubeconfig=incluster -namespacedMan=namespaced.yaml -test.v
 `
 
-const standardDockerFileTmpl = `FROM alpine:3.6
+const dockerFileTmpl = `FROM alpine:3.6
 
 RUN adduser -D {{.ProjectName}}
 USER {{.ProjectName}}
 
 ADD tmp/_output/bin/{{.ProjectName}} /usr/local/bin/{{.ProjectName}}
-
-# just keep this to ignore warnings
-ARG NAMESPACEDMAN
 `
 
-const testingDockerFileTmpl = `FROM alpine:3.6
+const testingDockerFileTmpl = `ARG BASEIMAGE
 
-RUN adduser -D {{.ProjectName}}
-USER {{.ProjectName}}
+FROM ${BASEIMAGE}
 
-ADD tmp/_output/bin/{{.ProjectName}} /usr/local/bin/{{.ProjectName}}
-
-# just keep this to ignore warnings
+ADD tmp/_output/bin/memcached-operator-test /usr/local/bin/memcached-operator-test
 ARG NAMESPACEDMAN
-
-ADD tmp/_output/bin/{{.ProjectName}}-test /usr/local/bin/{{.ProjectName}}-test
 ADD $NAMESPACEDMAN /namespaced.yaml
 ADD tmp/build/go-test.sh /go-test.sh
 `