summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-09-30 07:20:09 -0700
committerGitHub <noreply@github.com>2019-09-30 07:20:09 -0700
commit2c23729c84775113a6c2cd7593f588cc6ea4e5fa (patch)
tree6997ee622c30cc82af8aa09bb4645d8d6334c947 /cmd/podman
parent150ba5edede258a3a64afdd6f58b8bf6083dc7a6 (diff)
parentbe9dbb47d2212c453e3c417a70d4e6d26d5107e4 (diff)
downloadpodman-2c23729c84775113a6c2cd7593f588cc6ea4e5fa.tar.gz
podman-2c23729c84775113a6c2cd7593f588cc6ea4e5fa.tar.bz2
podman-2c23729c84775113a6c2cd7593f588cc6ea4e5fa.zip
Merge pull request #4001 from kunalkushwaha/podman-import-fix
podman import syntax fix
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/import.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd/podman/import.go b/cmd/podman/import.go
index d49792f27..027fa7299 100644
--- a/cmd/podman/import.go
+++ b/cmd/podman/import.go
@@ -39,7 +39,7 @@ func init() {
importCommand.SetHelpTemplate(HelpTemplate())
importCommand.SetUsageTemplate(UsageTemplate())
flags := importCommand.Flags()
- flags.StringSliceVarP(&importCommand.Change, "change", "c", []string{}, "Apply the following possible instructions to the created image (default []): CMD | ENTRYPOINT | ENV | EXPOSE | LABEL | STOPSIGNAL | USER | VOLUME | WORKDIR")
+ flags.StringArrayVarP(&importCommand.Change, "change", "c", []string{}, "Apply the following possible instructions to the created image (default []): CMD | ENTRYPOINT | ENV | EXPOSE | LABEL | STOPSIGNAL | USER | VOLUME | WORKDIR")
flags.StringVarP(&importCommand.Message, "message", "m", "", "Set commit message for imported image")
flags.BoolVarP(&importCommand.Quiet, "quiet", "q", false, "Suppress output")
@@ -56,7 +56,6 @@ func importCmd(c *cliconfig.ImportValues) error {
source string
reference string
)
-
args := c.InputArgs
switch len(args) {
case 0:
@@ -81,7 +80,7 @@ func importCmd(c *cliconfig.ImportValues) error {
if runtime.Remote {
quiet = false
}
- iid, err := runtime.Import(getContext(), source, reference, c.StringSlice("change"), c.String("message"), quiet)
+ iid, err := runtime.Import(getContext(), source, reference, importCommand.Change, c.String("message"), quiet)
if err == nil {
fmt.Println(iid)
}