From 30729a0cf707d9022bae0a7baaba77379dc31fd5 Mon Sep 17 00:00:00 2001
From: Elizabeth Alexander Hunt <me@liz.coffee>
Date: Sun, 11 May 2025 16:20:45 -0700
Subject: Use closure over trace id instead of initializing it every log line.
 Fix laminar ownership :(

---
 hooks/mod.ts      | 3 ++-
 worker/Dockerfile | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hooks/mod.ts b/hooks/mod.ts
index 8771bea..f858ad0 100755
--- a/hooks/mod.ts
+++ b/hooks/mod.ts
@@ -9,10 +9,11 @@ import {
 
 const getRequestLogger = (req: Request) => {
   const url = new URL(req.url);
+  const traceId = crypto.randomUUID();
   const getPrefix = () =>
     `[${
       new Date().toISOString()
-    }] RequestTrace=[${crypto.randomUUID()}] @ [${url.pathname}] -X [${req.method}] |`;
+    }] RequestTrace=[${traceId}] @ [${url.pathname}] -X [${req.method}] |`;
   return loggerWithPrefix(getPrefix);
 };
 
diff --git a/worker/Dockerfile b/worker/Dockerfile
index 94b1a3a..ea393ed 100644
--- a/worker/Dockerfile
+++ b/worker/Dockerfile
@@ -13,7 +13,7 @@ RUN tar -xvzf /docker.tgz
 
 FROM oci.liz.coffee/img/liz-ci:release AS worker
 
-RUN apt-get update && apt-get install -yqq ca-certificates
+RUN apt-get update && apt-get install -yqq git jq
 RUN groupadd docker
 RUN useradd --system --home-dir /var/lib/laminar \
     --no-user-group --groups users,docker --uid 100 laminar
@@ -22,9 +22,8 @@ COPY --from=cli-dependencies /bw /usr/local/bin/
 COPY --from=cli-dependencies /docker/* /usr/local/bin/
 
 RUN mkdir -p /var/lib/laminar/cfg
+RUN cp -r /app/worker/* /var/lib/laminar/cfg
 RUN chown -R laminar /var/lib/laminar
-RUN ln -sf /app/worker/jobs /var/lib/laminar/cfg/jobs
-RUN ln -sf /app/worker/scripts /var/lib/laminar/cfg/scripts
 
 USER laminar
 WORKDIR /var/lib/laminar
-- 
cgit v1.2.3-70-g09d2