summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-05-03 08:06:13 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2021-05-05 14:46:18 -0400
commitf8846bd17b5c6dacb5908112ec24ce332185e5d1 (patch)
tree87da95475adbcb96ad8b2c256a69a3ed87d4ec12
parent0bd5da5b7fe0aad31d795cf5bea1b37c9053f791 (diff)
downloadpodman-f8846bd17b5c6dacb5908112ec24ce332185e5d1.tar.gz
podman-f8846bd17b5c6dacb5908112ec24ce332185e5d1.tar.bz2
podman-f8846bd17b5c6dacb5908112ec24ce332185e5d1.zip
Fix handling of runlabel IMAGE and NAME
Fixes: https://github.com/containers/podman/issues/10192 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
-rw-r--r--pkg/domain/infra/abi/containers_runlabel.go19
-rw-r--r--pkg/domain/infra/abi/containers_runlabel_test.go40
2 files changed, 57 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/containers_runlabel.go b/pkg/domain/infra/abi/containers_runlabel.go
index 199ae43ad..d448627dc 100644
--- a/pkg/domain/infra/abi/containers_runlabel.go
+++ b/pkg/domain/infra/abi/containers_runlabel.go
@@ -180,13 +180,28 @@ func generateRunlabelCommand(runlabel string, img *libimage.Image, inputName str
}
func replaceName(arg, name string) string {
+ if arg == "NAME" {
+ return name
+ }
+
newarg := strings.ReplaceAll(arg, "$NAME", name)
- return strings.ReplaceAll(newarg, "${NAME}", name)
+ newarg = strings.ReplaceAll(newarg, "${NAME}", name)
+ if strings.HasSuffix(newarg, "=NAME") {
+ newarg = strings.ReplaceAll(newarg, "=NAME", fmt.Sprintf("=%s", name))
+ }
+ return newarg
}
func replaceImage(arg, image string) string {
+ if arg == "IMAGE" {
+ return image
+ }
newarg := strings.ReplaceAll(arg, "$IMAGE", image)
- return strings.ReplaceAll(newarg, "${IMAGE}", image)
+ newarg = strings.ReplaceAll(newarg, "${IMAGE}", image)
+ if strings.HasSuffix(newarg, "=IMAGE") {
+ newarg = strings.ReplaceAll(newarg, "=IMAGE", fmt.Sprintf("=%s", image))
+ }
+ return newarg
}
// generateCommand takes a label (string) and converts it to an executable command
diff --git a/pkg/domain/infra/abi/containers_runlabel_test.go b/pkg/domain/infra/abi/containers_runlabel_test.go
new file mode 100644
index 000000000..10f9ae004
--- /dev/null
+++ b/pkg/domain/infra/abi/containers_runlabel_test.go
@@ -0,0 +1,40 @@
+package abi
+
+import (
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestReplaceName(t *testing.T) {
+ tests := [][]string{
+ {"NAME=$NAME", "test1", "NAME=test1"},
+ {"NAME=${NAME}", "test2", "NAME=test2"},
+ {"NAME=NAME", "test3", "NAME=test3"},
+ {"NAME=NAMEFOO", "test3", "NAME=NAMEFOO"},
+ {"NAME", "test4", "test4"},
+ {"FNAME", "test5", "FNAME"},
+ {"NAME=foo", "test6", "NAME=foo"},
+ {"This is my NAME", "test7", "This is my NAME"},
+ }
+ for _, args := range tests {
+ val := replaceName(args[0], args[1])
+ assert.Equal(t, val, args[2])
+ }
+}
+
+func TestReplaceImage(t *testing.T) {
+ tests := [][]string{
+ {"IMAGE=$IMAGE", "test1", "IMAGE=test1"},
+ {"IMAGE=${IMAGE}", "test2", "IMAGE=test2"},
+ {"IMAGE=IMAGE", "test3", "IMAGE=test3"},
+ {"IMAGE=IMAGEFOO", "test3", "IMAGE=IMAGEFOO"},
+ {"IMAGE", "test4", "test4"},
+ {"FIMAGE", "test5", "FIMAGE"},
+ {"IMAGE=foo", "test6", "IMAGE=foo"},
+ }
+ for _, args := range tests {
+ val := replaceImage(args[0], args[1])
+ assert.Equal(t, val, args[2])
+ }
+}