Allow '/' to prefix container names to match Docker

Fixes: containers#16663 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
rhatdan · Dec 12, 2022 · 853c5c9 · 853c5c9
1 parent 0037bff
commit 853c5c9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/libpod/options.go b/libpod/options.go
@@ -6,6 +6,7 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"strings"
 	"syscall"
 
 	"github.com/containers/buildah/pkg/parse"
@@ -777,7 +778,7 @@ func WithName(name string) CtrCreateOption {
 		}
 
 		// Check the name against a regex
-		if !define.NameRegex.MatchString(name) {
+		if !define.NameRegex.MatchString(strings.TrimPrefix(name, "/")) {
 			return define.RegexError
 		}
 

diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go
@@ -118,7 +118,7 @@ func (r *Runtime) RenameContainer(ctx context.Context, ctr *Container, newName s
 		return nil, err
 	}
 
-	if newName == "" || !define.NameRegex.MatchString(newName) {
+	if newName == "" && !define.NameRegex.MatchString(strings.TrimPrefix(newName, "/")) {
 		return nil, define.RegexError
 	}
 

diff --git a/test/system/030-run.bats b/test/system/030-run.bats
@@ -174,15 +174,15 @@ echo $rand        |   0 | $rand
     run_podman 1 image exists $NONLOCAL_IMAGE
 
     # Run a container, without --rm; this should block subsequent --rmi
-    run_podman run --name keepme $NONLOCAL_IMAGE /bin/true
+    run_podman run --name /keepme $NONLOCAL_IMAGE /bin/true
     run_podman image exists $NONLOCAL_IMAGE
 
     # Now try running with --rmi : it should succeed, but not remove the image
     run_podman run --rmi --rm $NONLOCAL_IMAGE /bin/true
     run_podman image exists $NONLOCAL_IMAGE
 
     # Remove the stray container, and run one more time with --rmi.
-    run_podman rm keepme
+    run_podman rm /keepme
     run_podman run --rmi --rm $NONLOCAL_IMAGE /bin/true
     run_podman 1 image exists $NONLOCAL_IMAGE
 }
@@ -951,4 +951,14 @@ $IMAGE--c_ok" \
     run_podman stop -t 0 $cid
 }
 
+@test "podman run bad --name" {
+    randomname=$(random_string 30)
+    run_podman 125 create --name "$randomname/bad" $IMAGE
+    run_podman create --name "/$randomname" $IMAGE
+    run_podman ps -a --filter name="/$randomname" --format '{{ .Names }}'
+    is $output "/$randomname" "Should be able to find container by name"
+    run_podman rm "/$randomname"
+    run_podman 125 create --name "$randomname/" $IMAGE
+}
+
 # vim: filetype=sh