diff options
author | baude <bbaude@redhat.com> | 2018-04-25 13:26:52 -0500 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-04-27 20:51:07 +0000 |
commit | a824186ac9803ef5f7548df790988a4ebd2d9c07 (patch) | |
tree | 63c64e9be4d9c44bd160dd974b740231497eabcd /libpod/buildah/common.go | |
parent | 4e468ce83d69e9748e80eb98a6f5bd3c5114cc7d (diff) | |
download | podman-a824186ac9803ef5f7548df790988a4ebd2d9c07.tar.gz podman-a824186ac9803ef5f7548df790988a4ebd2d9c07.tar.bz2 podman-a824186ac9803ef5f7548df790988a4ebd2d9c07.zip |
Use buildah commit and bud in podman
Vendor in buildah and use as much of commit and bug as possible for podman
build and commit.
Resolves #586
Signed-off-by: baude <bbaude@redhat.com>
Closes: #681
Approved by: mheon
Diffstat (limited to 'libpod/buildah/common.go')
-rw-r--r-- | libpod/buildah/common.go | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/libpod/buildah/common.go b/libpod/buildah/common.go deleted file mode 100644 index 18c960003..000000000 --- a/libpod/buildah/common.go +++ /dev/null @@ -1,28 +0,0 @@ -package buildah - -import ( - "io" - - cp "github.com/containers/image/copy" - "github.com/containers/image/types" -) - -func getCopyOptions(reportWriter io.Writer, sourceSystemContext *types.SystemContext, destinationSystemContext *types.SystemContext, manifestType string) *cp.Options { - return &cp.Options{ - ReportWriter: reportWriter, - SourceCtx: sourceSystemContext, - DestinationCtx: destinationSystemContext, - ForceManifestMIMEType: manifestType, - } -} - -func getSystemContext(defaults *types.SystemContext, signaturePolicyPath string) *types.SystemContext { - sc := &types.SystemContext{} - if defaults != nil { - *sc = *defaults - } - if signaturePolicyPath != "" { - sc.SignaturePolicyPath = signaturePolicyPath - } - return sc -} |