github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(stack/remote): pass forceRecreate setting [EE-7374] (#12051)

pull/12080/head
Oscar Zhou 2024-08-06 09:02:21 +12:00 committed by GitHub
parent b67ff87f35
commit cc7f14951c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/stacks/deployments/compose_unpacker_cmd_builder.go
View File

@ -31,6 +31,7 @@ const (
type unpackerCmdBuilderOptions struct { type unpackerCmdBuilderOptions struct {
pullImage bool pullImage bool
prune bool prune bool
forceRecreate bool
composeDestination string composeDestination string
registries []portainer.Registry registries []portainer.Registry
} }
@ -61,11 +62,12 @@ func (d *stackDeployer) buildUnpackerCmdForStack(stack *portainer.Stack, operati
return fn(stack, opts, registriesStrings, envStrings), nil return fn(stack, opts, registriesStrings, envStrings), nil
} }
// deploy [-u username -p password] [--skip-tls-verify] [--env KEY1=VALUE1 --env KEY2=VALUE2] <git-repo-url> <ref> <project-name> <destination> <compose-file-path> [<more-file-paths>...] // deploy [-u username -p password] [--skip-tls-verify] [--force-recreate] [-k] [--env KEY1=VALUE1 --env KEY2=VALUE2] <git-repo-url> <ref> <project-name> <destination> <compose-file-path> [<more-file-paths>...]
func buildDeployCmd(stack *portainer.Stack, opts unpackerCmdBuilderOptions, registries []string, env []string) []string { func buildDeployCmd(stack *portainer.Stack, opts unpackerCmdBuilderOptions, registries []string, env []string) []string {
cmd := []string{UnpackerCmdDeploy} cmd := []string{UnpackerCmdDeploy}
cmd = appendGitAuthIfNeeded(cmd, stack) cmd = appendGitAuthIfNeeded(cmd, stack)
cmd = appendSkipTLSVerifyIfNeeded(cmd, stack) cmd = appendSkipTLSVerifyIfNeeded(cmd, stack)
cmd = appendForceRecreateIfNeeded(cmd, opts.forceRecreate)
cmd = append(cmd, env...) cmd = append(cmd, env...)
cmd = append(cmd, registries...) cmd = append(cmd, registries...)
cmd = append(cmd, cmd = append(cmd,
@ -125,12 +127,12 @@ func buildComposeStopCmd(stack *portainer.Stack, opts unpackerCmdBuilderOptions,
return append(cmd, stack.AdditionalFiles...) return append(cmd, stack.AdditionalFiles...)
} }
// swarm-deploy [-u username -p password] [--skip-tls-verify] [-f] [-r] [--env KEY1=VALUE1 --env KEY2=VALUE2] <git-repo-url> <git-ref> <project-name> <destination> <compose-file-path> [<more-file-paths>...] // swarm-deploy [-u username -p password] [--skip-tls-verify] [--force-recreate] [-f] [-r] [-k] [--env KEY1=VALUE1 --env KEY2=VALUE2] <git-repo-url> <git-ref> <project-name> <destination> <compose-file-path> [<more-file-paths>...]
func buildSwarmDeployCmd(stack *portainer.Stack, opts unpackerCmdBuilderOptions, registries []string, env []string) []string { func buildSwarmDeployCmd(stack *portainer.Stack, opts unpackerCmdBuilderOptions, registries []string, env []string) []string {
cmd := []string{UnpackerCmdSwarmDeploy} cmd := []string{UnpackerCmdSwarmDeploy}
cmd = appendGitAuthIfNeeded(cmd, stack) cmd = appendGitAuthIfNeeded(cmd, stack)
cmd = appendSkipTLSVerifyIfNeeded(cmd, stack) cmd = appendSkipTLSVerifyIfNeeded(cmd, stack)
cmd = appendForceRecreateIfNeeded(cmd, opts.forceRecreate)
if opts.pullImage { if opts.pullImage {
cmd = append(cmd, "-f") cmd = append(cmd, "-f")
} }
@ -193,6 +195,13 @@ func appendSkipTLSVerifyIfNeeded(cmd []string, stack *portainer.Stack) []string
return append(cmd, "--skip-tls-verify") return append(cmd, "--skip-tls-verify")
} }
func appendForceRecreateIfNeeded(cmd []string, forceRecreate bool) []string {
if forceRecreate {
cmd = append(cmd, "--force-recreate")
}
return cmd
}
func generateRegistriesStrings(registries []portainer.Registry, dataStore dataservices.DataStore) []string { func generateRegistriesStrings(registries []portainer.Registry, dataStore dataservices.DataStore) []string {
cmds := []string{} cmds := []string{}

11
api/stacks/deployments/deployer_remote.go
View File

@ -70,7 +70,8 @@ func (d *stackDeployer) DeployRemoteComposeStack(
endpoint, endpoint,
OperationDeploy, OperationDeploy,
unpackerCmdBuilderOptions{ unpackerCmdBuilderOptions{
registries: registries, forceRecreate: forceRecreate,
registries: registries,
}, },
) )
} }
@ -119,10 +120,10 @@ func (d *stackDeployer) DeployRemoteSwarmStack(
defer d.swarmStackManager.Logout(endpoint) defer d.swarmStackManager.Logout(endpoint)
return d.remoteStack(stack, endpoint, OperationSwarmDeploy, unpackerCmdBuilderOptions{ return d.remoteStack(stack, endpoint, OperationSwarmDeploy, unpackerCmdBuilderOptions{
pullImage: pullImage,
pullImage: pullImage, prune: prune,
prune: prune, forceRecreate: stack.AutoUpdate != nil && stack.AutoUpdate.ForceUpdate,
registries: registries, registries: registries,
}) })
} }