From a824186ac9803ef5f7548df790988a4ebd2d9c07 Mon Sep 17 00:00:00 2001 From: baude Date: Wed, 25 Apr 2018 13:26:52 -0500 Subject: 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 Closes: #681 Approved by: mheon --- libpod/buildah/common.go | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 libpod/buildah/common.go (limited to 'libpod/buildah/common.go') 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 -} -- cgit v1.2.3-54-g00ecf