Skip to content

Commit fa20acc

Browse files
authored
Updating buildOptions metadata as per grafeas spec (#11585) (#11586)
* Updating buildOptions metadata as per grafeas spec * Updating versions for related tasks
1 parent f026c7c commit fa20acc

File tree

11 files changed

+23
-13
lines changed

11 files changed

+23
-13
lines changed

Tasks/Common/docker-common-v2/dockercommandutils.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,21 @@ export function getPipelineLogsUrl(): string {
113113
return pipelineUrl;
114114
}
115115

116-
export function getBuildAndPushArguments(dockerFile: string, labelArguments: string[], tagArguments: string[]): Object {
116+
export function getBuildAndPushArguments(dockerFile: string, labelArguments: string[], tagArguments: string[]): { [key: string]: string } {
117+
let labelArgumentsString = "";
118+
let tagArgumentsString = "";
119+
if (labelArguments && labelArguments.length > 0) {
120+
labelArgumentsString = labelArguments.join(", ");
121+
}
122+
123+
if (tagArguments && tagArguments.length > 0) {
124+
tagArgumentsString = tagArguments.join(", ");
125+
}
126+
117127
let buildArguments = {
118128
"dockerFilePath": dockerFile,
119-
"labels": labelArguments,
120-
"tags": tagArguments,
129+
"labels": labelArgumentsString,
130+
"tags": tagArgumentsString,
121131
"context": getBuildContext(dockerFile)
122132
};
123133

Tasks/ContainerStructureTestV0/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 1,
17-
"Patch": 3
17+
"Patch": 4
1818
},
1919
"preview": true,
2020
"demands": [],

Tasks/ContainerStructureTestV0/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 1,
17-
"Patch": 3
17+
"Patch": 4
1818
},
1919
"preview": true,
2020
"demands": [],

Tasks/DockerComposeV0/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 159,
17-
"Patch": 1
17+
"Patch": 2
1818
},
1919
"demands": [],
2020
"preview": "false",

Tasks/DockerComposeV0/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 159,
17-
"Patch": 1
17+
"Patch": 2
1818
},
1919
"demands": [],
2020
"preview": "false",

Tasks/DockerV2/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 2,
1616
"Minor": 159,
17-
"Patch": 1
17+
"Patch": 2
1818
},
1919
"demands": [],
2020
"releaseNotes": "Simplified the task YAML by:<br/>&nbsp;- Removing the Container registry type input<br/>&nbsp;- Removing complex inputs as they can be passed as arguments to the command.",

Tasks/DockerV2/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 2,
1616
"Minor": 159,
17-
"Patch": 1
17+
"Patch": 2
1818
},
1919
"demands": [],
2020
"releaseNotes": "ms-resource:loc.releaseNotes",

Tasks/KubernetesManifestV0/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 159,
17-
"Patch": 4
17+
"Patch": 5
1818
},
1919
"demands": [],
2020
"groups": [],

Tasks/KubernetesManifestV0/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 159,
17-
"Patch": 4
17+
"Patch": 5
1818
},
1919
"demands": [],
2020
"groups": [],

Tasks/KubernetesV1/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 1,
1616
"Minor": 159,
17-
"Patch": 5
17+
"Patch": 6
1818
},
1919
"demands": [],
2020
"releaseNotes": "What's new in Version 1.0:<br/>&nbsp;Added new service connection type input for easy selection of Azure AKS cluster.<br/>&nbsp;Replaced output variable input with output variables section that we had added in all tasks.",

0 commit comments

Comments
 (0)