diff options
| author | Elizabeth Alexander Hunt <me@liz.coffee> | 2025-05-11 15:36:49 -0700 |
|---|---|---|
| committer | Elizabeth Alexander Hunt <me@liz.coffee> | 2025-05-11 16:17:23 -0700 |
| commit | b241180aa85ad81f4ee0dca9bf3c0429916a6a18 (patch) | |
| tree | 91bac564261b210517297daf3e4937e11e4001aa /worker/Dockerfile | |
| parent | aff695a1ff160d9e3045fbdf832c95db732c0f89 (diff) | |
| download | ci-b241180aa85ad81f4ee0dca9bf3c0429916a6a18.tar.gz ci-b241180aa85ad81f4ee0dca9bf3c0429916a6a18.zip | |
Significantly improve traceability and minor fixes.
Diffstat (limited to 'worker/Dockerfile')
| -rw-r--r-- | worker/Dockerfile | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/worker/Dockerfile b/worker/Dockerfile index 342feeb..94b1a3a 100644 --- a/worker/Dockerfile +++ b/worker/Dockerfile @@ -1,26 +1,30 @@ -FROM debian:stable-slim AS bw-builder +FROM debian:stable-slim AS cli-dependencies + +# Define versions as build arguments to improve caching +ARG BITWARDEN_VERSION=2025.4.0 RUN apt-get update && apt-get install -yqq unzip curl -RUN curl -L -o /tmp/bw-linux.zip https://github.com/bitwarden/clients/releases/download/cli-v2025.4.0/bw-linux-2025.4.0.zip \ - && unzip /tmp/bw-linux.zip -d /tmp \ - && chmod +x /tmp/bw + +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 + +RUN curl -L "https://get.docker.com/builds/$(uname -s)/$(uname -m)/docker-latest.tgz" > /docker.tgz +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 curl \ - && curl "https://get.docker.com/builds/`uname -s`/`uname -m`/docker-latest.tgz" > docker.tgz \ - && tar -xvzf docker.tgz \ - && mv docker/* /usr/local/bin \ - && rm -rf docke* \ - && groupadd docker \ - && useradd --system --home-dir /var/lib/laminar \ +RUN apt-get update && apt-get install -yqq ca-certificates +RUN groupadd docker +RUN useradd --system --home-dir /var/lib/laminar \ --no-user-group --groups users,docker --uid 100 laminar -COPY --from=bw-builder /tmp/bw /usr/local/bin/ +COPY --from=cli-dependencies /bw /usr/local/bin/ +COPY --from=cli-dependencies /docker/* /usr/local/bin/ RUN mkdir -p /var/lib/laminar/cfg RUN chown -R laminar /var/lib/laminar -RUN ln -sf /app/worker/jobs /var/lib/laminar/cfg/jobs && \ - ln -sf /app/worker/scripts /var/lib/laminar/cfg/scripts +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 |