diff options
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rwxr-xr-x | worker/scripts/build_docker_image.ts | 11 |
2 files changed, 3 insertions, 10 deletions
@@ -28,7 +28,7 @@ RUN cmake -B /opt/laminar/build -S /opt/laminar/src -G Ninja \ FROM node:22-slim AS ci_base RUN apt-get update -yqq && apt-get install -yqq libcapnp-0.9.2 \ - libsqlite3-0 zlib1g curl bash + libsqlite3-0 zlib1g curl bash ca-certificates COPY --from=laminar_bin /usr/sbin/laminard /usr/sbin/laminard COPY --from=laminar_bin /usr/bin/laminarc /usr/bin/laminarc COPY --from=laminar_bin /usr/share/man/man8/laminard.8.gz /usr/share/man/man8/laminard.8.gz diff --git a/worker/scripts/build_docker_image.ts b/worker/scripts/build_docker_image.ts index dfb78e8..648d662 100755 --- a/worker/scripts/build_docker_image.ts +++ b/worker/scripts/build_docker_image.ts @@ -78,16 +78,9 @@ await LogMetricTraceable.ofLogTraceable(_logJob) .map(async (tEitherWithAuthdRegistryBuildJob) => { const eitherWithAuthdRegistryBuildJob = await tEitherWithAuthdRegistryBuildJob.get(); tEitherWithAuthdRegistryBuildJob.trace.trace('finally building the image~ (◕ᴗ◕✿)'); - const context = await eitherWithAuthdRegistryBuildJob.flatMapAsync((job) => - getPathOnHost(path.join(process.cwd(), job.arguments.context)), - ); - const buildJobArgs = eitherWithAuthdRegistryBuildJob.joinRight(context, (context, job) => ({ - ...job.arguments, - context, - })); - const eitherBuiltImage = await buildJobArgs.flatMapAsync((buildJobArgs) => + const eitherBuiltImage = await eitherWithAuthdRegistryBuildJob.flatMapAsync(({ arguments: args }) => tEitherWithAuthdRegistryBuildJob - .move(getBuildCommand(buildJobArgs)) + .move(getBuildCommand(args)) .map((tBuildCmd) => getStdout(tBuildCmd, { env: {}, |