Merge pull request #46 from Optum/dockerfile-patch

update dockerfile logic

Author: mkrouse

cmd/cli/cmd/deploy.go

@@ -78,15 +78,7 @@ var deployCmd = &cobra.Command{
 		buildKit := "DOCKER_BUILDKIT=1"
 		containerTag := viper.GetString("project")
 
-		if Dockerfile != "" {
-			//Dockerfile = Dockerfile
-		} else if viper.GetString("dockerfile") != "" {
-			Dockerfile = viper.GetString("dockerfile")
-		} else {
-			Dockerfile = DockerfileTemplate
-		}
-
-		cmdd := exec.Command("docker", "build", "-t", containerTag, "-f", Dockerfile)
+		cmdd := exec.Command("docker", "build", "-t", containerTag, "-f", getDockerfileForBuild())
 
 		cmdd.Args = append(cmdd.Args, getBuildArguments()...)
 
@@ -236,6 +228,17 @@ func checkInitialized() bool {
 	return InitAction()
 }
 
+func getDockerfileForBuild() string {
+	if Dockerfile != "" {
+		//Dockerfile = Dockerfile
+	} else if viper.GetString("dockerfile") != "" {
+		return viper.GetString("dockerfile")
+	} else {
+		return DefaultDockerfile
+	}
+	return Dockerfile
+}
+
 func getBuildArguments() (args []string) {
 	// check viper configuration if not set
 	if Container == "" && viper.GetString("container") != "" {

cmd/cli/cmd/deploy_test.go

@@ -1,8 +1,10 @@
 package cmd
 
 import (
-	"github.com/stretchr/testify/require"
 	"testing"
+
+	"github.com/spf13/viper"
+	"github.com/stretchr/testify/require"
 )
 
 func TestSanitizeMachinename(t *testing.T) {
@@ -37,3 +39,12 @@ func TestGetBuildArguments_ShouldSetBuildArgContainerOnlyWhenValueExists(t *test
 		require.Equal(t, expected, result)
 	}
 }
+
+func TestGetDockerfileForBuild(t *testing.T) {
+	result := getDockerfileForBuild()
+	require.Equal(t, ".runiac/Dockerfile", result)
+	viper.Set("dockerfile", "mock")
+	result2 := getDockerfileForBuild()
+	require.Equal(t, "mock", result2)
+	viper.Set("dockerfile", "")
+}