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 --- .../github.com/projectatomic/buildah/pkg/cli/common.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'vendor/github.com/projectatomic/buildah/pkg/cli') diff --git a/vendor/github.com/projectatomic/buildah/pkg/cli/common.go b/vendor/github.com/projectatomic/buildah/pkg/cli/common.go index ea9114688..eeabc3ee7 100644 --- a/vendor/github.com/projectatomic/buildah/pkg/cli/common.go +++ b/vendor/github.com/projectatomic/buildah/pkg/cli/common.go @@ -19,6 +19,10 @@ var ( Name: "build-arg", Usage: "`argument=value` to supply to the builder", }, + cli.StringFlag{ + Name: "cache-from", + Usage: "Images to utilise as potential cache sources. Buildah does not currently support caching so this is a NOOP.", + }, cli.StringFlag{ Name: "cert-dir", Value: "", @@ -37,6 +41,10 @@ var ( Name: "file, f", Usage: "`pathname or URL` of a Dockerfile", }, + cli.BoolFlag{ + Name: "force-rm", + Usage: "Always remove intermediate containers after a build. Buildah does not currently support caching so this is a NOOP.", + }, cli.StringFlag{ Name: "format", Usage: "`format` of the built image's manifest and metadata", @@ -45,6 +53,10 @@ var ( Name: "iidfile", Usage: "Write the image ID to the file", }, + cli.BoolFlag{ + Name: "no-cache", + Usage: "Do not use caching for the container build. Buildah does not currently support caching so this is a NOOP.", + }, cli.BoolTFlag{ Name: "pull", Usage: "pull the image if not present", @@ -59,7 +71,7 @@ var ( }, cli.BoolFlag{ Name: "rm", - Usage: "Remove intermediate containers after a successful build. Buildah does not currently support cacheing so this is a NOOP.", + Usage: "Remove intermediate containers after a successful build. Buildah does not currently support caching so this is a NOOP.", }, cli.StringFlag{ Name: "runtime", @@ -76,7 +88,7 @@ var ( }, cli.BoolFlag{ Name: "squash", - Usage: "Squash newly built layers into a single new layer. Buildah does not currently support cacheing so this is a NOOP.", + Usage: "Squash newly built layers into a single new layer. Buildah does not currently support caching so this is a NOOP.", }, cli.StringSliceFlag{ Name: "tag, t", @@ -106,7 +118,7 @@ var ( Usage: "limit the CPU CFS (Completely Fair Scheduler) quota", }, cli.Uint64Flag{ - Name: "cpu-shares", + Name: "cpu-shares, c", Usage: "CPU shares (relative weight)", }, cli.StringFlag{ -- cgit v1.2.3-54-g00ecf