From b9c790326a2497e051dc775bc8a1aa3a5c595e16 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Wed, 24 Sep 2025 03:20:34 +0000
Subject: [PATCH] docker: Consolidate distro package fetches in base builder
 image.

Signed-off-by: Jason Volk <jason@zemos.net>
---
 docker/Dockerfile.complement | 28 +---------------------------
 docker/bake.hcl              |  6 +++++-
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/docker/Dockerfile.complement b/docker/Dockerfile.complement
index 33a71666..f5acbffc 100644
--- a/docker/Dockerfile.complement
+++ b/docker/Dockerfile.complement
@@ -1,22 +1,6 @@
 # syntax = docker/dockerfile:1.11-labs
 
-FROM input AS key-gen-base
-ARG var_cache
-ARG var_lib_apt
-
-WORKDIR /
-COPY --link --from=input . .
-
-RUN \
---mount=type=cache,dst=/var/cache,id=${var_cache},sharing=locked \
---mount=type=cache,dst=/var/lib/apt,id=${var_lib_apt},sharing=locked \
-<<EOF
-    set -eux
-    apt-get -y -U install --no-install-recommends openssl gawk
-EOF
-
-
-FROM key-gen-base AS key-gen
+FROM input AS key-gen
 
 WORKDIR /complement
 COPY <<EOF v3.ext
@@ -156,16 +140,6 @@ ARG complement_tags="conduwuit_blacklist"
 ARG complement_tests="./tests/..."
 ARG complement_run=".*"
 
-WORKDIR /
-RUN \
---mount=type=cache,dst=/var/cache,id=${var_cache},sharing=locked \
---mount=type=cache,dst=/var/lib/apt,id=${var_lib_apt},sharing=locked \
---mount=type=cache,dst=/go/pkg/mod/cache,sharing=locked \
-<<EOF
-    set -eux
-    apt-get -y -U install --no-install-recommends golang-go jq
-EOF
-
 WORKDIR /usr/src
 ADD https://github.com/matrix-construct/complement.git#403840348f6bcc9cc8ed1671dc2f638c2b1ce4ac complement
 
diff --git a/docker/bake.hcl b/docker/bake.hcl
index a547a6d1..cb0303e6 100644
--- a/docker/bake.hcl
+++ b/docker/bake.hcl
@@ -408,7 +408,7 @@ target "complement-base" {
         elem("complement-config", [sys_name, sys_version, sys_target])
     ]
     contexts = {
-        input = elem("target:base", [sys_name, sys_version, sys_target])
+        input = elem("target:builder", [sys_name, sys_version, sys_target])
     }
     args = complement_args
 }
@@ -1611,11 +1611,15 @@ kitchen_packages = [
     "clang",
     "cmake",
     "curl",
+    "gawk",
     "git",
+    "golang-go",
     "gzip",
+    "jq",
     "libc6-dev",
     "libssl-dev",
     "make",
+    "openssl",
     "pkg-config",
     "pkgconf",
     "xz-utils",