Fix handling of runlabel IMAGE and NAME

Fixes: https://github.com/containers/podman/issues/10192

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

1 files changed, 17 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