github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-09-18 07:54:32 +00:00
Code Issues Projects Releases Wiki Activity

ostree: use both image and & storage buildtags

Browse Source 
The PR #700 replaced ostree buildtag with containers_image_ostree.
However specifying the ostree buildtag is needed by containers/storage
vfs driver.

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
This commit is contained in:
Marco Vedovati
2019-08-07 12:13:11 +02:00
parent 44bc4a9eb7
commit 0f1ded2ac8
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/skopeo/main.go
View File

@@ -22,7 +22,7 @@ type globalOptions struct {
tlsVerify optionalBool // Require HTTPS and verify certificates (for docker: and docker-daemon:)
policyPath string // Path to a signature verification policy file
insecurePolicy bool // Use an "allow everything" signature verification policy
registriesDirPath string // Path to a "registries.d" registry configuratio directory
registriesDirPath string // Path to a "registries.d" registry configuration directory
overrideArch string // Architecture to use for choosing images, instead of the runtime one
overrideOS string // OS to use for choosing images, instead of the runtime one
commandTimeout time.Duration // Timeout for the command execution

11
hack/ostree_tag.sh
View File

@@ -1,4 +1,11 @@
#!/bin/bash
if pkg-config ostree-1 2> /dev/null ; then
echo containers_image_ostree
if test $(${GO:-go} env GOOS) != "linux" ; then
exit 0
fi
if pkg-config ostree-1 &> /dev/null ; then
# ostree: used by containers/storage
# containers_image_ostree: used by containers/image
echo "ostree containers_image_ostree"
fi