Merge pull request #278 from covexo/reset-removes-deockerignore

Reset removes .dockerignore

Author: FabianKramm

cmd/reset.go

@@ -27,6 +27,7 @@ type ResetCmd struct {
 // ResetCmdFlags holds the command flags
 type ResetCmdFlags struct {
 	deleteDockerfile         bool
+	deleteDockerignore       bool
 	deleteChart              bool
 	deleteRegistry           bool
 	deleteTiller             bool
@@ -150,6 +151,20 @@ func (cmd *ResetCmd) Run(cobraCmd *cobra.Command, args []string) {
 		}
 	}
 
+	if cmd.flags.deleteDockerignore {
+		err = cmd.deleteDockerignore()
+
+		if err != nil {
+			log.Failf("Error deleting .dockerignore: %s", err.Error())
+
+			if cmd.shouldContinue() == false {
+				return
+			}
+		} else {
+			log.Done("Successfully deleted .dockerignore")
+		}
+	}
+
 	if cmd.flags.deleteDevspaceFolder {
 		err = cmd.deleteDevspaceFolder()
 
@@ -194,6 +209,12 @@ func (cmd *ResetCmd) determineResetExtent() {
 		ValidationRegexPattern: "^(y|n)$",
 	}) == "y"
 
+	cmd.flags.deleteDockerignore = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
+		Question:               "Should the .dockerignore be removed? (y/n)",
+		DefaultValue:           "y",
+		ValidationRegexPattern: "^(y|n)$",
+	}) == "y"
+
 	cmd.flags.deleteChart = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
 		Question:               "Should the Chart (chart/*) be removed? (y/n)",
 		DefaultValue:           "y",
@@ -291,6 +312,10 @@ func (cmd *ResetCmd) deleteDockerfile() error {
 	return os.Remove(path.Join(cmd.workdir, "Dockerfile"))
 }
 
+func (cmd *ResetCmd) deleteDockerignore() error {
+	return os.Remove(path.Join(cmd.workdir, ".dockerignore"))
+}
+
 func (cmd *ResetCmd) deleteChart() error {
 	return os.RemoveAll(path.Join(cmd.workdir, "chart"))
 }

pkg/util/log/stdout_logger.go

@@ -91,7 +91,7 @@ func (s *stdoutLogger) writeMessage(fnType logFunctionType, message string) {
 
 		fnInformation.stream.Write([]byte(message))
 
-		if s.loadingText != nil {
+		if s.loadingText != nil && fnType != fatalFn {
 			s.loadingText.Start()
 		}
 	}