Skip to content

Commit

Permalink
fix(docker): use docker versioning for debian images with regular tags (
Browse files Browse the repository at this point in the history
  • Loading branch information
Churro committed Sep 4, 2022
1 parent 4ccd085 commit c4127f9
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
16 changes: 16 additions & 0 deletions lib/modules/manager/dockerfile/extract.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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([
Expand Down
5 changes: 4 additions & 1 deletion lib/modules/manager/dockerfile/extract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit c4127f9

Please sign in to comment.