namespace cache IDs by TARGETARCH

This commit is contained in:
2025-06-28 14:03:55 -05:00
parent 653167adb5
commit 9d730100b3
2 changed files with 18 additions and 7 deletions

View File

@ -1,7 +1,10 @@
ARG RUBY_VERSION="3.4.4" ARG RUBY_VERSION="3.4.4"
ARG BASE_REGISTRY="docker.io" ARG BASE_REGISTRY="docker.io"
FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-alpine AS base FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-alpine AS base
ARG TARGETARCH
ENV RACK_ENV="production" \ ENV RACK_ENV="production" \
BUNDLE_DEPLOYMENT=true \ BUNDLE_DEPLOYMENT=true \
BUNDLE_PATH="/usr/local/bundle" \ BUNDLE_PATH="/usr/local/bundle" \
@ -11,7 +14,7 @@ ENV RACK_ENV="production" \
WORKDIR /kubernaut WORKDIR /kubernaut
RUN \ 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 update -q; \
apk add bash jemalloc apk add bash jemalloc
@ -22,8 +25,10 @@ RUN \
FROM base AS build FROM base AS build
ARG TARGETARCH
RUN \ 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 update -q; \
apk add musl-dev gcc make; \ apk add musl-dev gcc make; \
apk add bash jemalloc apk add bash jemalloc
@ -31,7 +36,7 @@ RUN \
COPY Gemfile Gemfile.lock ./ COPY Gemfile Gemfile.lock ./
RUN \ 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 bundle install
COPY . . COPY . .

View File

@ -1,8 +1,11 @@
ARG RUBY_VERSION="3.4.4" ARG RUBY_VERSION="3.4.4"
ARG BASE_REGISTRY="docker.io" ARG BASE_REGISTRY="docker.io"
ARG DEBIAN_VERSION="bookworm" ARG DEBIAN_VERSION="bookworm"
FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS base FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS base
ARG TARGETARCH
ENV RACK_ENV="production" \ ENV RACK_ENV="production" \
BUNDLE_DEPLOYMENT=true \ BUNDLE_DEPLOYMENT=true \
BUNDLE_PATH="/usr/local/bundle" \ BUNDLE_PATH="/usr/local/bundle" \
@ -14,7 +17,7 @@ WORKDIR /kubernaut
RUN rm -f /etc/apt/apt.conf.d/docker-clean RUN rm -f /etc/apt/apt.conf.d/docker-clean
RUN \ 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 \ --mount=type=cache,id=var-lib-apt,target=/var/lib/apt,sharing=locked \
apt-get update -qq; \ apt-get update -qq; \
apt-get install --yes --no-install-recommends \ apt-get install --yes --no-install-recommends \
@ -27,11 +30,14 @@ RUN \
ENV DEBIAN_FRONTEND="noninteractive" ENV DEBIAN_FRONTEND="noninteractive"
FROM base AS build FROM base AS build
ARG TARGETARCH
RUN \ 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 \ --mount=type=cache,id=var-lib-apt-${TARGETARCH},target=/var/lib/apt,sharing=locked \
apt-get update -qq; \ apt-get update -qq; \
apt-get install --yes --no-install-recommends \ apt-get install --yes --no-install-recommends \
build-essential build-essential
@ -39,7 +45,7 @@ RUN \
COPY Gemfile Gemfile.lock ./ COPY Gemfile Gemfile.lock ./
RUN \ 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 bundle install
COPY . . COPY . .