fix(docker): exclude path from registry (#10144)

renovatebot · May 26, 2021 · 9209fad · 9209fad
1 parent f2958dc
commit 9209fad
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/lib/datasource/docker/common.spec.ts b/lib/datasource/docker/common.spec.ts
@@ -43,8 +43,8 @@ describe(getName(), () => {
       );
       expect(res).toMatchInlineSnapshot(`
         Object {
-          "dockerRepository": "image",
-          "registryHost": "https://my.local.registry/prefix",
+          "dockerRepository": "prefix/image",
+          "registryHost": "https://my.local.registry",
         }
       `);
     });
@@ -55,8 +55,8 @@ describe(getName(), () => {
       );
       expect(res).toMatchInlineSnapshot(`
         Object {
-          "dockerRepository": "image",
-          "registryHost": "http://my.local.registry/prefix",
+          "dockerRepository": "prefix/image",
+          "registryHost": "http://my.local.registry",
         }
       `);
     });
@@ -67,8 +67,8 @@ describe(getName(), () => {
       );
       expect(res).toMatchInlineSnapshot(`
         Object {
-          "dockerRepository": "image",
-          "registryHost": "https://my.local.registry/prefix",
+          "dockerRepository": "prefix/image",
+          "registryHost": "https://my.local.registry",
         }
       `);
     });

diff --git a/lib/datasource/docker/common.ts b/lib/datasource/docker/common.ts
@@ -9,7 +9,11 @@ import * as packageCache from '../../util/cache/package';
 import * as hostRules from '../../util/host-rules';
 import { Http, HttpResponse } from '../../util/http';
 import type { OutgoingHttpHeaders } from '../../util/http/types';
-import { ensureTrailingSlash, trimTrailingSlash } from '../../util/url';
+import {
+  ensureTrailingSlash,
+  parseUrl,
+  trimTrailingSlash,
+} from '../../util/url';
 import { MediaType, RegistryRepository } from './types';
 
 export const id = 'docker';
@@ -165,9 +169,14 @@ export function getRegistryRepository(
       if (!/^https?:\/\//.test(registryHost)) {
         registryHost = `https://${registryHost}`;
       }
+      let dockerRepository = lookupName.replace(registryEndingWithSlash, '');
+      const fullUrl = `${registryHost}/${dockerRepository}`;
+      const { origin, pathname } = parseUrl(fullUrl);
+      registryHost = origin;
+      dockerRepository = pathname.substring(1);
       return {
         registryHost,
-        dockerRepository: lookupName.replace(registryEndingWithSlash, ''),
+        dockerRepository,
       };
     }
   }