From 879380dc583442cd1025223f3537fd531ab2a5ae Mon Sep 17 00:00:00 2001
From: Max Resnick <max@ofmax.li>
Date: Mon, 24 Nov 2025 07:08:49 -0800
Subject: feat: switch to buildx

---
 justfile            | 5 ++---
 src/base/Dockerfile | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/justfile b/justfile
index eb6f65e..70bbda4 100644
--- a/justfile
+++ b/justfile
@@ -21,7 +21,7 @@ build-container container:
     #!/usr/bin/env bash
     base_ver=$(cat src/base/VERSION)
     tag=$(cat src/{{container}}/VERSION)
-    docker build --build-arg BASE_VER=$base_ver -t {{registry_url}}/{{container}}:$tag -f src/{{container}}/Dockerfile src/{{container}}
+    docker buildx build --build-arg BASE_VER=$base_ver -t {{registry_url}}/{{container}}:$tag -f src/{{container}}/Dockerfile src/{{container}} --load
     echo "{{container}}/$tag has been built"
 
 # Push a single container
@@ -56,8 +56,7 @@ build-targets:
         for target in src/$container/targets/*; do
             target_name=$(basename $target)
             tag=$(cat src/$container/VERSION)
-            docker build --target $target_name -t {{registry_url}}/$container:$tag-$target_name -f src/$container/Dockerfile src/$container
-            docker build --target $target_name -t {{registry_url}}/$container:$target_name -f src/$container/Dockerfile src/$container
+            docker buildx build --target $target_name -t {{registry_url}}/$container:$tag-$target_name -t {{registry_url}}/$container:$target_name -f src/$container/Dockerfile src/$container --load
             echo "$container/$target_name/$tag has been built"
         done
     done
diff --git a/src/base/Dockerfile b/src/base/Dockerfile
index df82326..c2367ef 100644
--- a/src/base/Dockerfile
+++ b/src/base/Dockerfile
@@ -5,6 +5,7 @@ RUN useradd -s /usr/sbin/nologin \
             --home-dir /opt/app \
             app
 COPY bin/install_deb /usr/local/bin/install_deb
+RUN install_deb ca-certificates
 WORKDIR /opt/app
 
 FROM debian:sid-slim as sid-slim
@@ -14,12 +15,13 @@ RUN useradd -s /usr/sbin/nologin \
             --home-dir /opt/app \
             app
 COPY bin/install_deb /usr/local/bin/install_deb
+RUN install_deb ca-certificates
 WORKDIR /opt/app
 
 FROM bookworm-slim as bookworm-builder
 ENV DEBIAN_FRONTEND=noninteractive
 COPY bin/install_deb /usr/local/bin/install_deb
-RUN install_deb curl ca-certificates xz-utils gpg
+RUN install_deb curl ca-certificates xz-utils gpg git
 WORKDIR /opt/app
 
 FROM debian:bookworm-slim as finale
-- 
cgit v1.2.3