Check if image name has registry host (microsoft/vscode-remote-releas…

…e#9748)

CHANGELOG.md

@@ -4,6 +4,9 @@ Notable changes.
 
 ## April 2024
 
+### [0.59.1]
+- Check if image name has registry host. (https://github.com/microsoft/vscode-remote-release/issues/9748)
+
 ### [0.59.0]
 - Propagate --cache-from to buildx build. (https://github.com/devcontainers/cli/pull/638)
 - Disable cache on feature build when `--build-no-cache` is passed. (https://github.com/devcontainers/cli/pull/790)

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@devcontainers/cli",
 	"description": "Dev Containers CLI",
-	"version": "0.59.0",
+	"version": "0.59.1",
 	"bin": {
 		"devcontainer": "devcontainer.js"
 	},

src/spec-node/containerFeatures.ts

@@ -431,7 +431,7 @@ export async function updateRemoteUserUID(params: DockerResolverParameters, merg
 		'-f', destDockerfile,
 		'-t', fixedImageName,
 		...(platform ? ['--platform', platform] : []),
-		'--build-arg', `BASE_IMAGE=${params.isPodman ? 'localhost/' : ''}${imageName}`, // Podman: https://github.com/microsoft/vscode-remote-release/issues/9748
+		'--build-arg', `BASE_IMAGE=${params.isPodman && !hasRegistryHostname(imageName) ? 'localhost/' : ''}${imageName}`, // Podman: https://github.com/microsoft/vscode-remote-release/issues/9748
 		'--build-arg', `REMOTE_USER=${remoteUser}`,
 		'--build-arg', `NEW_UID=${await cliHost.getuid!()}`,
 		'--build-arg', `NEW_GID=${await cliHost.getgid!()}`,
@@ -445,3 +445,12 @@ export async function updateRemoteUserUID(params: DockerResolverParameters, merg
 	}
 	return fixedImageName;
 }
+
+function hasRegistryHostname(imageName: string) {
+	if (imageName.startsWith('localhost/')) {
+		return true;
+	}
+	const dot = imageName.indexOf('.');
+	const slash = imageName.indexOf('/');
+	return dot !== -1 && slash !== -1 && dot < slash;
+}