summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElizabeth Hunt <me@liz.coffee>2025-06-29 18:19:37 -0700
committerElizabeth Hunt <me@liz.coffee>2025-06-29 18:19:37 -0700
commitd30d765c0d9ede985ee0da5b71eb104e8aeaacf2 (patch)
tree18ac7bd48a48b9181efb99a9b9bc036182b1a1ed
parenta75c03954898d3fd5daa2a192ad1d87f910b3b65 (diff)
downloadci-d30d765c0d9ede985ee0da5b71eb104e8aeaacf2.tar.gz
ci-d30d765c0d9ede985ee0da5b71eb104e8aeaacf2.zip
Node Docker takes uid 1000new
-rw-r--r--worker/Dockerfile18
1 files changed, 11 insertions, 7 deletions
diff --git a/worker/Dockerfile b/worker/Dockerfile
index b87f0e5..e2d4ac0 100644
--- a/worker/Dockerfile
+++ b/worker/Dockerfile
@@ -15,19 +15,23 @@ RUN tar -xvzf /docker.tgz
# -- <ci_worker> --
FROM oci.liz.coffee/emprespresso/ci_base:release AS worker
-RUN apt-get update && apt-get install -yqq git jq
+RUN mkdir -p /var/lib/laminar/cfg
+RUN cp -r /app/worker/* /var/lib/laminar/cfg
+RUN chown -R 1000:1000 /var/lib/laminar
+
RUN groupadd docker
-RUN useradd --system --home-dir /var/lib/laminar \
- --no-user-group --groups users,docker --uid 1100 laminar
+
+# see: https://github.com/nodejs/docker-node/blame/89b29ef06b421598ec007605a2604ede0348b298/22/bullseye-slim/Dockerfile#L3-L4
+RUN usermod -a -d /var/lib/laminar -G docker node
+# RUN useradd --system --home-dir /var/lib/laminar \
+# --no-user-group --groups users,docker --uid 1000 laminar
COPY --from=worker_dependencies /bw /usr/local/bin/
COPY --from=worker_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 apt-get update && apt-get install -yqq git jq
-USER laminar
+USER node
WORKDIR /var/lib/laminar
EXPOSE 8080