From c4127f994c72b477b8ff9bfee9ee792b28ca01f0 Mon Sep 17 00:00:00 2001
From: Johannes Feichtner <Churro@users.noreply.github.com>
Date: Sun, 4 Sep 2022 07:08:51 +0200
Subject: [PATCH] fix(docker): use docker versioning for debian images with
regular tags (#17602)
---
lib/modules/manager/dockerfile/extract.spec.ts | 16 ++++++++++++++++
lib/modules/manager/dockerfile/extract.ts | 5 ++++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/lib/modules/manager/dockerfile/extract.spec.ts b/lib/modules/manager/dockerfile/extract.spec.ts
index 8951876ea3..da8e14c344 100644
--- a/lib/modules/manager/dockerfile/extract.spec.ts
+++ b/lib/modules/manager/dockerfile/extract.spec.ts
@@ -649,6 +649,22 @@ describe('modules/manager/dockerfile/extract', () => {
]);
});
+ it('handles debian with regular tag', () => {
+ const res = extractPackageFile('FROM debian:11.4-slim\n', '', {})?.deps;
+ expect(res).toEqual([
+ {
+ autoReplaceStringTemplate:
+ '{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
+ currentDigest: undefined,
+ currentValue: '11.4-slim',
+ datasource: 'docker',
+ depName: 'debian',
+ depType: 'final',
+ replaceString: 'debian:11.4-slim',
+ },
+ ]);
+ });
+
it('handles debian with prefixes', () => {
const res = extractPackageFile('FROM amd64/debian:10\n', '', {})?.deps;
expect(res).toEqual([
diff --git a/lib/modules/manager/dockerfile/extract.ts b/lib/modules/manager/dockerfile/extract.ts
index d3a1df9d1b..5d60cae78d 100644
--- a/lib/modules/manager/dockerfile/extract.ts
+++ b/lib/modules/manager/dockerfile/extract.ts
@@ -208,7 +208,10 @@ export function getDep(
dep.versioning = ubuntuVersioning.id;
}
- if (dep.depName === 'debian') {
+ if (
+ dep.depName === 'debian' &&
+ debianVersioning.api.isVersion(dep.currentValue)
+ ) {
dep.versioning = debianVersioning.id;
}
--
GitLab