Merge pull request #22 from portainer/fix/EE-2574/redeploy-notwork-stack

sunportainer · web-flow · commit 3c7408969ad3 · 2022-04-07T09:10:10.000+08:00
fix(stack) redeploy-not-work-arm EE-2574
diff --git a/compose/internal/composeplugin/composeplugin.go b/compose/internal/composeplugin/composeplugin.go
@@ -163,12 +163,15 @@ func newCommand(command []string, filePaths []string) composeCommand {
 	}
 }
 
-//TO-DO: double check docker compose plugin logic
-//to see if it is necessary to implement forceRereate arg here
 func newUpCommand(filePaths []string, forceRereate bool) composeCommand {
-	return newCommand([]string{"up", "-d"}, filePaths)
+	args := []string{"up", "-d"}
+	if forceRereate {
+		args = append(args, "--force-recreate")
+	}
+	return newCommand(args, filePaths)
 }
 
+
 func newDownCommand(filePaths []string) composeCommand {
 	return newCommand([]string{"down", "--remove-orphans"}, filePaths)
 }

Original file line number	Diff line number	Diff line change
`@@ -163,12 +163,15 @@ func newCommand(command []string, filePaths []string) composeCommand {`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`
`166`		`-//TO-DO: double check docker compose plugin logic`
`167`		`-//to see if it is necessary to implement forceRereate arg here`
`168`	`166`	`func newUpCommand(filePaths []string, forceRereate bool) composeCommand {`
`169`		`- return newCommand([]string{"up", "-d"}, filePaths)`
	`167`	`+ args := []string{"up", "-d"}`
	`168`	`+ if forceRereate {`
	`169`	`+ args = append(args, "--force-recreate")`
	`170`	`+ }`
	`171`	`+ return newCommand(args, filePaths)`
`170`	`172`	`}`
`171`	`173`
	`174`	`+`
`172`	`175`	`func newDownCommand(filePaths []string) composeCommand {`
`173`	`176`	`return newCommand([]string{"down", "--remove-orphans"}, filePaths)`
`174`	`177`	`}`