mirror of
https://github.com/portainer/portainer.git
synced 2025-07-24 15:59:41 +02:00
fix(version): add specific version for updater image [BE-11153] (#12227)
Some checks failed
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Has been cancelled
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Has been cancelled
ci / build_images (map[arch:arm platform:linux version:]) (push) Has been cancelled
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Has been cancelled
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Has been cancelled
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Has been cancelled
/ triage (push) Has been cancelled
Lint / Run linters (push) Has been cancelled
Test / test-client (push) Has been cancelled
Test / test-server (map[arch:amd64 platform:linux]) (push) Has been cancelled
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Has been cancelled
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Has been cancelled
Test / test-server (map[arch:arm64 platform:linux]) (push) Has been cancelled
ci / build_manifests (push) Has been cancelled
Some checks failed
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Has been cancelled
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Has been cancelled
ci / build_images (map[arch:arm platform:linux version:]) (push) Has been cancelled
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Has been cancelled
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Has been cancelled
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Has been cancelled
/ triage (push) Has been cancelled
Lint / Run linters (push) Has been cancelled
Test / test-client (push) Has been cancelled
Test / test-server (map[arch:amd64 platform:linux]) (push) Has been cancelled
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Has been cancelled
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Has been cancelled
Test / test-server (map[arch:arm64 platform:linux]) (push) Has been cancelled
ci / build_manifests (push) Has been cancelled
This commit is contained in:
parent
cee997e0b3
commit
d3d3d50569
3 changed files with 41 additions and 2 deletions
|
@ -36,10 +36,12 @@ func (service *service) upgradeDocker(environment *portainer.Endpoint, licenseKe
|
|||
return err
|
||||
}
|
||||
|
||||
updaterImage := getUpdaterImage()
|
||||
|
||||
composeFile, err := mustache.RenderFile(templateName, map[string]string{
|
||||
"image": image,
|
||||
"skip_pull_image": skipPullImageEnv,
|
||||
"updater_image": os.Getenv(updaterImageEnvVar),
|
||||
"updater_image": updaterImage,
|
||||
"license": licenseKey,
|
||||
"envType": envType,
|
||||
})
|
||||
|
@ -115,3 +117,11 @@ func (service *service) checkImageForDocker(ctx context.Context, environment *po
|
|||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func getUpdaterImage() string {
|
||||
updaterImage := os.Getenv(updaterImageEnvVar)
|
||||
if updaterImage == "" {
|
||||
updaterImage = "portainer/portainer-updater:" + portainer.APIVersion
|
||||
}
|
||||
return updaterImage
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue