From 533cea3b267f575cf18e0151dc99cf859145725e Mon Sep 17 00:00:00 2001
From: Ryan Cavicchioni <ryan@cavi.cc>
Date: Sat, 28 Jun 2025 14:03:55 -0500
Subject: [PATCH] namespace cache IDs by TARGETARCH

---
 dockerfiles/alpine.Dockerfile   | 13 +++++++++----
 dockerfiles/bookworm.Dockerfile | 15 ++++++++++-----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/dockerfiles/alpine.Dockerfile b/dockerfiles/alpine.Dockerfile
index b630a7e..cd3502d 100644
--- a/dockerfiles/alpine.Dockerfile
+++ b/dockerfiles/alpine.Dockerfile
@@ -1,7 +1,10 @@
 ARG RUBY_VERSION="3.4.4"
 ARG BASE_REGISTRY="docker.io"
+
 FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-alpine AS base
 
+ARG TARGETARCH
+
 ENV RACK_ENV="production" \
   BUNDLE_DEPLOYMENT=true \
   BUNDLE_PATH="/usr/local/bundle" \
@@ -11,19 +14,21 @@ ENV RACK_ENV="production" \
 WORKDIR /kubernaut
 
 RUN \
-  --mount=type=cache,id=var-cache-apk,target=/var/cache/apk,sharing=locked \
+  --mount=type=cache,id=var-cache-apk-${TARGETARCH},target=/var/cache/apk,sharing=locked \
   apk update -q; \
   apk add bash jemalloc
 
 RUN \
-  --mount=type=cache,id=usr-local-bundle-cache,target=${BUNDLE_PATH},sharing=locked \
+  --mount=type=cache,id=usr-local-bundle-cache-${TARGETARCH},target=${BUNDLE_PATH},sharing=locked \
   gem update --system --no-document; \
   gem install -N bundler
 
 FROM base AS build
 
+ARG TARGETARCH
+
 RUN \
-  --mount=type=cache,id=var-cache-apk,target=/var/cache/apk,sharing=locked \
+  --mount=type=cache,id=var-cache-apk-${TARGETARCH},target=/var/cache/apk,sharing=locked \
   apk update -q; \
   apk add musl-dev gcc make; \
   apk add bash jemalloc
@@ -31,7 +36,7 @@ RUN \
 COPY Gemfile Gemfile.lock ./
 
 RUN \
-  --mount=type=cache,id=usr-local-bundle-ruby-cache,target=${BUNDLE_PATH}/ruby/3.4.0/cache,sharing=locked \
+  --mount=type=cache,id=usr-local-bundle-ruby-cache-${TARGETARCH},target=${BUNDLE_PATH}/ruby/3.4.0/cache,sharing=locked \
   bundle install
 
 COPY . .
diff --git a/dockerfiles/bookworm.Dockerfile b/dockerfiles/bookworm.Dockerfile
index 69345a4..87260a0 100644
--- a/dockerfiles/bookworm.Dockerfile
+++ b/dockerfiles/bookworm.Dockerfile
@@ -1,8 +1,11 @@
 ARG RUBY_VERSION="3.4.4"
 ARG BASE_REGISTRY="docker.io"
 ARG DEBIAN_VERSION="bookworm"
+
 FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS base
 
+ARG TARGETARCH
+
 ENV RACK_ENV="production" \
   BUNDLE_DEPLOYMENT=true \
   BUNDLE_PATH="/usr/local/bundle" \
@@ -14,14 +17,14 @@ 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-cache-apt-${TARGETARCH},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 \
-  --mount=type=cache,id=usr-local-bundle-cache,target=${BUNDLE_PATH},sharing=locked \
+  --mount=type=cache,id=usr-local-bundle-cache-${TARGETARCH},target=${BUNDLE_PATH},sharing=locked \
   gem update --system --no-document; \
   gem install -N bundler
 
@@ -29,9 +32,11 @@ ENV DEBIAN_FRONTEND="noninteractive"
 
 FROM base AS build
 
+ARG TARGETARCH
+
 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 \
+  --mount=type=cache,id=var-cache-apt-${TARGETARCH},target=/var/cache/apt,sharing=locked \
+  --mount=type=cache,id=var-lib-apt-${TARGETARCH},target=/var/lib/apt,sharing=locked \
   apt-get update -qq; \
   apt-get install --yes --no-install-recommends \
   build-essential
@@ -39,7 +44,7 @@ RUN \
 COPY Gemfile Gemfile.lock ./
 
 RUN \
-  --mount=type=cache,id=usr-local-bundle-ruby-cache,target=${BUNDLE_PATH}/ruby/3.4.0/cache,sharing=locked \
+  --mount=type=cache,id=usr-local-bundle-ruby-cache-${TARGETARCH},target=${BUNDLE_PATH}/ruby/3.4.0/cache,sharing=locked \
   bundle install
 
 COPY . .