From 5a9186380619e959ad87f3990f8b2c324b4462d8 Mon Sep 17 00:00:00 2001
From: Elizabeth Alexander Hunt <me@liz.coffee>
Date: Sat, 10 May 2025 18:53:56 -0700
Subject: NPM is huuuge on debian. Just download the native release of
 bitwarden.

---
 worker/Dockerfile           | 9 ++++++---
 worker/jobs/checkout_ci.run | 5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/worker/Dockerfile b/worker/Dockerfile
index ba6716f..9597f83 100644
--- a/worker/Dockerfile
+++ b/worker/Dockerfile
@@ -5,11 +5,14 @@ RUN useradd --system --home-dir /var/lib/laminar \
     --no-user-group --groups users,docker --uid 100 laminar
 
 # Secret retrieval
-RUN apt install -yqq npm
-RUN npm install -g @bitwarden/cli
+RUN apt install -yqq unzip
+ADD https://github.com/bitwarden/clients/releases/download/cli-v2025.4.0/bw-linux-2025.4.0.zip /tmp/bw-linux.zip
+RUN unzip /tmp/bw-linux.zip
+RUN mv bw /usr/local/bin
+RUN rm /tmp/bw-linux.zip
 
 # Image building / publishing jobs
-RUN apt install -yqq docker-cli
+RUN apt install -yqq docker-ce-cli
 
 # Ansible playbooks
 RUN apt install -yqq ansible-core openssh-client
diff --git a/worker/jobs/checkout_ci.run b/worker/jobs/checkout_ci.run
index d47697d..278a5b3 100644
--- a/worker/jobs/checkout_ci.run
+++ b/worker/jobs/checkout_ci.run
@@ -5,6 +5,7 @@
 set -e
 
 RUN=`date +%s`
+CWD=`$PWD`
 WORKING_DIR=`$PWD/$RUN`
 
 mkdir -p "$WORKING_DIR" && cd "$WORKING_DIR"
@@ -34,6 +35,6 @@ docker run --rm \
   /pipeline \
   > "$WORKING_DIR/pipeline.json"
 
-rm -rf tmpsrc
-
 pipeline="$WORKING_DIR/pipeline.json" run_pipeline
+
+cd "$CWD" && rm -rf "$WORKING_DIR"
-- 
cgit v1.2.3-70-g09d2