get output from local-docker
parent
9e5ebff23a
commit
1771726c36
|
|
@ -3607,21 +3607,13 @@ class LocalDockerCloudRunner {
|
|||
branchName,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
defaultSecretsArray) { }
|
||||
runTask(buildGuid, image, commands,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
mountdir,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
workingdir,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
environment,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
secrets) {
|
||||
runTask(buildGuid, image, commands, mountdir, workingdir, environment, secrets) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
cloud_runner_logger_1.default.log(buildGuid);
|
||||
cloud_runner_logger_1.default.log(commands);
|
||||
const { workspace, actionFolder } = model_1.Action;
|
||||
let myOutput = '';
|
||||
yield docker_1.default.run(image, Object.assign({ workspace, actionFolder }, cloud_runner_1.default.buildParameters), false, commands, {
|
||||
yield docker_1.default.run(image, Object.assign(Object.assign(Object.assign({ workspace, actionFolder }, cloud_runner_1.default.buildParameters), secrets), environment), false, commands, {
|
||||
listeners: {
|
||||
stdout: (data) => {
|
||||
myOutput += data.toString();
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -49,13 +49,9 @@ class LocalDockerCloudRunner implements ProviderInterface {
|
|||
buildGuid: string,
|
||||
image: string,
|
||||
commands: string,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
mountdir: string,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
workingdir: string,
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
environment: CloudRunnerEnvironmentVariable[],
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
secrets: CloudRunnerSecret[],
|
||||
): Promise<string> {
|
||||
CloudRunnerLogger.log(buildGuid);
|
||||
|
|
@ -63,16 +59,22 @@ class LocalDockerCloudRunner implements ProviderInterface {
|
|||
|
||||
const { workspace, actionFolder } = Action;
|
||||
let myOutput = '';
|
||||
await Docker.run(image, { workspace, actionFolder, ...CloudRunner.buildParameters }, false, commands, {
|
||||
listeners: {
|
||||
stdout: (data: Buffer) => {
|
||||
myOutput += data.toString();
|
||||
},
|
||||
stderr: (data: Buffer) => {
|
||||
myOutput += `[ERROR]${data.toString()}`;
|
||||
await Docker.run(
|
||||
image,
|
||||
{ workspace, actionFolder, ...CloudRunner.buildParameters, ...secrets, ...environment },
|
||||
false,
|
||||
commands,
|
||||
{
|
||||
listeners: {
|
||||
stdout: (data: Buffer) => {
|
||||
myOutput += data.toString();
|
||||
},
|
||||
stderr: (data: Buffer) => {
|
||||
myOutput += `[ERROR]${data.toString()}`;
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
);
|
||||
|
||||
return myOutput;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue