summaryrefslogtreecommitdiff
path: root/worker
diff options
context:
space:
mode:
authorElizabeth Alexander Hunt <me@liz.coffee>2025-05-11 16:20:45 -0700
committerElizabeth Alexander Hunt <me@liz.coffee>2025-05-11 16:29:37 -0700
commit30729a0cf707d9022bae0a7baaba77379dc31fd5 (patch)
tree078f54b38de7fa1c5cc3c1fc8887bb292896cbfb /worker
parentb241180aa85ad81f4ee0dca9bf3c0429916a6a18 (diff)
downloadci-30729a0cf707d9022bae0a7baaba77379dc31fd5.tar.gz
ci-30729a0cf707d9022bae0a7baaba77379dc31fd5.zip
Use closure over trace id instead of initializing it every log line.
Fix laminar ownership :(
Diffstat (limited to 'worker')
-rw-r--r--worker/Dockerfile5
1 files changed, 2 insertions, 3 deletions
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