summaryrefslogtreecommitdiff
path: root/cmd/podman/shared/funcs.go
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2019-01-03 14:53:05 -0600
committerbaude <bbaude@redhat.com>2019-01-04 12:57:55 -0600
commit10a62d60a9b27626a47ab2bee00c32febb21f0e9 (patch)
tree6d3117e882dcadb0c5cc61f216ed5c6fc0ee6381 /cmd/podman/shared/funcs.go
parent133469681486788591f6979f853c662ccf7f9118 (diff)
downloadpodman-10a62d60a9b27626a47ab2bee00c32febb21f0e9.tar.gz
podman-10a62d60a9b27626a47ab2bee00c32febb21f0e9.tar.bz2
podman-10a62d60a9b27626a47ab2bee00c32febb21f0e9.zip
container runlabel NAME implementation
when using container runlabel, if a --name is not provided, we must deduce the container name from the base name of the image to maintain parity with the atomic cli. fixed small bug where we split the cmd on " " rather than using fields could lead to extra spaces in command output. Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'cmd/podman/shared/funcs.go')
-rw-r--r--cmd/podman/shared/funcs.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/podman/shared/funcs.go b/cmd/podman/shared/funcs.go
index 8770b8ec0..70d041fd2 100644
--- a/cmd/podman/shared/funcs.go
+++ b/cmd/podman/shared/funcs.go
@@ -65,6 +65,8 @@ func GenerateCommand(command, imageName, name string) ([]string, error) {
switch arg {
case "IMAGE":
newArg = imageName
+ case "$IMAGE":
+ newArg = imageName
case "IMAGE=IMAGE":
newArg = fmt.Sprintf("IMAGE=%s", imageName)
case "IMAGE=$IMAGE":
@@ -75,6 +77,8 @@ func GenerateCommand(command, imageName, name string) ([]string, error) {
newArg = fmt.Sprintf("NAME=%s", name)
case "NAME=$NAME":
newArg = fmt.Sprintf("NAME=%s", name)
+ case "$NAME":
+ newArg = name
default:
newArg = arg
}