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.

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] Update to Node 16 using build config gen #18747

Merged
merged 30 commits into from
Aug 16, 2023
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
dd4156b
Introduce Node16-225 for buildconfig
DmitriiBobreshev Jun 27, 2023
9cbc2cb
Introduce Node16-225 for buildconfig
DmitriiBobreshev Jun 27, 2023
e3e074c
Merge
aleksandrlevochkin Jul 17, 2023
788f1a1
Resolved merging conflicts
aleksandrlevochkin Jul 17, 2023
c75b524
Merge branch 'master' of https://github.com/microsoft/azure-pipelines…
aleksandrlevochkin Jul 19, 2023
8d5b2c4
Merge branch 'master' of https://github.com/microsoft/azure-pipelines…
aleksandrlevochkin Jul 19, 2023
d27325b
Merge branch 'master' of https://github.com/microsoft/azure-pipelines…
aleksandrlevochkin Jul 19, 2023
42d4c12
Merge branch 'master' of https://github.com/microsoft/azure-pipelines…
aleksandrlevochkin Jul 25, 2023
d900c1e
Merge branch 'master' of https://github.com/microsoft/azure-pipelines…
aleksandrlevochkin Jul 26, 2023
9b65f70
Merge branch 'master' of https://github.com/microsoft/azure-pipelines…
aleksandrlevochkin Jul 26, 2023
3a9a4ee
Merge branch 'master' of https://github.com/microsoft/azure-pipelines…
aleksandrlevochkin Jul 28, 2023
144215f
Merge branch 'master' of https://github.com/microsoft/azure-pipelines…
aleksandrlevochkin Jul 31, 2023
34bc43e
Merge branch 'master' of https://github.com/microsoft/azure-pipelines…
aleksandrlevochkin Aug 1, 2023
d99dd3a
DockerComposeV0 migration to Node 16
aleksandrlevochkin Aug 1, 2023
cf93c83
Make-options update
aleksandrlevochkin Aug 1, 2023
98b4ccb
Fix for Toolrunner type
aleksandrlevochkin Aug 1, 2023
86e434d
Merge branch 'master' of https://github.com/microsoft/azure-pipelines…
aleksandrlevochkin Aug 3, 2023
660e2c2
Merge branch 'master' of https://github.com/microsoft/azure-pipelines…
aleksandrlevochkin Aug 7, 2023
522f279
Merge branch 'master' of https://github.com/microsoft/azure-pipelines…
aleksandrlevochkin Aug 9, 2023
673d2a9
Resolve merge conflicts
aleksandrlevochkin Aug 9, 2023
4eb1f28
Update task version
aleksandrlevochkin Aug 9, 2023
6f2899c
Apply review points
aleksandrlevochkin Aug 9, 2023
37341c0
Merge branch 'master' of https://github.com/microsoft/azure-pipelines…
aleksandrlevochkin Aug 9, 2023
b302c28
Merge branch 'master' of https://github.com/microsoft/azure-pipelines…
aleksandrlevochkin Aug 9, 2023
7e8bc3d
Merge branch 'master' of https://github.com/microsoft/azure-pipelines…
aleksandrlevochkin Aug 9, 2023
9cf52a9
Resolve conflict in make-options
aleksandrlevochkin Aug 9, 2023
9f53c04
Merge branch 'master' into users/levochkin/migrate-docker-compose-v0
aleksandrlevochkin Aug 14, 2023
0370968
Merge branch 'master' into users/levochkin/migrate-docker-compose-v0
kirill-ivlev Aug 15, 2023
1394046
Override make.json with agent-base dependency
aleksandrlevochkin Aug 16, 2023
681bac9
Merge branch 'master' into users/levochkin/migrate-docker-compose-v0
aleksandrlevochkin Aug 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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Place files overridden for this config in this directory
983 changes: 983 additions & 0 deletions Tasks/DockerComposeV0/_buildConfigs/Node16/package-lock.json

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions Tasks/DockerComposeV0/_buildConfigs/Node16/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"dependencies": {
"@types/node": "^16.11.39",
"@types/mocha": "^5.2.7",
"@types/q": "^1.5.0",
"del": "2.2.0",
"azure-pipelines-task-lib": "4.4.0",
"azure-pipelines-tasks-docker-common": "2.225.0",
"esprima": "2.7.1",
"js-yaml": "3.13.1"
},
"devDependencies": {
"typescript": "4.0.2"
}
}
1 change: 1 addition & 0 deletions Tasks/DockerComposeV0/dockercomposebuild.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"use strict";

import * as tl from "azure-pipelines-task-lib/task";
import * as tr from "azure-pipelines-task-lib/toolrunner";
import DockerComposeConnection from "./dockercomposeconnection";
import * as sourceUtils from "azure-pipelines-tasks-docker-common/sourceutils";
import * as imageUtils from "azure-pipelines-tasks-docker-common/containerimageutils";
Expand Down
8 changes: 5 additions & 3 deletions Tasks/DockerComposeV0/dockercomposeconnection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export default class DockerComposeConnection extends ContainerConnection {
});
}

public async execCommandWithLogging(command: tr.ToolRunner, options?: tr.IExecOptions): Promise<string> {
public async execCommandWithLogging(command, options?: tr.IExecOptions): Promise<string> {
// setup variable to store the command output
let output = "";
command.on("stdout", data => {
Expand All @@ -85,9 +85,11 @@ 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
1 change: 1 addition & 0 deletions Tasks/DockerComposeV0/dockercomposedigests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import * as fs from "fs";
import * as tl from "azure-pipelines-task-lib/task";
import * as tr from "azure-pipelines-task-lib/toolrunner";
import * as yaml from "js-yaml";
import DockerComposeConnection from "./dockercomposeconnection";
import * as imageUtils from "azure-pipelines-tasks-docker-common/containerimageutils";
Expand Down
1 change: 1 addition & 0 deletions Tasks/DockerComposeV0/dockercomposepush.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"use strict";

import * as tl from "azure-pipelines-task-lib/task";
import * as tr from "azure-pipelines-task-lib/toolrunner";
aleksandrlevochkin marked this conversation as resolved.
Show resolved Hide resolved
import DockerComposeConnection from "./dockercomposeconnection";
import * as sourceUtils from "azure-pipelines-tasks-docker-common/sourceutils";
import * as imageUtils from "azure-pipelines-tasks-docker-common/containerimageutils";
Expand Down
Loading