summaryrefslogtreecommitdiff
path: root/vendor/github.com/projectatomic/buildah/pkg/cli
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-06-07 01:00:07 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-06-07 17:14:02 +0000
commitcf7c8295b8875ddd4fe87a4207aa302efbd90b18 (patch)
treef9358349d4574e469b72db2208a57c0f5160da91 /vendor/github.com/projectatomic/buildah/pkg/cli
parent7d6e717dd9f8fe367b64839089db859ca6bd8a83 (diff)
downloadpodman-cf7c8295b8875ddd4fe87a4207aa302efbd90b18.tar.gz
podman-cf7c8295b8875ddd4fe87a4207aa302efbd90b18.tar.bz2
podman-cf7c8295b8875ddd4fe87a4207aa302efbd90b18.zip
Vendor in latest buildah code
Use the parsing code to properly setup podman build namespaces Fixes support for network namespace and user namespace Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #917 Approved by: rhatdan
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/pkg/cli')
-rw-r--r--vendor/github.com/projectatomic/buildah/pkg/cli/common.go18
1 files changed, 13 insertions, 5 deletions
diff --git a/vendor/github.com/projectatomic/buildah/pkg/cli/common.go b/vendor/github.com/projectatomic/buildah/pkg/cli/common.go
index a7b61d561..e545e97d3 100644
--- a/vendor/github.com/projectatomic/buildah/pkg/cli/common.go
+++ b/vendor/github.com/projectatomic/buildah/pkg/cli/common.go
@@ -79,7 +79,7 @@ var (
},
cli.StringFlag{
Name: "cache-from",
- Usage: "Images to utilise as potential cache sources. Buildah does not currently support caching so this is a NOOP.",
+ Usage: "Images to utilise as potential cache sources. The build process does not currently support caching so this is a NOOP.",
},
cli.StringFlag{
Name: "cert-dir",
@@ -95,13 +95,17 @@ var (
Value: "",
Usage: "use `[username[:password]]` for accessing the registry",
},
+ cli.BoolFlag{
+ Name: "disable-content-trust",
+ Usage: "This is a Docker specific option and is a NOOP",
+ },
cli.StringSliceFlag{
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.",
+ Usage: "Always remove intermediate containers after a build. The build process does not currently support caching so this is a NOOP.",
},
cli.StringFlag{
Name: "format",
@@ -117,7 +121,11 @@ var (
},
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.",
+ Usage: "Do not use caching for the container build. The build process does not currently support caching so this is a NOOP.",
+ },
+ cli.StringFlag{
+ Name: "logfile",
+ Usage: "log to `file` instead of stdout/stderr",
},
cli.BoolTFlag{
Name: "pull",
@@ -133,7 +141,7 @@ var (
},
cli.BoolFlag{
Name: "rm",
- Usage: "Remove intermediate containers after a successful build. Buildah does not currently support caching so this is a NOOP.",
+ Usage: "Remove intermediate containers after a successful build. The build process does not currently support caching so this is a NOOP.",
},
cli.StringFlag{
Name: "runtime",
@@ -150,7 +158,7 @@ var (
},
cli.BoolFlag{
Name: "squash",
- Usage: "Squash newly built layers into a single new layer. Buildah does not currently support caching so this is a NOOP.",
+ Usage: "Squash newly built layers into a single new layer. The build process does not currently support caching so this is a NOOP.",
},
cli.BoolTFlag{
Name: "stream",