use Docker cache mount for apk

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
         "vscode": {
             "extensions": [
                 "Shopify.ruby-lsp",
-                "ms-azuretools.vscode-docker"
+                "docker.docker"
             ]
         }
     },

dockerfiles/alpine.Dockerfile

@@ -1,34 +1,38 @@
 ARG RUBY_VERSION="3.4.3"
-FROM docker.io/library/ruby:${RUBY_VERSION}-alpine AS base
-
-WORKDIR /kubernaut
-
-RUN <<EOT
-  apk update -q
-  apk add bash jemalloc
-  rm -rf /var/cache/apk
-  gem update --system --no-document
-  gem install -N bundler
-EOT
+ARG BASE_REGISTRY="docker.io"
+FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-alpine AS base
 
 ENV RACK_ENV="production" \
   BUNDLE_DEPLOYMENT=true \
   BUNDLE_PATH="/usr/local/bundle" \
-  BUNDLE_WITHOUT="development test"
+  BUNDLE_WITHOUT="development test" \
+  RUBY_YJIT_ENABLE=true
+
+WORKDIR /kubernaut
+
+RUN \
+  --mount=type=cache,id=var-cache-apk,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 \
+  gem update --system --no-document; \
+  gem install -N bundler
 
 FROM base AS build
 
-RUN <<EOT
-  apk add musl-dev gcc make
-  rm -rf /var/cache/apk
-EOT
+RUN \
+  --mount=type=cache,id=var-cache-apk,target=/var/cache/apk,sharing=locked \
+  apk update -q; \
+  apk add musl-dev gcc make; \
+  apk add bash jemalloc
 
 COPY Gemfile Gemfile.lock ./
 
-RUN <<EOT
+RUN \
+  --mount=type=cache,id=usr-local-bundle-ruby-cache,target=${BUNDLE_PATH}/ruby/3.4.0/cache,sharing=locked \
   bundle install
-  rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
-EOT
 
 COPY . .
 

dockerfiles/bookworm.Dockerfile

@@ -1,35 +1,46 @@
 ARG RUBY_VERSION="3.4.3"
-FROM docker.io/library/ruby:${RUBY_VERSION}-slim-bookworm AS base
-
-WORKDIR /kubernaut
-
-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
+ARG BASE_REGISTRY="docker.io"
+ARG DEBIAN_VERSION="bookworm"
+FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS base
 
 ENV RACK_ENV="production" \
   BUNDLE_DEPLOYMENT=true \
   BUNDLE_PATH="/usr/local/bundle" \
-  BUNDLE_WITHOUT="development test"
+  BUNDLE_WITHOUT="development test" \
+  RUBY_YJIT_ENABLE=true
+
+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 \
+  --mount=type=cache,id=usr-local-bundle-cache,target=${BUNDLE_PATH},sharing=locked \
+  gem update --system --no-document; \
+  gem install -N bundler
+
+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 ./
 
-RUN <<EOT
+RUN \
+  --mount=type=cache,id=usr-local-bundle-ruby-cache,target=${BUNDLE_PATH}/ruby/3.4.0/cache,sharing=locked \
   bundle install
-  rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
-EOT
 
 COPY . .