diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-24 06:00:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 06:00:03 -0400 |
| commit | d4e54fa9992d369596bcaf969bea8dbbcb7335ab (patch) | |
| tree | 8f1d53081039b64330060d3e3e16717239206e2c /pkg/api/handlers/libpod/manifests.go | |
| parent | bbd8b64a4247c591738f7ebbac683f48aa7351a5 (diff) | |
| parent | 3bf52aa338b33de719e087e15402081568453284 (diff) | |
| download | podman-d4e54fa9992d369596bcaf969bea8dbbcb7335ab.tar.gz podman-d4e54fa9992d369596bcaf969bea8dbbcb7335ab.tar.bz2 podman-d4e54fa9992d369596bcaf969bea8dbbcb7335ab.zip | |
Merge pull request #15351 from marshall-lee/images-pull-simple
Simplify ImagesPull for when Quiet flag is on
Diffstat (limited to 'pkg/api/handlers/libpod/manifests.go')
| -rw-r--r-- | pkg/api/handlers/libpod/manifests.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/api/handlers/libpod/manifests.go b/pkg/api/handlers/libpod/manifests.go index fa83bbfe1..8391def5c 100644 --- a/pkg/api/handlers/libpod/manifests.go +++ b/pkg/api/handlers/libpod/manifests.go @@ -293,7 +293,7 @@ func ManifestPushV3(w http.ResponseWriter, r *http.Request) { options.SkipTLSVerify = types.NewOptionalBool(!query.TLSVerify) } imageEngine := abi.ImageEngine{Libpod: runtime} - digest, err := imageEngine.ManifestPush(context.Background(), source, query.Destination, options) + digest, err := imageEngine.ManifestPush(r.Context(), source, query.Destination, options) if err != nil { utils.Error(w, http.StatusBadRequest, fmt.Errorf("error pushing image %q: %w", query.Destination, err)) return @@ -367,7 +367,7 @@ func ManifestPush(w http.ResponseWriter, r *http.Request) { // Let's keep thing simple when running in quiet mode and push directly. if query.Quiet { - digest, err := imageEngine.ManifestPush(context.Background(), source, destination, options) + digest, err := imageEngine.ManifestPush(r.Context(), source, destination, options) if err != nil { utils.Error(w, http.StatusBadRequest, fmt.Errorf("error pushing image %q: %w", destination, err)) return |