opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-31 20:32:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11357 from vrothberg/fix-11171

Browse Source 
auto-update: fix authfile label
This commit is contained in:
OpenShift Merge Robot
2021-08-31 04:16:58 -04:00
committed by GitHub
parent 95ac8f180f de3920c0e9
commit 83de22e892
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/autoupdate/autoupdate.go
View File

@ -224,7 +224,7 @@ func autoUpdateRegistry(ctx context.Context, image *libimage.Image, ctr *libpod.
return report, nil return report, nil
} }
if _, err := updateImage(ctx, runtime, rawImageName, options); err != nil { if _, err := updateImage(ctx, runtime, rawImageName, authfile); err != nil {
return report, errors.Wrapf(err, "registry auto-updating container %q: image update for %q failed", cid, rawImageName) return report, errors.Wrapf(err, "registry auto-updating container %q: image update for %q failed", cid, rawImageName)
} }
updatedRawImages[rawImageName] = true updatedRawImages[rawImageName] = true
@ -417,9 +417,9 @@ func newerLocalImageAvailable(runtime *libpod.Runtime, img *libimage.Image, rawI
} }
// updateImage pulls the specified image. // updateImage pulls the specified image.
func updateImage(ctx context.Context, runtime *libpod.Runtime, name string, options *entities.AutoUpdateOptions) (*libimage.Image, error) { func updateImage(ctx context.Context, runtime *libpod.Runtime, name, authfile string) (*libimage.Image, error) {
pullOptions := &libimage.PullOptions{} pullOptions := &libimage.PullOptions{}
pullOptions.AuthFilePath = options.Authfile pullOptions.AuthFilePath = authfile
pullOptions.Writer = os.Stderr pullOptions.Writer = os.Stderr
pulledImages, err := runtime.LibimageRuntime().Pull(ctx, name, config.PullPolicyAlways, pullOptions) pulledImages, err := runtime.LibimageRuntime().Pull(ctx, name, config.PullPolicyAlways, pullOptions)

3
test/system/255-auto-update.bats
View File

@ -149,6 +149,9 @@ function _confirm_update() {
} }
@test "podman auto-update - label io.containers.autoupdate=image with rollback" { @test "podman auto-update - label io.containers.autoupdate=image with rollback" {
# FIXME: this test should exercise the authfile label to have a regression
# test for #11171.
# Note: the autoupdatebroken image is empty on purpose so it cannot be # Note: the autoupdatebroken image is empty on purpose so it cannot be
# executed and force a rollback. The rollback test for the local policy # executed and force a rollback. The rollback test for the local policy
# is exercising the case where the container doesn't send a ready message. # is exercising the case where the container doesn't send a ready message.