Skip to content

fix(dockerfile): replace all instances of arguments #39747

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.

Sign up for GitHub

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

Open
kk-daniel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(dockerfile): replace all instances of arguments #39747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions lib/modules/manager/dockerfile/extract.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1305,6 +1305,27 @@ describe('modules/manager/dockerfile/extract', () => {
});
});

it('handles same argument multiple times', () => {
const res = extractPackageFile(
'ARG DOCKER=docker\n' + 'FROM ${DOCKER}.io/library/${DOCKER}:29.1.1-dind',
'',
{},
)?.deps;
expect(res).toEqual([
{
autoReplaceStringTemplate:
'FROM ${DOCKER}.io/library/${DOCKER}:{{#if newValue}}{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}\n',
currentDigest: undefined,
currentValue: '29.1.1-dind',
datasource: 'docker',
depName: 'docker.io/library/docker',
depType: 'final',
packageName: 'docker.io/library/docker',
replaceString: 'FROM ${DOCKER}.io/library/${DOCKER}:29.1.1-dind\n',
},
]);
});

it('handles empty optional parameters', () => {
const res = extractPackageFile(
'FROM quay.io/myName/myPackage:0.6.2\n',
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/dockerfile/extract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ export function extractPackageFile(
for (const [fullVariable, argName] of Object.entries(variables)) {
const resolvedArgValue = args[argName];
if (resolvedArgValue || resolvedArgValue === '') {
fromImage = fromImage.replace(fullVariable, resolvedArgValue);
fromImage = fromImage.replaceAll(fullVariable, resolvedArgValue);
lineNumberRanges.push(argsLines[argName]);
}
}
Expand Down