diff options
| author | Elizabeth Hunt <me@liz.coffee> | 2025-07-20 15:00:03 -0700 |
|---|---|---|
| committer | Elizabeth Hunt <me@liz.coffee> | 2025-07-20 15:27:42 -0700 |
| commit | 2e10e9172f8528868b70886335dbbe20f932f702 (patch) | |
| tree | 373ee281d1219ee9d3cdd1bf6900e130bd91c20d /worker/Dockerfile | |
| parent | fb6b516abfc74ae2158d451c62dda4fc29038b22 (diff) | |
| download | ci-2e10e9172f8528868b70886335dbbe20f932f702.tar.gz ci-2e10e9172f8528868b70886335dbbe20f932f702.zip | |
Fix joinRight, dockerfile optimizations, failure joining
Diffstat (limited to 'worker/Dockerfile')
| -rw-r--r-- | worker/Dockerfile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/worker/Dockerfile b/worker/Dockerfile index 71e2ecf..0dfd816 100644 --- a/worker/Dockerfile +++ b/worker/Dockerfile @@ -1,12 +1,14 @@ # -- <worker_dependencies> -- FROM debian:stable-slim AS worker_dependencies -ARG BITWARDEN_VERSION=2025.4.0 RUN apt-get update && apt-get install -yqq unzip curl +ARG BITWARDEN_VERSION=2025.4.0 RUN curl -L -o /bw-linux.zip "https://github.com/bitwarden/clients/releases/download/cli-v${BITWARDEN_VERSION}/bw-linux-${BITWARDEN_VERSION}.zip" RUN unzip /bw-linux.zip -d / \ && chmod +x /bw + +COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/ # -- </worker_dependencies> -- # -- <ci_worker> -- @@ -22,18 +24,17 @@ RUN cp -r /app/worker/jobs /var/lib/laminar/cfg # see: https://github.com/nodejs/docker-node/blame/89b29ef06b421598ec007605a2604ede0348b298/22/bullseye-slim/Dockerfile#L3-L4 RUN chown -R node:node /var/lib/laminar -RUN curl -fsSL https://get.docker.com | sh - # adding a user to only the group"docker" doesn't deterministically give it access to the # docker socket of the host. # e.g. host has /etc/groups: docker:995, container has /etc/groups: docker:996 # because i'm likely the only one to ever touch this, and i FORCE "docker" to be 996, this will # be hardcoded defaulting to 995. ARG DOCKER_GID="995" # but it may be overridden via this `DOCKER_GID` build arg. -RUN groupmod -g ${DOCKER_GID} docker -RUN usermod -a -d /var/lib/laminar -G docker node +RUN groupadd -g ${DOCKER_GID} docker +RUN usermod -a -d /var/lib/laminar -G docker node COPY --from=worker_dependencies /bw /usr/local/bin/ +COPY --from=worker_dependencies /usr/local/bin/docker /usr/local/bin/ USER node WORKDIR /var/lib/laminar |