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.

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

[DockerComposeV0] - Merged generated task to source task #19117

Merged
merged 2 commits into from
Oct 16, 2023
Merged

[DockerComposeV0] - Merged generated task to source task #19117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ee831a
[DockerComposeV0] - Merged generated task to source task
DmitriiBobreshev Oct 16, 2023
64a481a
Merge branch 'master' into user/dmitriibobreshev/dockercomposev0_merging
DmitriiBobreshev Oct 16, 2023
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
1 change: 0 additions & 1 deletion Tasks/DockerComposeV0/_buildConfigs/Node16/FilesOverriddenForConfigGoHereREADME.txt
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions Tasks/DockerComposeV0/_buildConfigs/Node16/make.json
View file
Open in desktop

This file was deleted.

993 changes: 0 additions & 993 deletions Tasks/DockerComposeV0/_buildConfigs/Node16/package-lock.json
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions Tasks/DockerComposeV0/_buildConfigs/Node16/package.json
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions Tasks/DockerComposeV0/dockercomposeconnection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,7 @@ export default class DockerComposeConnection extends ContainerConnection {
command.on("stderr", data => {
output += data;
});
#if NODE16
await this.execCommand(command, options);
#else
await this.execCommand(command as unknown as tr.ToolRunner, options);
#endif
return output || '\n';
}

Expand Down
3 changes: 2 additions & 1 deletion Tasks/DockerComposeV0/make.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
{
"items": [
"node_modules/azure-pipelines-tasks-docker-common/node_modules/azure-pipelines-task-lib",
"node_modules/azure-pipelines-tasks-azure-arm-rest-v2/node_modules/azure-pipelines-task-lib"
"node_modules/azure-pipelines-tasks-azure-arm-rest-v2/node_modules/azure-pipelines-task-lib",
"node_modules/https-proxy-agent/node_modules/agent-base"
],
"options": "-Rf"
}
Expand Down
97 changes: 70 additions & 27 deletions Tasks/DockerComposeV0/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.

7 changes: 4 additions & 3 deletions Tasks/DockerComposeV0/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"dependencies": {
"@types/node": "^10.17.0",
"@types/mocha": "^5.2.7",
"@types/node": "^16.11.39",
"@types/q": "^1.5.0",
"del": "2.2.0",
"azure-pipelines-task-lib": "3.3.1",
"agent-base": "^6.0.2",
"azure-pipelines-task-lib": "4.4.0",
"azure-pipelines-tasks-docker-common": "2.225.0",
"del": "2.2.0",
"esprima": "2.7.1",
"js-yaml": "3.13.1"
},
Expand Down
8 changes: 6 additions & 2 deletions Tasks/DockerComposeV0/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 0,
"Minor": 227,
"Patch": 1
"Minor": 230,
"Patch": 0
},
"demands": [],
"preview": "false",
Expand Down Expand Up @@ -338,6 +338,10 @@
"Node10": {
"target": "dockercompose.js",
"argumentFormat": ""
},
"Node16": {
"target": "dockercompose.js",
"argumentFormat": ""
}
},
"messages": {
Expand Down
8 changes: 6 additions & 2 deletions Tasks/DockerComposeV0/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 0,
"Minor": 227,
"Patch": 1
"Minor": 230,
"Patch": 0
},
"demands": [],
"preview": "false",
Expand Down Expand Up @@ -338,6 +338,10 @@
"Node10": {
"target": "dockercompose.js",
"argumentFormat": ""
},
"Node16": {
"target": "dockercompose.js",
"argumentFormat": ""
}
},
"messages": {
Expand Down
8 changes: 1 addition & 7 deletions Tasks/DockerComposeV0/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,9 @@ export function getFinalComposeFileName(): string {
return ".docker-compose." + Date.now() + ".yml"
}

#if NODE16
export function writeFileSync(filename: string, data: any, options?: { encoding?: BufferEncoding; mode?: number; flag?: string; }): void {
fs.writeFileSync(filename, data, options);
}
#else
export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void {
fs.writeFileSync(filename, data, options);
}
#endif

function getTaskOutputDir(command: string): string {
let tempDirectory = tl.getVariable('agent.tempDirectory') || os.tmpdir();
Expand All @@ -39,4 +33,4 @@ export function writeTaskOutput(commandName: string, output: string): string {
}

return taskOutputPath;
}
}
2 changes: 0 additions & 2 deletions _generated/DockerComposeV0.versionmap.txt
View file
Open in desktop

This file was deleted.

Loading