Move to debian since @bitwarden/cli doesn't work on musl :(

2 files changed, 31 insertions, 15 deletions

diff --git a/Dockerfile b/Dockerfile
index 4b94b21..f524dee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,31 @@
-FROM docker.io/library/alpine:3 AS laminar
+FROM docker.io/library/debian:stable AS laminar
+ENV DEBIAN_FRONTEND=noninteractive
+RUN useradd --system --home-dir /var/lib/laminar --no-user-group --groups users --uid 100 laminar
+RUN rm -rf /etc/cron.d/e2scrub_all
 
-RUN apk add boost-dev build-base capnproto capnproto-dev cmake \
-    git ninja rapidjson-dev sqlite-dev zlib zlib-dev
-ADD --keep-git-dir https://github.com/ohwgiles/laminar.git \
-    /opt/laminar/src
-RUN cmake -B /opt/laminar/build -S /opt/laminar/src -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \
-    && cmake --build /opt/laminar/build \
-    && cmake --install /opt/laminar/build --strip
+RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
+    build-essential \
+    capnproto \
+    cmake \
+    git \
+    libboost-dev \
+    libcapnp-dev \
+    libsqlite3-dev \
+    ninja-build \
+    pkg-config \
+    rapidjson-dev \
+    zlib1g-dev
 
-FROM denoland/deno:alpine AS liz-ci
+ADD --keep-git-dir https://github.com/ohwgiles/laminar.git /opt/laminar/src
 
-RUN apk add --no-cache capnproto sqlite-libs zlib curl
+RUN cmake -B /opt/laminar/build -S /opt/laminar/src -G Ninja  \
+    -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr && \
+    cmake --build /opt/laminar/build && \
+    cmake --install /opt/laminar/build --strip
+
+FROM denoland/deno:debian AS liz-ci
+
+RUN apt-get update -yqq && apt-get install libcapnp-0.9.2 libsqlite3-0 zlib1g
 COPY --from=laminar /usr/sbin/laminard /usr/sbin/laminard
 COPY --from=laminar /usr/bin/laminarc /usr/bin/laminarc
 COPY --from=laminar /usr/share/man/man8/laminard.8.gz /usr/share/man/man8/laminard.8.gz
diff --git a/worker/Dockerfile b/worker/Dockerfile
index e3a8f7b..ba6716f 100644
--- a/worker/Dockerfile
+++ b/worker/Dockerfile
@@ -1,17 +1,18 @@
 FROM oci.liz.coffee/img/liz-ci:release as worker
 
-RUN addgroup docker
-RUN adduser -SDh /var/lib/laminar -g 'Laminar' -G users -G docker laminar
+RUN groupadd docker
+RUN useradd --system --home-dir /var/lib/laminar \
+    --no-user-group --groups users,docker --uid 100 laminar
 
 # Secret retrieval
-RUN apk add nodejs npm jq
+RUN apt install -yqq npm
 RUN npm install -g @bitwarden/cli
 
 # Image building / publishing jobs
-RUN apk add docker-cli
+RUN apt install -yqq docker-cli
 
 # Ansible playbooks
-RUN apk add ansible-core openssh
+RUN apt install -yqq ansible-core openssh-client
 
 USER laminar
 WORKDIR /var/lib/laminar