diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-07-08 07:59:35 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-07-09 14:02:06 +0000 |
| commit | c7424b69911222c2dc92a41308685f1e6d36fb53 (patch) | |
| tree | dd3b5a75198a72653973566dcf15ad0b55f367d4 /vendor/github.com/projectatomic/buildah/pull.go | |
| parent | f661e1d21d5f22d889842642dbd612ead54a7612 (diff) | |
| download | podman-c7424b69911222c2dc92a41308685f1e6d36fb53.tar.gz podman-c7424b69911222c2dc92a41308685f1e6d36fb53.tar.bz2 podman-c7424b69911222c2dc92a41308685f1e6d36fb53.zip | |
Vendor in latest buildah to add masks for /proc/keys and /proc/acpi
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1062
Approved by: baude
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/pull.go')
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/pull.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vendor/github.com/projectatomic/buildah/pull.go b/vendor/github.com/projectatomic/buildah/pull.go index e1310f7ce..e9ce03f02 100644 --- a/vendor/github.com/projectatomic/buildah/pull.go +++ b/vendor/github.com/projectatomic/buildah/pull.go @@ -167,14 +167,14 @@ func pullImage(ctx context.Context, store storage.Store, imageName string, optio }() logrus.Debugf("copying %q to %q", spec, destName) - err = cp.Image(ctx, policyContext, destRef, srcRef, getCopyOptions(options.ReportWriter, options.SystemContext, nil, "")) + err = cp.Image(ctx, policyContext, destRef, srcRef, getCopyOptions(options.ReportWriter, sc, nil, "")) if err == nil { return destRef, nil } // If no image was found, we should handle. Lets be nicer to the user and see if we can figure out why. - registryPath := sysregistries.RegistriesConfPath(&types.SystemContext{}) - searchRegistries, err := getRegistries() + registryPath := sysregistries.RegistriesConfPath(sc) + searchRegistries, err := getRegistries(sc) if err != nil { return nil, err } |