From 9fcc475d033d7f1718e9490e8944de7f31a2bbab Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 15 May 2018 17:29:09 -0400 Subject: Support pulling Dockerfile from http Currently podman build http://remote.com/Dockerfile does not work. podman always treats this file as an Archive. Vendoring in the latest buildah code fixes this issue. Also updated the man pages to better explain the syntax. Signed-off-by: Daniel J Walsh Closes: #775 Approved by: TomSweeneyRedHat --- vendor/github.com/projectatomic/buildah/pkg/parse/parse.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vendor/github.com/projectatomic/buildah/pkg/parse') diff --git a/vendor/github.com/projectatomic/buildah/pkg/parse/parse.go b/vendor/github.com/projectatomic/buildah/pkg/parse/parse.go index 505601f25..6512aad52 100644 --- a/vendor/github.com/projectatomic/buildah/pkg/parse/parse.go +++ b/vendor/github.com/projectatomic/buildah/pkg/parse/parse.go @@ -180,9 +180,9 @@ func validateVolumeOpts(option string) error { return errors.Errorf("invalid options %q, can only specify 1 'z' or 'Z' option", option) } foundLabelChange++ - case "private", "rprivate", "shared", "rshared", "slave", "rslave": + case "private", "rprivate", "shared", "rshared", "slave", "rslave", "unbindable", "runbindable": if foundRootPropagation > 1 { - return errors.Errorf("invalid options %q, can only specify 1 '[r]shared', '[r]private' or '[r]slave' option", option) + return errors.Errorf("invalid options %q, can only specify 1 '[r]shared', '[r]private', '[r]slave' or '[r]unbindable' option", option) } foundRootPropagation++ default: -- cgit v1.2.3-54-g00ecf