github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-27 15:18:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #703 from marcov/fix-ostree-buildtags

Browse Source 
ostree: use both image and & storage buildtags
This commit is contained in:
Miloslav Trmač 2019-08-08 18:17:02 +02:00 committed by GitHub
commit ee9e9dfc89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats 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:) tlsVerify optionalBool // Require HTTPS and verify certificates (for docker: and docker-daemon:)
policyPath string // Path to a signature verification policy file policyPath string // Path to a signature verification policy file
insecurePolicy bool // Use an "allow everything" signature verification policy 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 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 overrideOS string // OS to use for choosing images, instead of the runtime one
commandTimeout time.Duration // Timeout for the command execution commandTimeout time.Duration // Timeout for the command execution

11
hack/ostree_tag.sh
View File

@ -1,4 +1,11 @@
#!/bin/bash #!/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 fi