diff options
| author | baude <bbaude@redhat.com> | 2018-06-27 08:55:20 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-27 15:16:02 +0000 |
| commit | e1b47c15076680d318aa6fd0cb650ad89b471022 (patch) | |
| tree | 4bf24b82c99533645484ce4ea57f75914f73c053 /vendor/github.com/projectatomic/buildah/import.go | |
| parent | f6c0fc1aa854ae5ce73d57ecb09d47c0d4dd2cc3 (diff) | |
| download | podman-e1b47c15076680d318aa6fd0cb650ad89b471022.tar.gz podman-e1b47c15076680d318aa6fd0cb650ad89b471022.tar.bz2 podman-e1b47c15076680d318aa6fd0cb650ad89b471022.zip | |
Vendor in latest buildah
Signed-off-by: baude <bbaude@redhat.com>
Closes: #1007
Approved by: baude
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/import.go')
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/import.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/vendor/github.com/projectatomic/buildah/import.go b/vendor/github.com/projectatomic/buildah/import.go index b7ed3730f..31288334a 100644 --- a/vendor/github.com/projectatomic/buildah/import.go +++ b/vendor/github.com/projectatomic/buildah/import.go @@ -43,6 +43,11 @@ func importBuilderDataFromImage(ctx context.Context, store storage.Store, system } } + defaultNamespaceOptions, err := DefaultNamespaceOptions() + if err != nil { + return nil, err + } + builder := &Builder{ store: store, Type: containerType, @@ -52,7 +57,7 @@ func importBuilderDataFromImage(ctx context.Context, store storage.Store, system ContainerID: containerID, ImageAnnotations: map[string]string{}, ImageCreatedBy: "", - NamespaceOptions: DefaultNamespaceOptions(), + NamespaceOptions: defaultNamespaceOptions, IDMappingOptions: IDMappingOptions{ HostUIDMapping: len(uidmap) == 0, HostGIDMapping: len(uidmap) == 0, |