From f7797922027daed86d14c1128e2fa64202fb16dd Mon Sep 17 00:00:00 2001
From: Elizabeth Hunt <me@liz.coffee>
Date: Sat, 12 Jul 2025 16:10:58 -0700
Subject: Fix pipeline generator path, docker run in child container

---
 worker/Dockerfile | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'worker/Dockerfile')

diff --git a/worker/Dockerfile b/worker/Dockerfile
index 51129b2..396f73b 100644
--- a/worker/Dockerfile
+++ b/worker/Dockerfile
@@ -7,9 +7,6 @@ RUN apt-get update && apt-get install -yqq unzip curl
 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
 # -- </worker_dependencies> --
 
 # -- <ci_worker> --
@@ -17,23 +14,20 @@ FROM oci.liz.coffee/emprespresso/ci_base:release AS worker
 
 RUN apt-get update && apt-get install -yqq git jq
 
-RUN chmod +x /app/worker/dist/scripts/*.js
 ENV PIPELINE_PATH=/app/worker/dist/scripts
+RUN chmod +x /app/worker/dist/scripts/*
 
 RUN mkdir -p /var/lib/laminar/cfg
 RUN cp -r /app/worker/jobs /var/lib/laminar/cfg
 RUN chown -R 1000:1000 /var/lib/laminar
 
-RUN groupadd docker
-
+RUN curl -fsSL https://get.docker.com | sh
 # 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 chmod -v a+s /usr/local/bin/docker # give access to run docker binary as sid
 
 USER node
 WORKDIR /var/lib/laminar
-- 
cgit v1.2.3-70-g09d2