summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElizabeth Alexander Hunt <me@liz.coffee>2025-05-10 21:43:03 -0700
committerElizabeth Alexander Hunt <me@liz.coffee>2025-05-10 21:43:03 -0700
commit4727077f08ad818341973528abf66d732c3b1c12 (patch)
tree426f792be465d4119c723712b5a786acd5063d1a
parent8e14c8eff79047d5b2671b979d2e632e8b1b1718 (diff)
downloadci-4727077f08ad818341973528abf66d732c3b1c12.tar.gz
ci-4727077f08ad818341973528abf66d732c3b1c12.zip
Set executable bits
-rwxr-xr-x[-rw-r--r--]hooks/mod.ts0
-rw-r--r--worker/Dockerfile7
-rwxr-xr-x[-rw-r--r--]worker/jobs/checkout_ci.run0
-rwxr-xr-x[-rw-r--r--]worker/scripts/ansible_playbook0
-rwxr-xr-x[-rw-r--r--]worker/scripts/build_image0
-rwxr-xr-x[-rw-r--r--]worker/scripts/fetch_code0
-rwxr-xr-x[-rw-r--r--]worker/scripts/run_pipeline0
7 files changed, 3 insertions, 4 deletions
diff --git a/hooks/mod.ts b/hooks/mod.ts
index ef44d25..ef44d25 100644..100755
--- a/hooks/mod.ts
+++ b/hooks/mod.ts
diff --git a/worker/Dockerfile b/worker/Dockerfile
index fbb8e7b..2f76af5 100644
--- a/worker/Dockerfile
+++ b/worker/Dockerfile
@@ -1,14 +1,11 @@
-# Builder stage for Bitwarden CLI
FROM debian:stable-slim AS bw-builder
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
-# Final image
FROM oci.liz.coffee/img/liz-ci:release AS worker
-# Image building / publishing jobs
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 \
@@ -18,9 +15,11 @@ RUN apt-get update && apt-get install -yqq ca-certificates curl \
&& useradd --system --home-dir /var/lib/laminar \
--no-user-group --groups users,docker --uid 100 laminar
-# Copy Bitwarden from builder stage
COPY --from=bw-builder /tmp/bw /usr/local/bin/
+RUN ln -sf /app/worker/jobs /var/lib/laminar/jobs
+RUN ln -sf /app/worker/scripts /var/lib/laminar/scripts
+
USER laminar
WORKDIR /var/lib/laminar
EXPOSE 8080
diff --git a/worker/jobs/checkout_ci.run b/worker/jobs/checkout_ci.run
index 278a5b3..278a5b3 100644..100755
--- a/worker/jobs/checkout_ci.run
+++ b/worker/jobs/checkout_ci.run
diff --git a/worker/scripts/ansible_playbook b/worker/scripts/ansible_playbook
index a85995b..a85995b 100644..100755
--- a/worker/scripts/ansible_playbook
+++ b/worker/scripts/ansible_playbook
diff --git a/worker/scripts/build_image b/worker/scripts/build_image
index 7107224..7107224 100644..100755
--- a/worker/scripts/build_image
+++ b/worker/scripts/build_image
diff --git a/worker/scripts/fetch_code b/worker/scripts/fetch_code
index d45f6db..d45f6db 100644..100755
--- a/worker/scripts/fetch_code
+++ b/worker/scripts/fetch_code
diff --git a/worker/scripts/run_pipeline b/worker/scripts/run_pipeline
index ad58573..ad58573 100644..100755
--- a/worker/scripts/run_pipeline
+++ b/worker/scripts/run_pipeline