From 0f1ded2ac8b1f4ddf9a5e1ffd7f087faf0d19025 Mon Sep 17 00:00:00 2001 From: Marco Vedovati Date: Wed, 7 Aug 2019 12:13:11 +0200 Subject: [PATCH] ostree: use both image and & storage buildtags 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 --- cmd/skopeo/main.go | 2 +- hack/ostree_tag.sh | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cmd/skopeo/main.go b/cmd/skopeo/main.go index 69ac7a04..9bc0bb01 100644 --- a/cmd/skopeo/main.go +++ b/cmd/skopeo/main.go @@ -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 diff --git a/hack/ostree_tag.sh b/hack/ostree_tag.sh index ac6bec61..491cec71 100755 --- a/hack/ostree_tag.sh +++ b/hack/ostree_tag.sh @@ -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