Commit c7e7407

authored

fix: Fix the issue where updating the image in the Compose file during upgrade has no effect (1Panel-dev#9772)

1 parent cab42b3 commit c7e7407Copy full SHA for c7e7407

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -650,7 +650,11 @@ func upgradeInstall(req request.AppInstallUpgrade) error {`
`650`	`650`	`}`
`651`	`651`	`dockerCLi, _ := docker.NewClient()`
`652`	`652`	`if req.PullImage {`
`653`		`- images, err := composeV2.GetDockerComposeImagesV2(content, []byte(detail.DockerCompose))`
	`653`	`+ composeContent := []byte(detail.DockerCompose)`
	`654`	`+ if req.DockerCompose != "" {`
	`655`	`+ composeContent = []byte(req.DockerCompose)`
	`656`	`+ }`
	`657`	`+ images, err := composeV2.GetDockerComposeImagesV2(content, composeContent)`
`654`	`658`	`if err != nil {`
`655`	`659`	`return err`
`656`	`660`	`}`

Comments

(0)