get output from local-docker

pull/461/head
Frostebite 2022-09-19 02:12:28 +01:00
parent 9e5ebff23a
commit 1771726c36
3 changed files with 17 additions and 23 deletions

12
dist/index.js vendored
View File

@ -3607,21 +3607,13 @@ class LocalDockerCloudRunner {
branchName, branchName,
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
defaultSecretsArray) { } defaultSecretsArray) { }
runTask(buildGuid, image, commands, runTask(buildGuid, image, commands, mountdir, workingdir, environment, secrets) {
// 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) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
cloud_runner_logger_1.default.log(buildGuid); cloud_runner_logger_1.default.log(buildGuid);
cloud_runner_logger_1.default.log(commands); cloud_runner_logger_1.default.log(commands);
const { workspace, actionFolder } = model_1.Action; const { workspace, actionFolder } = model_1.Action;
let myOutput = ''; 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: { listeners: {
stdout: (data) => { stdout: (data) => {
myOutput += data.toString(); myOutput += data.toString();

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -49,13 +49,9 @@ class LocalDockerCloudRunner implements ProviderInterface {
buildGuid: string, buildGuid: string,
image: string, image: string,
commands: string, commands: string,
// eslint-disable-next-line no-unused-vars
mountdir: string, mountdir: string,
// eslint-disable-next-line no-unused-vars
workingdir: string, workingdir: string,
// eslint-disable-next-line no-unused-vars
environment: CloudRunnerEnvironmentVariable[], environment: CloudRunnerEnvironmentVariable[],
// eslint-disable-next-line no-unused-vars
secrets: CloudRunnerSecret[], secrets: CloudRunnerSecret[],
): Promise<string> { ): Promise<string> {
CloudRunnerLogger.log(buildGuid); CloudRunnerLogger.log(buildGuid);
@ -63,16 +59,22 @@ class LocalDockerCloudRunner implements ProviderInterface {
const { workspace, actionFolder } = Action; const { workspace, actionFolder } = Action;
let myOutput = ''; let myOutput = '';
await Docker.run(image, { workspace, actionFolder, ...CloudRunner.buildParameters }, false, commands, { await Docker.run(
listeners: { image,
stdout: (data: Buffer) => { { workspace, actionFolder, ...CloudRunner.buildParameters, ...secrets, ...environment },
myOutput += data.toString(); false,
}, commands,
stderr: (data: Buffer) => { {
myOutput += `[ERROR]${data.toString()}`; listeners: {
stdout: (data: Buffer) => {
myOutput += data.toString();
},
stderr: (data: Buffer) => {
myOutput += `[ERROR]${data.toString()}`;
},
}, },
}, },
}); );
return myOutput; return myOutput;
} }