fix: Only add / for lookup, not for returned registry (#8888)

When checking to see if lookupName starts with the registry, append a / (if not already present) to the registry. Do not append the / when returning the registry.
renovatebot · Feb 28, 2021 · e136cd4 · e136cd4
1 parent 58dc33b
commit e136cd4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/datasource/docker/__snapshots__/index.spec.ts.snap b/lib/datasource/docker/__snapshots__/index.spec.ts.snap
@@ -392,7 +392,7 @@ Object {
 
 exports[`datasource/docker/index getRegistryRepository supports registryUrls 1`] = `
 Object {
-  "registry": "my.local.registry/prefix/",
+  "registry": "my.local.registry/prefix",
   "repository": "image",
 }
 `;

diff --git a/lib/datasource/docker/index.ts b/lib/datasource/docker/index.ts
@@ -66,11 +66,12 @@ export function getRegistryRepository(
   registryUrl: string
 ): RegistryRepository {
   if (registryUrl !== defaultRegistryUrls[0]) {
-    const registry = registryUrl.replace('https://', '').replace(/\/?$/, '/');
-    if (lookupName.startsWith(registry)) {
+    const registry = registryUrl.replace('https://', '');
+    const registryEndingWithSlash = registry.replace(/\/?$/, '/');
+    if (lookupName.startsWith(registryEndingWithSlash)) {
       return {
         registry,
-        repository: lookupName.replace(registry, ''),
+        repository: lookupName.replace(registryEndingWithSlash, ''),
       };
     }
   }