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

fix(relative-path): not deploy git stack via unpacker EE-6043 (#10195)

pull/10197/head
cmeng 2023-08-29 11:49:00 +12:00 committed by GitHub
parent a8c6bd8082
commit 4ca45e89c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/http/handler/stacks/stack_delete.go
View File

@ -190,7 +190,7 @@ func (handler *Handler) deleteStack(userID portainer.UserID, stack *portainer.St
if stack.Type == portainer.DockerSwarmStack { if stack.Type == portainer.DockerSwarmStack {
stack.Name = handler.SwarmStackManager.NormalizeStackName(stack.Name) stack.Name = handler.SwarmStackManager.NormalizeStackName(stack.Name)
if stackutils.IsGitStack(stack) { if stackutils.IsRelativePathStack(stack) {
return handler.StackDeployer.UndeployRemoteSwarmStack(stack, endpoint) return handler.StackDeployer.UndeployRemoteSwarmStack(stack, endpoint)
} }
@ -200,7 +200,7 @@ func (handler *Handler) deleteStack(userID portainer.UserID, stack *portainer.St
if stack.Type == portainer.DockerComposeStack { if stack.Type == portainer.DockerComposeStack {
stack.Name = handler.ComposeStackManager.NormalizeStackName(stack.Name) stack.Name = handler.ComposeStackManager.NormalizeStackName(stack.Name)
if stackutils.IsGitStack(stack) { if stackutils.IsRelativePathStack(stack) {
return handler.StackDeployer.UndeployRemoteComposeStack(stack, endpoint) return handler.StackDeployer.UndeployRemoteComposeStack(stack, endpoint)
} }

4
api/http/handler/stacks/stack_start.go
View File

@ -157,7 +157,7 @@ func (handler *Handler) startStack(
case portainer.DockerComposeStack: case portainer.DockerComposeStack:
stack.Name = handler.ComposeStackManager.NormalizeStackName(stack.Name) stack.Name = handler.ComposeStackManager.NormalizeStackName(stack.Name)
if stackutils.IsGitStack(stack) { if stackutils.IsRelativePathStack(stack) {
return handler.StackDeployer.StartRemoteComposeStack(stack, endpoint, filteredRegistries) return handler.StackDeployer.StartRemoteComposeStack(stack, endpoint, filteredRegistries)
} }
@ -165,7 +165,7 @@ func (handler *Handler) startStack(
case portainer.DockerSwarmStack: case portainer.DockerSwarmStack:
stack.Name = handler.SwarmStackManager.NormalizeStackName(stack.Name) stack.Name = handler.SwarmStackManager.NormalizeStackName(stack.Name)
if stackutils.IsGitStack(stack) { if stackutils.IsRelativePathStack(stack) {
return handler.StackDeployer.StartRemoteSwarmStack(stack, endpoint, filteredRegistries) return handler.StackDeployer.StartRemoteSwarmStack(stack, endpoint, filteredRegistries)
} }

4
api/http/handler/stacks/stack_stop.go
View File

@ -125,7 +125,7 @@ func (handler *Handler) stopStack(stack *portainer.Stack, endpoint *portainer.En
case portainer.DockerComposeStack: case portainer.DockerComposeStack:
stack.Name = handler.ComposeStackManager.NormalizeStackName(stack.Name) stack.Name = handler.ComposeStackManager.NormalizeStackName(stack.Name)
if stackutils.IsGitStack(stack) { if stackutils.IsRelativePathStack(stack) {
return handler.StackDeployer.StopRemoteComposeStack(stack, endpoint) return handler.StackDeployer.StopRemoteComposeStack(stack, endpoint)
} }
@ -133,7 +133,7 @@ func (handler *Handler) stopStack(stack *portainer.Stack, endpoint *portainer.En
case portainer.DockerSwarmStack: case portainer.DockerSwarmStack:
stack.Name = handler.SwarmStackManager.NormalizeStackName(stack.Name) stack.Name = handler.SwarmStackManager.NormalizeStackName(stack.Name)
if stackutils.IsGitStack(stack) { if stackutils.IsRelativePathStack(stack) {
return handler.StackDeployer.StopRemoteSwarmStack(stack, endpoint) return handler.StackDeployer.StopRemoteSwarmStack(stack, endpoint)
} }

4
api/stacks/deployments/deploy.go
View File

@ -85,7 +85,7 @@ func RedeployWhenChanged(stackID portainer.StackID, deployer StackDeployer, data
switch stack.Type { switch stack.Type {
case portainer.DockerComposeStack: case portainer.DockerComposeStack:
if stackutils.IsGitStack(stack) { if stackutils.IsRelativePathStack(stack) {
err = deployer.DeployRemoteComposeStack(stack, endpoint, registries, true, false) err = deployer.DeployRemoteComposeStack(stack, endpoint, registries, true, false)
} else { } else {
err = deployer.DeployComposeStack(stack, endpoint, registries, true, false) err = deployer.DeployComposeStack(stack, endpoint, registries, true, false)
@ -95,7 +95,7 @@ func RedeployWhenChanged(stackID portainer.StackID, deployer StackDeployer, data
return errors.WithMessagef(err, "failed to deploy a docker compose stack %v", stackID) return errors.WithMessagef(err, "failed to deploy a docker compose stack %v", stackID)
} }
case portainer.DockerSwarmStack: case portainer.DockerSwarmStack:
if stackutils.IsGitStack(stack) { if stackutils.IsRelativePathStack(stack) {
err = deployer.DeployRemoteSwarmStack(stack, endpoint, registries, true, true) err = deployer.DeployRemoteSwarmStack(stack, endpoint, registries, true, true)
} else { } else {
err = deployer.DeploySwarmStack(stack, endpoint, registries, true, true) err = deployer.DeploySwarmStack(stack, endpoint, registries, true, true)

2
api/stacks/deployments/deployment_compose_config.go
View File

@ -84,7 +84,7 @@ func (config *ComposeStackDeploymentConfig) Deploy() error {
return err return err
} }
} }
if stackutils.IsGitStack(config.stack) { if stackutils.IsRelativePathStack(config.stack) {
return config.StackDeployer.DeployRemoteComposeStack(config.stack, config.endpoint, config.registries, config.forcePullImage, config.ForceCreate) return config.StackDeployer.DeployRemoteComposeStack(config.stack, config.endpoint, config.registries, config.forcePullImage, config.ForceCreate)
} }

2
api/stacks/deployments/deployment_swarm_config.go
View File

@ -78,7 +78,7 @@ func (config *SwarmStackDeploymentConfig) Deploy() error {
} }
} }
if stackutils.IsGitStack(config.stack) { if stackutils.IsRelativePathStack(config.stack) {
return config.StackDeployer.DeployRemoteSwarmStack(config.stack, config.endpoint, config.registries, config.prune, config.pullImage) return config.StackDeployer.DeployRemoteSwarmStack(config.stack, config.endpoint, config.registries, config.prune, config.pullImage)
} }

7
api/stacks/stackutils/util.go
View File

@ -47,3 +47,10 @@ func SanitizeLabel(value string) string {
func IsGitStack(stack *portainer.Stack) bool { func IsGitStack(stack *portainer.Stack) bool {
return stack.GitConfig != nil && len(stack.GitConfig.URL) != 0 return stack.GitConfig != nil && len(stack.GitConfig.URL) != 0
} }
// IsRelativePathStack checks if the stack is a git stack or not
func IsRelativePathStack(stack *portainer.Stack) bool {
// Always return false in CE
// This function is only for code consistency with EE
return false
}