diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-05-23 14:15:54 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-05-23 22:38:17 +0000 |
| commit | 915364034f1ddf036d277830d45c54b8eb39f940 (patch) | |
| tree | 968ec9dfe5a69626a69aef545a5dd429ae695cb1 /vendor/github.com/projectatomic/buildah/pkg | |
| parent | d252fa710e55fde35824dfe1f01e03e783f04a18 (diff) | |
| download | podman-915364034f1ddf036d277830d45c54b8eb39f940.tar.gz podman-915364034f1ddf036d277830d45c54b8eb39f940.tar.bz2 podman-915364034f1ddf036d277830d45c54b8eb39f940.zip | |
Update podman build to match buildah bud functionality
Add --label, --annotations, --idfile, --squash
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #824
Approved by: TomSweeneyRedHat
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/pkg')
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/pkg/cli/common.go | 12 | ||||
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/pkg/parse/parse.go | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/vendor/github.com/projectatomic/buildah/pkg/cli/common.go b/vendor/github.com/projectatomic/buildah/pkg/cli/common.go index eeabc3ee7..e65dba2bd 100644 --- a/vendor/github.com/projectatomic/buildah/pkg/cli/common.go +++ b/vendor/github.com/projectatomic/buildah/pkg/cli/common.go @@ -11,6 +11,10 @@ import ( var ( BudFlags = []cli.Flag{ + cli.StringSliceFlag{ + Name: "annotation", + Usage: "Set metadata for an image (default [])", + }, cli.StringFlag{ Name: "authfile", Usage: "path of the authentication file. Default is ${XDG_RUNTIME_DIR}/containers/auth.json", @@ -53,6 +57,10 @@ var ( Name: "iidfile", Usage: "Write the image ID to the file", }, + cli.StringSliceFlag{ + Name: "label", + Usage: "Set metadata for an image (default [])", + }, 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.", @@ -139,11 +147,11 @@ var ( }, cli.StringSliceFlag{ Name: "security-opt", - Usage: "security Options (default [])", + Usage: "security options (default [])", }, cli.StringFlag{ Name: "shm-size", - Usage: "size of `/dev/shm`. The format is `<number><unit>`.", + Usage: "size of '/dev/shm'. The format is `<number><unit>`.", Value: "65536k", }, cli.StringSliceFlag{ diff --git a/vendor/github.com/projectatomic/buildah/pkg/parse/parse.go b/vendor/github.com/projectatomic/buildah/pkg/parse/parse.go index 6512aad52..eb7be9c1e 100644 --- a/vendor/github.com/projectatomic/buildah/pkg/parse/parse.go +++ b/vendor/github.com/projectatomic/buildah/pkg/parse/parse.go @@ -88,7 +88,7 @@ func parseSecurityOpts(securityOpts []string, commonOpts *buildah.CommonBuildOpt } con := strings.SplitN(opt, "=", 2) if len(con) != 2 { - return errors.Errorf("Invalid --security-opt 1: %q", opt) + return errors.Errorf("Invalid --security-opt name=value pair: %q", opt) } switch con[0] { |