diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2018-09-18 15:31:54 -0400 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2018-09-18 17:20:30 -0400 |
commit | 92b28a88d8bcd5aa50352ecaff844229df1cee59 (patch) | |
tree | b340ddc09d29ae2cf29cb83269bcb614d94a6a10 /vendor/github.com/projectatomic/buildah/common.go | |
parent | c3a0874222784e8996dbc472b9ca893a80aff451 (diff) | |
download | podman-92b28a88d8bcd5aa50352ecaff844229df1cee59.tar.gz podman-92b28a88d8bcd5aa50352ecaff844229df1cee59.tar.bz2 podman-92b28a88d8bcd5aa50352ecaff844229df1cee59.zip |
Vendor in latest containers/buildah
Switch from projectatomic/buildah to containers/buildah
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/common.go')
-rw-r--r-- | vendor/github.com/projectatomic/buildah/common.go | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/vendor/github.com/projectatomic/buildah/common.go b/vendor/github.com/projectatomic/buildah/common.go deleted file mode 100644 index dcf922dc9..000000000 --- a/vendor/github.com/projectatomic/buildah/common.go +++ /dev/null @@ -1,35 +0,0 @@ -package buildah - -import ( - "io" - - cp "github.com/containers/image/copy" - "github.com/containers/image/types" -) - -const ( - // OCI used to define the "oci" image format - OCI = "oci" - // DOCKER used to define the "docker" image format - DOCKER = "docker" -) - -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 -} |