diff options
| -rwxr-xr-x | worker/scripts/build_docker_image.ts | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/worker/scripts/build_docker_image.ts b/worker/scripts/build_docker_image.ts index 3ca5646..8bac77d 100755 --- a/worker/scripts/build_docker_image.ts +++ b/worker/scripts/build_docker_image.ts @@ -58,17 +58,20 @@ await LogMetricTraceable.ofLogTraceable(_logJob) .map(async (tEitherJobVault) => { tEitherJobVault.trace.trace('logging into the wegistwy uwu~'); const eitherJobVault = await tEitherJobVault.get(); - const eitherDockerRegistryLoginItem = await eitherJobVault.flatMapAsync(({ job, key, vault }) => - vault - .fetchSecret<LoginItem>(tEitherJobVault, key, job.arguments.registry) - .finally(() => vault.lock(tEitherJobVault, key)), + const eitherDockerRegistryLoginItem = await eitherJobVault.flatMapAsync( + ({ job, key, vault }) => vault.fetchSecret<LoginItem>(tEitherJobVault, key, job.arguments.registry), + // .finally(() => vault.lock(tEitherJobVault, key)), ); return eitherDockerRegistryLoginItem.flatMapAsync(({ login }) => eitherJobVault.flatMapAsync(async ({ job }) => { const loginCommand = getDockerLoginCommand(login.username, job.arguments.registry); const eitherLoggedIn = await tEitherJobVault .move(loginCommand) - .map((tLoginCmd) => getStdout(tLoginCmd, { env: { REGISTRY_PASSWORD: login.password } })) + .map((tLoginCmd) => + getStdout(tLoginCmd, { + env: { REGISTRY_PASSWORD: login.password }, + }), + ) .get(); return eitherLoggedIn.moveRight(job); }), @@ -85,6 +88,7 @@ await LogMetricTraceable.ofLogTraceable(_logJob) getStdout(tBuildCmd, { env: {}, clearEnv: true, + streamTraceable: ['stdout', 'stderr'], }), ) .get(), @@ -107,7 +111,7 @@ await LogMetricTraceable.ofLogTraceable(_logJob) const eitherWithBuiltImage = await tEitherWithBuiltImage.get(); return eitherWithBuiltImage .mapRight(({ job }) => tEitherWithBuiltImage.move(getPushCommand(job.arguments))) - .flatMapAsync((tPushCommand) => getStdout(tPushCommand)); + .flatMapAsync((tPushCommand) => getStdout(tPushCommand, { streamTraceable: ['stdout', 'stderr'] })); }) .map(async (tEitherJob) => { const eitherJob = await tEitherJob.get(); |