Skip to content

Commit 626b27c

Browse files
authored
Removed Dynamic FF UseDigestImageFromFile from docker-common-package (#502)
* removed UseDigestImageFromFile FF * fixed comment * package details are updated
1 parent 7359262 commit 626b27c

File tree

3 files changed

+15
-41
lines changed

3 files changed

+15
-41
lines changed

common-npm-packages/docker-common/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common-npm-packages/docker-common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "azure-pipelines-tasks-docker-common",
3-
"version": "2.264.0",
3+
"version": "2.265.0",
44
"description": "Common Library for Azure Rest Calls",
55
"repository": {
66
"type": "git",

common-npm-packages/docker-common/pipelineutils.ts

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -55,45 +55,19 @@ function addReleaseLabels(hostName: string, labels: string[], addPipelineData?:
5555

5656
function addBaseImageLabels(connection: ContainerConnection, labels: string[], dockerFilePath: string): void {
5757

58-
//Added Dynamic feature flag to fix getting digest image from docker file
59-
let digestImageFromFileEnabled = tl.getPipelineFeature('UseDigestImageFromFile');
60-
61-
if (digestImageFromFileEnabled) {
62-
63-
// using getBaseImageDetialsFromDockerFIle method to fetch both image and imagedigest
64-
const baseImage = containerUtils.getBaseImageDetialsFromDockerFIle(dockerFilePath, connection);
65-
if (!baseImage.name) {
66-
return;
67-
}
68-
addLabelWithValue("image.base.ref.name", baseImage.name, labels);
69-
//first check if there is digest passed in ]Dockerfile
70-
if (!baseImage.digest) {
71-
baseImage.digest = containerUtils.getImageDigest(connection, baseImage.name);
72-
}
73-
//if there is no digest in Dockerfile, get digest using ImageName:tag
74-
if (baseImage.digest) {
75-
addLabelWithValue("image.base.digest", baseImage.digest, labels);
76-
}
77-
58+
// using getBaseImageDetialsFromDockerFIle method to fetch both image and imagedigest
59+
const baseImage = containerUtils.getBaseImageDetialsFromDockerFIle(dockerFilePath, connection);
60+
if (!baseImage.name) {
61+
return;
7862
}
79-
else {
80-
const baseImageName = containerUtils.getBaseImageNameFromDockerFile(dockerFilePath);
81-
if (!baseImageName) {
82-
return;
83-
}
84-
addLabelWithValue("image.base.ref.name", baseImageName, labels);
85-
86-
if (!connection) {
87-
tl.debug("Image digest couldn't be extracted because no connection was found.");
88-
return;
89-
}
90-
91-
const baseImageDigest = containerUtils.getImageDigest(connection, baseImageName);
92-
93-
//if there is no digest in Dockerfile, get digest using ImageName:tag
94-
if (baseImageDigest) {
95-
addLabelWithValue("image.base.digest", baseImageDigest, labels);
96-
}
63+
addLabelWithValue("image.base.ref.name", baseImage.name, labels);
64+
//first check if there is digest passed in Dockerfile
65+
if (!baseImage.digest) {
66+
baseImage.digest = containerUtils.getImageDigest(connection, baseImage.name);
67+
}
68+
//if there is no digest in Dockerfile, get digest using ImageName:tag
69+
if (baseImage.digest) {
70+
addLabelWithValue("image.base.digest", baseImage.digest, labels);
9771
}
9872
}
9973

0 commit comments

Comments
 (0)