Skip to content

Commit aceb00c

Browse files
author
Florian
committed
Added optional deletion of .dockerignore to reset
1 parent f7aa2d3 commit aceb00c

1 file changed

Lines changed: 25 additions & 0 deletions

File tree

cmd/reset.go

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ type ResetCmd struct {
2727
// ResetCmdFlags holds the command flags
2828
type ResetCmdFlags struct {
2929
deleteDockerfile bool
30+
deleteDockerignore bool
3031
deleteChart bool
3132
deleteRegistry bool
3233
deleteTiller bool
@@ -150,6 +151,20 @@ func (cmd *ResetCmd) Run(cobraCmd *cobra.Command, args []string) {
150151
}
151152
}
152153

154+
if cmd.flags.deleteDockerignore {
155+
err = cmd.deleteDockerignore()
156+
157+
if err != nil {
158+
log.Failf("Error deleting .dockerignore: %s", err.Error())
159+
160+
if cmd.shouldContinue() == false {
161+
return
162+
}
163+
} else {
164+
log.Done("Successfully deleted .dockerignore")
165+
}
166+
}
167+
153168
if cmd.flags.deleteDevspaceFolder {
154169
err = cmd.deleteDevspaceFolder()
155170

@@ -194,6 +209,12 @@ func (cmd *ResetCmd) determineResetExtent() {
194209
ValidationRegexPattern: "^(y|n)$",
195210
}) == "y"
196211

212+
cmd.flags.deleteDockerignore = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
213+
Question: "Should the .dockerignore be removed? (y/n)",
214+
DefaultValue: "y",
215+
ValidationRegexPattern: "^(y|n)$",
216+
}) == "y"
217+
197218
cmd.flags.deleteChart = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
198219
Question: "Should the Chart (chart/*) be removed? (y/n)",
199220
DefaultValue: "y",
@@ -293,6 +314,10 @@ func (cmd *ResetCmd) deleteDockerfile() error {
293314
return os.Remove(path.Join(cmd.workdir, "Dockerfile"))
294315
}
295316

317+
func (cmd *ResetCmd) deleteDockerignore() error {
318+
return os.Remove(path.Join(cmd.workdir, ".dockerignore"))
319+
}
320+
296321
func (cmd *ResetCmd) deleteChart() error {
297322
return os.RemoveAll(path.Join(cmd.workdir, "chart"))
298323
}

0 commit comments

Comments
 (0)