Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(manager/dockerfile): Add syntax statement support #25530

Merged
Merged
42 changes: 42 additions & 0 deletions lib/modules/manager/dockerfile/extract.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -947,6 +947,16 @@ describe('modules/manager/dockerfile/extract', () => {
it('handles an alternative escape character', () => {
const res = extractPackageFile(d4, '', {})?.deps;
expect(res).toEqual([
{
autoReplaceStringTemplate:
'{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
currentDigest: undefined,
currentValue: '1',
datasource: 'docker',
depName: 'docker/dockerfile',
depType: 'syntax',
replaceString: 'docker/dockerfile:1',
},
{
autoReplaceStringTemplate:
' ARG `\n' +
Expand Down Expand Up @@ -1158,6 +1168,38 @@ describe('modules/manager/dockerfile/extract', () => {
});
});

it('handles # syntax statements', () => {
const res = extractPackageFile(
'# syntax=docker/dockerfile:1.1.7\n' + 'FROM alpine:3.13.5\n',
'',
{}
);
expect(res).toEqual({
deps: [
{
autoReplaceStringTemplate:
'{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
currentDigest: undefined,
currentValue: '1.1.7',
datasource: 'docker',
depName: 'docker/dockerfile',
depType: 'syntax',
replaceString: 'docker/dockerfile:1.1.7',
},
{
autoReplaceStringTemplate:
'{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}',
currentDigest: undefined,
currentValue: '3.13.5',
datasource: 'docker',
depName: 'alpine',
depType: 'final',
replaceString: 'alpine:3.13.5',
},
],
});
});

describe('getDep()', () => {
it('rejects null', () => {
expect(getDep(null)).toEqual({ skipReason: 'invalid-value' });
Expand Down
24 changes: 23 additions & 1 deletion lib/modules/manager/dockerfile/extract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,25 @@ export function extractPackageFile(
instruction += '\n' + lineLookahead;
}

const syntaxRegex = regEx('^#[ \\t]*syntax=(?<image>\\S+)', 'im');
SierraNL marked this conversation as resolved.
Show resolved Hide resolved
const syntaxMatch = instruction.match(syntaxRegex);
if (syntaxMatch?.groups?.image) {
const syntaxImage = syntaxMatch.groups.image;
const lineNumberRanges: number[][] = [[lineNumberInstrStart, lineNumber]];
const dep = getDep(syntaxImage, true, config.registryAliases);
dep.depType = 'syntax';
processDepForAutoReplace(dep, lineNumberRanges, lines, lineFeed);
logger.trace(
{
depName: dep.depName,
currentValue: dep.currentValue,
currentDigest: dep.currentDigest,
},
'Dockerfile # syntax'
);
deps.push(dep);
}

const argRegex = regEx(
'^[ \\t]*ARG(?:' +
escapeChar +
Expand Down Expand Up @@ -399,7 +418,10 @@ export function extractPackageFile(
if (!deps.length) {
return null;
}
for (const d of deps) {
if (deps[0].depType !== 'syntax') {
deps[0].depType = 'stage';
}
for (const d of deps.slice(1)) {
d.depType = 'stage';
SierraNL marked this conversation as resolved.
Show resolved Hide resolved
}
deps[deps.length - 1].depType = 'final';
Expand Down