namespace cache IDs by TARGETARCH

Gemfile.lock

@@ -13,7 +13,7 @@ GEM
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     json (2.12.2)
-    jwt (3.1.2)
+    jwt (3.1.1)
       base64
     ksuid (1.0.0)
     language_server-protocol (3.17.0.5)
@@ -102,7 +102,7 @@ GEM
       rack-protection (= 4.1.1)
       sinatra (= 4.1.1)
       tilt (~> 2.0)
-    sorbet-runtime (0.5.12210)
+    sorbet-runtime (0.5.12204)
     standard (1.50.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)

app.rb

@@ -12,8 +12,6 @@ require "securerandom"
 require "random/formatter"
 require "ulid"
 require "anyflake"
-require "cuid2"
-require "ksuid"
 
 require "jwt"
 
@@ -364,24 +362,6 @@ get "/snowflake" do
   end
 end
 
-get "/cuid2" do
-  n = params.fetch(:n, 1).to_i
-  stream do |out|
-    n.times do |_|
-      out << format("%s\n", Cuid2.generate)
-    end
-  end
-end
-
-get "/ksuid" do
-  n = params.fetch(:n, 1).to_i
-  stream do |out|
-    n.times do |_|
-      out << format("%s\n", KSUID.new)
-    end
-  end
-end
-
 post "/quit" do
   Process.kill("TERM", ppid)
   nil

dockerfiles/alpine.Dockerfile

@@ -1,5 +1,6 @@
 ARG RUBY_VERSION="3.4.4"
 ARG BASE_REGISTRY="docker.io"
+ARG TARGETARCH
 
 FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-alpine AS base
 
@@ -12,21 +13,28 @@ ENV RACK_ENV="production" \
 WORKDIR /kubernaut
 
 RUN \
-  apk update -q && \
+  --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 \
+  gem update --system --no-document; \
+  gem install -N bundler
+
 FROM base AS build
 
 RUN \
-  apk update -q && \
-  apk add musl-dev gcc make && \
+  --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
 
 COPY Gemfile Gemfile.lock ./
 
 RUN \
-  bundle install && \
-  rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
+  --mount=type=cache,id=usr-local-bundle-ruby-cache-${TARGETARCH},target=${BUNDLE_PATH}/ruby/3.4.0/cache,sharing=locked \
+  bundle install
 
 COPY . .
 
@@ -35,7 +43,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"
+ARG TARGETARCH
 
 FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS base
 
@@ -12,23 +13,36 @@ ENV RACK_ENV="production" \
 
 WORKDIR /kubernaut
 
+RUN rm -f /etc/apt/apt.conf.d/docker-clean
+
 RUN \
-  apt-get update -qq && \
-  apt-get install --yes --no-install-recommends libjemalloc2 && \
-  rm -rf /var/lib/apt/lists /var/cache/apt/archives
+  --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 \
+  libjemalloc2
+
+RUN \
+  --mount=type=cache,id=usr-local-bundle-cache-${TARGETARCH},target=${BUNDLE_PATH},sharing=locked \
+  gem update --system --no-document; \
+  gem install -N bundler
+
+ENV DEBIAN_FRONTEND="noninteractive"
 
 FROM base AS build
 
 RUN \
-  apt-get update -qq && \
-  apt-get install --yes --no-install-recommends build-essential && \
-  rm -rf /var/lib/apt/lists /var/cache/apt/archives
+  --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
 
 COPY Gemfile Gemfile.lock ./
 
 RUN \
-  bundle install && \
-  rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git
+  --mount=type=cache,id=usr-local-bundle-ruby-cache-${TARGETARCH},target=${BUNDLE_PATH}/ruby/3.4.0/cache,sharing=locked \
+  bundle install
 
 COPY . .
 
@@ -37,7 +51,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}"

kustomize/app/cronjob.yaml

@@ -1,19 +0,0 @@
-apiVersion: batch/v1
-kind: CronJob
-metadata:
-  name: kubernaut
-spec:
-  schedule: "* * * * *"
-  jobTemplate:
-    spec:
-      template:
-        spec:
-          containers:
-          - name: hello
-            image: busybox:1.37
-            imagePullPolicy: IfNotPresent
-            command:
-            - /bin/sh
-            - -c
-            - echo "=^.^= <(meow)"
-          restartPolicy: OnFailure

kustomize/app/kustomization.yaml

@@ -7,4 +7,3 @@ resources:
   - deployment.yaml
   - hpa.yaml
   - services.yaml
-  - cronjob.yaml