diff options
| author | umohnani8 <umohnani@redhat.com> | 2018-04-18 16:48:35 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-04-19 14:08:47 +0000 |
| commit | 27107fdac1d75f97caab47cd13efb1d9900cf350 (patch) | |
| tree | f5edafbb52505829b15e19ea6a9e66f4440e862b /test/copyimg | |
| parent | 6a9dbf3305e93e5e1c3bff09402a9b801c935fbd (diff) | |
| download | podman-27107fdac1d75f97caab47cd13efb1d9900cf350.tar.gz podman-27107fdac1d75f97caab47cd13efb1d9900cf350.tar.bz2 podman-27107fdac1d75f97caab47cd13efb1d9900cf350.zip | |
Vendor in latest containers/image and contaners/storage
Made necessary changes to functions to include contex.Context wherever needed
Signed-off-by: umohnani8 <umohnani@redhat.com>
Closes: #640
Approved by: baude
Diffstat (limited to 'test/copyimg')
| -rw-r--r-- | test/copyimg/copyimg.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/copyimg/copyimg.go b/test/copyimg/copyimg.go index f83f92766..26100beea 100644 --- a/test/copyimg/copyimg.go +++ b/test/copyimg/copyimg.go @@ -1,6 +1,7 @@ package main import ( + "context" "os" "github.com/containers/image/copy" @@ -156,9 +157,10 @@ func main() { } } + ctx := context.TODO() if imageName != "" { if importFrom != "" { - err = copy.Image(policyContext, ref, importRef, options) + err = copy.Image(ctx, policyContext, ref, importRef, options) if err != nil { logrus.Errorf("error importing %s: %v", importFrom, err) os.Exit(1) @@ -178,7 +180,7 @@ func main() { } } if exportTo != "" { - err = copy.Image(policyContext, exportRef, ref, options) + err = copy.Image(ctx, policyContext, exportRef, ref, options) if err != nil { logrus.Errorf("error exporting %s: %v", exportTo, err) os.Exit(1) @@ -186,7 +188,7 @@ func main() { } } else { if importFrom != "" && exportTo != "" { - err = copy.Image(policyContext, exportRef, importRef, options) + err = copy.Image(ctx, policyContext, exportRef, importRef, options) if err != nil { logrus.Errorf("error copying %s to %s: %v", importFrom, exportTo, err) os.Exit(1) |