Skip to content

modified docker label image code as per suggestions #448

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

Merged
merged 7 commits into from
Apr 28, 2025
Merged

modified docker label image code as per suggestions #448

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b9569aa
modified docker label image code as per suggestions
v-dko Apr 17, 2025
b91ad0a
Merge branch 'main' into users/dko/digestimagefix
v-dko Apr 17, 2025
691edbf
updated code as per review changes
v-dko Apr 23, 2025
6d857bd
Merge branch 'main' of https://github.com/microsoft/azure-pipelines-t…
v-dko Apr 23, 2025
75f4074
modified code changes as per suggestions
v-dko Apr 24, 2025
ae8be4d
Merge branch 'main' of https://github.com/microsoft/azure-pipelines-t…
v-dko Apr 25, 2025
ddd3352
added return type
v-dko Apr 25, 2025
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
7 changes: 2 additions & 5 deletions common-npm-packages/docker-common/containerimageutils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,14 +266,11 @@ export function getBaseImageDigestDockerFile(dockerFileContentPath: string): str
var lines = dockerFileContent.split(/[\r?\n]/);
var aliasToImageNameMapping: Map<string, string> = new Map<string, string>();
var baseImage = "";

// Added regex pattern to check line starts with FROM IMAGE
const matchPatternForDockerImage = new RegExp(/^FROM\s+IMAGE/);

for (var i = 0; i < lines.length; i++) {
const currentLine = lines[i].trim();

if (!currentLine.toUpperCase().match(matchPatternForDockerImage)) {
if (!currentLine.toUpperCase().startsWith("FROM")) {
continue;
}
var nameComponents = currentLine.substring(4).toLowerCase().split(" as ");
Expand Down Expand Up @@ -304,7 +301,7 @@ export function getBaseImageDigestDockerFile(dockerFileContentPath: string): str
}
}

return null;
return baseImageData[0];
} catch (error) {
tl.debug(`An error ocurred getting the base image digest. ${error.message}`);
return null;
Expand Down
4 changes: 2 additions & 2 deletions common-npm-packages/docker-common/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common-npm-packages/docker-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "azure-pipelines-tasks-docker-common",
"version": "2.254.0",
"version": "2.256.0",
"description": "Common Library for Azure Rest Calls",
"repository": {
"type": "git",
Expand Down
Loading