diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-25 11:16:45 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-25 11:16:45 -0700 |
commit | e900e95f9aa6a22eeef9f78573dfb88df2f10d49 (patch) | |
tree | ea8137507f196ad7bdd3a080e4b4e769ce6ecae7 /pkg/adapter | |
parent | 36f479097d6617bd4a078144a8709c19f865eb8f (diff) | |
parent | 4daac4736e3476211de7c1672bb5161191666a91 (diff) | |
download | podman-e900e95f9aa6a22eeef9f78573dfb88df2f10d49.tar.gz podman-e900e95f9aa6a22eeef9f78573dfb88df2f10d49.tar.bz2 podman-e900e95f9aa6a22eeef9f78573dfb88df2f10d49.zip |
Merge pull request #2990 from nalind/image-parent-child
image: rework parent/child/history matching
Diffstat (limited to 'pkg/adapter')
-rw-r--r-- | pkg/adapter/runtime.go | 4 | ||||
-rw-r--r-- | pkg/adapter/runtime_remote.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/adapter/runtime.go b/pkg/adapter/runtime.go index 753f7c944..ca9678265 100644 --- a/pkg/adapter/runtime.go +++ b/pkg/adapter/runtime.go @@ -119,8 +119,8 @@ func (r *LocalRuntime) RemoveImage(ctx context.Context, img *ContainerImage, for } // PruneImages is wrapper into PruneImages within the image pkg -func (r *LocalRuntime) PruneImages(all bool) ([]string, error) { - return r.ImageRuntime().PruneImages(all) +func (r *LocalRuntime) PruneImages(ctx context.Context, all bool) ([]string, error) { + return r.ImageRuntime().PruneImages(ctx, all) } // Export is a wrapper to container export to a tarfile diff --git a/pkg/adapter/runtime_remote.go b/pkg/adapter/runtime_remote.go index dcb0924ce..29ee821e0 100644 --- a/pkg/adapter/runtime_remote.go +++ b/pkg/adapter/runtime_remote.go @@ -256,7 +256,7 @@ func (r *LocalRuntime) New(ctx context.Context, name, signaturePolicyPath, authf // IsParent goes through the layers in the store and checks if i.TopLayer is // the parent of any other layer in store. Double check that image with that // layer exists as well. -func (ci *ContainerImage) IsParent() (bool, error) { +func (ci *ContainerImage) IsParent(context.Context) (bool, error) { return ci.remoteImage.isParent, nil } @@ -338,7 +338,7 @@ func (ci *ContainerImage) History(ctx context.Context) ([]*image.History, error) } // PruneImages is the wrapper call for a remote-client to prune images -func (r *LocalRuntime) PruneImages(all bool) ([]string, error) { +func (r *LocalRuntime) PruneImages(ctx context.Context, all bool) ([]string, error) { return iopodman.ImagesPrune().Call(r.Conn, all) } |