summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElizabeth Hunt <me@liz.coffee>2025-07-20 19:34:22 -0700
committerElizabeth Hunt <me@liz.coffee>2025-07-20 19:35:55 -0700
commit7e36892315dc85739c163ddb518e0836667134de (patch)
tree687c4d0a0dbcaa05322dc9eefd7a3e8a9c5b80c1
parent11a24a2dfe8cdfc2a469c2f98720cde1c349e723 (diff)
downloadci-7e36892315dc85739c163ddb518e0836667134de.tar.gz
ci-7e36892315dc85739c163ddb518e0836667134de.zip
Add ca-certificates package
-rw-r--r--Dockerfile2
-rwxr-xr-xworker/scripts/build_docker_image.ts11
2 files changed, 3 insertions, 10 deletions
diff --git a/Dockerfile b/Dockerfile
index 46231bb..cd8c3ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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: {},