diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-07 14:25:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-07 14:25:52 -0500 |
| commit | b7c00f2cc03499d5d385a7aa7e8cd35d0ab994d7 (patch) | |
| tree | 34c26d2853a0f231cb93d0b451326f894ae986d0 /pkg/domain | |
| parent | 4174b06a4b45b94cdd35a1f4b4d142266cd9cb78 (diff) | |
| parent | 9fc29f63e0dedea0dbe03e5baf012b6bf5ab51b9 (diff) | |
| download | podman-b7c00f2cc03499d5d385a7aa7e8cd35d0ab994d7.tar.gz podman-b7c00f2cc03499d5d385a7aa7e8cd35d0ab994d7.tar.bz2 podman-b7c00f2cc03499d5d385a7aa7e8cd35d0ab994d7.zip | |
Merge pull request #9647 from mlegenovic/master
Compat API: Fix the response of 'push image' endpoint
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/entities/images.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/images.go | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index 19109f873..7999d8209 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -203,6 +203,8 @@ type ImagePushOptions struct { SignBy string // SkipTLSVerify to skip HTTPS and certificate verification. SkipTLSVerify types.OptionalBool + // Progress to get progress notifications + Progress chan types.ProgressProperties } // ImageSearchOptions are the arguments for searching images. diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index ffd4856fe..b1751b8b6 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -376,7 +376,8 @@ func (ir *ImageEngine) Push(ctx context.Context, source string, destination stri options.Compress, signOptions, &dockerRegistryOptions, - nil) + nil, + options.Progress) if err != nil && errors.Cause(err) != storage.ErrImageUnknown { // Image might be a manifest list so attempt a manifest push if _, manifestErr := ir.ManifestPush(ctx, source, destination, options); manifestErr == nil { |