From a54a46b0a67972fd6d801a79e5b749fbac572e32 Mon Sep 17 00:00:00 2001
From: Ryan Cavicchioni <ryan@cavi.cc>
Date: Mon, 5 May 2025 22:18:04 -0500
Subject: [PATCH] use Docker cache mount for apt

---
 dockerfiles/bookworm.Dockerfile | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/dockerfiles/bookworm.Dockerfile b/dockerfiles/bookworm.Dockerfile
index 5859e4a..e645021 100644
--- a/dockerfiles/bookworm.Dockerfile
+++ b/dockerfiles/bookworm.Dockerfile
@@ -5,10 +5,16 @@ FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS base
 
 WORKDIR /kubernaut
 
+RUN rm -f /etc/apt/apt.conf.d/docker-clean
+
+RUN \
+  --mount=type=cache,id=var-cache-apt,target=/var/cache/apt,sharing=locked \
+  --mount=type=cache,id=var-lib-apt,target=/var/lib/apt,sharing=locked \
+  apt-get update -qq; \
+  apt-get install --yes --no-install-recommends \
+  libjemalloc2
+
 RUN <<EOT
-  apt-get update -qq
-  apt-get install --yes --no-install-recommends libjemalloc2
-  rm -rf /var/lib/apt/lists /var/cache/apt/archives
   gem update --system --no-document
   gem install -N bundler
 EOT
@@ -23,11 +29,12 @@ ENV DEBIAN_FRONTEND="noninteractive"
 
 FROM base AS build
 
-RUN <<EOT
-  apt-get update -qq
-  apt-get install --yes --no-install-recommends gcc make libc-dev
-  rm -rf /var/lib/apt/lists /var/cache/apt/archives
-EOT
+RUN \
+  --mount=type=cache,id=var-cache-apt,target=/var/cache/apt,sharing=locked \
+  --mount=type=cache,id=var-lib-apt,target=/var/lib/apt,sharing=locked \
+  apt-get update -qq; \
+  apt-get install --yes --no-install-recommends \
+  build-essential
 
 COPY Gemfile Gemfile.lock ./