simplify the Dockerfiles

- remove the caching, it's more trouble than it's worth
- use '&&' instead of ';', so it fails earlier

docker-bake.hcl

@@ -9,6 +9,10 @@ target "_common" {
     args = {
         RUBY_VERSION = "3.4.4"
     }
+    platforms = [
+        "linux/amd64",
+        "linux/arm64",
+    ]
 }
 
 target "bookworm" {

dockerfiles/alpine.Dockerfile

@@ -1,5 +1,6 @@
 ARG RUBY_VERSION="3.4.4"
 ARG BASE_REGISTRY="docker.io"
+
 FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-alpine AS base
 
 ENV RACK_ENV="production" \
@@ -11,28 +12,21 @@ ENV RACK_ENV="production" \
 WORKDIR /kubernaut
 
 RUN \
-  --mount=type=cache,id=var-cache-apk,target=/var/cache/apk,sharing=locked \
+  apk update -q && \
-  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 \
-  --mount=type=cache,id=var-cache-apk,target=/var/cache/apk,sharing=locked \
+  apk update -q && \
-  apk update -q; \
+  apk add musl-dev gcc make && \
-  apk add musl-dev gcc make; \
   apk add bash jemalloc
 
 COPY Gemfile Gemfile.lock ./
 
 RUN \
-  --mount=type=cache,id=usr-local-bundle-ruby-cache,target=${BUNDLE_PATH}/ruby/3.4.0/cache,sharing=locked \
+  bundle install && \
-  bundle install
+  rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
 
 COPY . .
 
@@ -41,7 +35,7 @@ FROM base
 ENV PORT=4567
 
 RUN \
-  addgroup --system --gid 666 kubernaut; \
+  addgroup --system --gid 666 kubernaut && \
   adduser --system --uid 666 --ingroup kubernaut --shell /bin/bash --disabled-password kubernaut
 
 COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"

dockerfiles/bookworm.Dockerfile

@@ -1,6 +1,7 @@
 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
 
 ENV RACK_ENV="production" \
@@ -11,36 +12,23 @@ ENV RACK_ENV="production" \
 
 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 \
+  apt-get update -qq && \
-  --mount=type=cache,id=var-lib-apt,target=/var/lib/apt,sharing=locked \
+  apt-get install --yes --no-install-recommends libjemalloc2 && \
-  apt-get update -qq; \
+  rm -rf /var/lib/apt/lists /var/cache/apt/archives
-  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 \
-  --mount=type=cache,id=var-cache-apt,target=/var/cache/apt,sharing=locked \
+  apt-get update -qq && \
-  --mount=type=cache,id=var-lib-apt,target=/var/lib/apt,sharing=locked \
+  apt-get install --yes --no-install-recommends build-essential && \
-  apt-get update -qq; \
+  rm -rf /var/lib/apt/lists /var/cache/apt/archives
-  apt-get install --yes --no-install-recommends \
-  build-essential
 
 COPY Gemfile Gemfile.lock ./
 
 RUN \
-  --mount=type=cache,id=usr-local-bundle-ruby-cache,target=${BUNDLE_PATH}/ruby/3.4.0/cache,sharing=locked \
+  bundle install && \
-  bundle install
+  rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
 
 COPY . .
 
@@ -49,7 +37,7 @@ FROM base
 ENV PORT=4567
 
 RUN \
-  groupadd --system --gid 666 kubernaut; \
+  groupadd --system --gid 666 kubernaut && \
   useradd --system --uid 666 --gid kubernaut --create-home --shell /bin/bash kubernaut
 
 COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"