diff options
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/pkg')
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/pkg/cli/common.go | 18 | ||||
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/pkg/parse/parse.go | 4 |
2 files changed, 17 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 ea9114688..eeabc3ee7 100644 --- a/vendor/github.com/projectatomic/buildah/pkg/cli/common.go +++ b/vendor/github.com/projectatomic/buildah/pkg/cli/common.go @@ -20,6 +20,10 @@ var ( 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: "", Usage: "use certificates at the specified path to access the registry", @@ -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{ 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: |