fix(dockerfile): handle codenames with registries

renovatebot · May 8, 2024 · 974127b · 974127b
1 parent 4eaa0c5
commit 974127b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/lib/modules/manager/dockerfile/extract.spec.ts b/lib/modules/manager/dockerfile/extract.spec.ts
@@ -669,6 +669,23 @@ describe('modules/manager/dockerfile/extract', () => {
       ]);
     });
 
+    it('handles debian with prefixes and registries', () => {
+      const res = extractPackageFile('FROM docker.io/library/debian:10\n', '', {})?.deps;
+      expect(res).toEqual([
+        {
+          autoReplaceStringTemplate:
+            '{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
+          currentDigest: undefined,
+          currentValue: '10',
+          datasource: 'docker',
+          depName: 'docker.io/library/debian',
+          depType: 'final',
+          replaceString: 'docker.io/library/debian:10',
+          versioning: 'debian',
+        },
+      ]);
+    });
+
     it('handles prefixes', () => {
       const res = extractPackageFile('FROM amd64/ubuntu:18.04\n', '', {})?.deps;
       expect(res).toEqual([
@@ -687,6 +704,23 @@ describe('modules/manager/dockerfile/extract', () => {
       ]);
     });
 
+    it('handles prefixes with registries', () => {
+      const res = extractPackageFile('FROM public.ecr.aws/ubuntu/ubuntu:18.04\n', '', {})?.deps;
+      expect(res).toEqual([
+        {
+          autoReplaceStringTemplate:
+            '{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
+          currentDigest: undefined,
+          currentValue: '18.04',
+          datasource: 'docker',
+          depName: "public.ecr.aws/ubuntu/ubuntu",
+          depType: 'final',
+          replaceString: "public.ecr.aws/ubuntu/ubuntu:18.04",
+          versioning: 'ubuntu',
+        },
+      ]);
+    });
+
     it('handles implausible line continuation', () => {
       const res = extractPackageFile(
         'FROM alpine:3.5\n\nRUN something \\',

diff --git a/lib/modules/manager/dockerfile/extract.ts b/lib/modules/manager/dockerfile/extract.ts
@@ -214,12 +214,12 @@ export function getDep(
     }
   }
 
-  if (dep.depName === 'ubuntu') {
+  if (dep.depName === 'ubuntu' || dep.depName?.endsWith('/ubuntu')) {
     dep.versioning = ubuntuVersioning.id;
   }
 
   if (
-    dep.depName === 'debian' &&
+    (dep.depName === 'debian' || dep.depName?.endsWith('/debian')) &&
     debianVersioning.api.isVersion(dep.currentValue)
   ) {
     dep.versioning = debianVersioning.id;