diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-06-01 12:59:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-01 12:59:47 -0400 |
| commit | 3c63a48bb8c1bdff688ce5b6c9c6e3079370e603 (patch) | |
| tree | d098f85f80fb364e0d8b082ecd1f898cfde2c186 /cmd | |
| parent | 10d440a1c898aac84198c9c34d48d0cea9085f68 (diff) | |
| parent | 29c831f9d6abf8d650bc7feb63a1e60876238504 (diff) | |
| download | podman-3c63a48bb8c1bdff688ce5b6c9c6e3079370e603.tar.gz podman-3c63a48bb8c1bdff688ce5b6c9c6e3079370e603.tar.bz2 podman-3c63a48bb8c1bdff688ce5b6c9c6e3079370e603.zip | |
Merge pull request #859 from rhatdan/onbuild
Add OnBuild support for podman build
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/commit.go | 4 | ||||
| -rw-r--r-- | cmd/podman/varlink/io.projectatomic.podman.varlink | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/commit.go b/cmd/podman/commit.go index ce8e99dd4..90a003e8e 100644 --- a/cmd/podman/commit.go +++ b/cmd/podman/commit.go @@ -19,7 +19,7 @@ var ( commitFlags = []cli.Flag{ cli.StringSliceFlag{ Name: "change, c", - Usage: "Apply the following possible instructions to the created image (default []): CMD | ENTRYPOINT | ENV | EXPOSE | LABEL | STOPSIGNAL | USER | VOLUME | WORKDIR", + Usage: fmt.Sprintf("Apply the following possible instructions to the created image (default []): %s", strings.Join(libpod.ChangeCmds, " | ")), }, cli.StringFlag{ Name: "format, f", @@ -92,7 +92,7 @@ func commitCmd(c *cli.Context) error { if c.IsSet("change") { for _, change := range c.StringSlice("change") { splitChange := strings.Split(strings.ToUpper(change), "=") - if !util.StringInSlice(splitChange[0], []string{"CMD", "ENTRYPOINT", "ENV", "EXPOSE", "LABEL", "STOPSIGNAL", "USER", "VOLUME", "WORKDIR"}) { + if !util.StringInSlice(splitChange[0], libpod.ChangeCmds) { return errors.Errorf("invalid syntax for --change ", change) } } diff --git a/cmd/podman/varlink/io.projectatomic.podman.varlink b/cmd/podman/varlink/io.projectatomic.podman.varlink index b120edfa2..46e2f52f2 100644 --- a/cmd/podman/varlink/io.projectatomic.podman.varlink +++ b/cmd/podman/varlink/io.projectatomic.podman.varlink @@ -531,7 +531,7 @@ method DeleteUnusedImages() -> (images: []string) # Commit, creates an image from an existing container. It requires the name or # ID of the container as well as the resulting image name. Optionally, you can define an author and message # to be added to the resulting image. You can also define changes to the resulting image for the following -# attributes: _CMD, ENTRYPOINT, ENV, EXPOSE, LABEL, STOPSIGNAL, USER, VOLUME, and WORKDIR_. To pause the +# attributes: _CMD, ENTRYPOINT, ENV, EXPOSE, LABEL, ONBUILD, STOPSIGNAL, USER, VOLUME, and WORKDIR_. To pause the # container while it is being committed, pass a _true_ bool for the pause argument. If the container cannot # be found by the ID or name provided, a (ContainerNotFound)[#ContainerNotFound] error will be returned; otherwise, # the resulting image's ID will be returned as a string. |