Skip to content

Keep Docker dependency cache between jobs #1508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skyfallwastaken merged 4 commits into from
Aug 4, 2026
+11 −27
Merged

Keep Docker dependency cache between jobs #1508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99c43b8
Keep JavaScript dependencies in the build cache
skyfallwastaken Aug 3, 2026
8cc9f22
Merge branch 'main' into fix-docker-publish-cache
skyfallwastaken Aug 4, 2026
d3d7dfa
Keep frontend dependencies read-only
skyfallwastaken Aug 4, 2026
a9b7d75
Re-generate cache
skyfallwastaken Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ jobs:
- name: Setup Blacksmith Builder
uses: useblacksmith/setup-docker-builder@v2
with:
cache-key: hackatime/v2/${{ matrix.dockerfile }}
cache-key: hackatime/v3/${{ matrix.dockerfile }}
nofallback: true

- name: Build ${{ matrix.dockerfile }}
Expand All @@ -155,7 +155,7 @@ jobs:
- name: Setup Blacksmith Builder
uses: useblacksmith/setup-docker-builder@v2
with:
cache-key: hackatime/v2/Dockerfile
cache-key: hackatime/v3/Dockerfile
nofallback: true

- name: Log in to GitHub Container Registry
Expand Down
34 changes: 9 additions & 25 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,31 +61,20 @@ RUN apt-get update -qq && \
# in parallel with the Ruby dependency stage.
FROM frontend-base AS javascript-dependencies

ARG TARGETARCH

COPY package.json bun.lock bunfig.toml ./
COPY patches patches
RUN --mount=type=cache,id=hackatime-javascript-dependencies-${TARGETARCH},target=/rails/.deps \
--mount=type=cache,target=/root/.bun/install/cache \
rm -rf .deps/patches && \
cp package.json bun.lock bunfig.toml .deps/ && \
cp -a patches .deps/patches && \
cd .deps && \
RUN --mount=type=cache,target=/root/.bun/install/cache \
bun i --frozen-lockfile --linker=isolated && \
cd .. && \
touch .deps-ready
mkdir -p node_modules/.vite-client node_modules/.vite-ssr node_modules/.vite-temp

RUN --mount=type=cache,id=hackatime-javascript-dependencies-${TARGETARCH},target=/rails/.deps \
ln -s .deps/node_modules node_modules && \
cp node_modules/@fontsource-variable/spline-sans/files/spline-sans-latin-wght-normal.woff2 /tmp/spline-sans-latin-wght-normal.woff2 && \
RUN cp node_modules/@fontsource-variable/spline-sans/files/spline-sans-latin-wght-normal.woff2 /tmp/spline-sans-latin-wght-normal.woff2 && \
woff2_decompress /tmp/spline-sans-latin-wght-normal.woff2 && \
install -Dm644 /tmp/spline-sans-latin-wght-normal.ttf vendor/fonts/spline-sans-latin-wght-normal.ttf

# Sharp ships one libvips binary with its codecs. Ruby Vips loads the same ABI.
FROM javascript-dependencies AS libvips

RUN --mount=type=cache,id=hackatime-javascript-dependencies-${TARGETARCH},target=/rails/.deps \
mkdir /libvips && \
RUN mkdir /libvips && \
cp node_modules/@img/sharp-libvips-linux-*/lib/libvips-cpp.so.* /libvips/libvips-cpp.so

# Prepare the runtime concurrently with dependency and asset compilation.
Expand Down Expand Up @@ -129,15 +118,11 @@ COPY --exclude=blume.config.ts --exclude=docs . .
# invalidate nor delay documentation generation.
FROM ruby-base AS docs-assets

ARG TARGETARCH

COPY package.json blume.config.ts theme.css ./
COPY config/themes.yml config/themes.yml
COPY public public
COPY docs docs
COPY --from=javascript-dependencies /rails/.deps-ready /rails/.deps-ready
RUN --mount=type=cache,id=hackatime-javascript-dependencies-${TARGETARCH},target=/rails/.deps \
ln -s .deps/node_modules node_modules && \
RUN --mount=type=bind,from=javascript-dependencies,source=/rails/node_modules,target=/rails/node_modules,rw \
bun run build:docs

# Generate route helpers before the two asset branches start.
Expand Down Expand Up @@ -169,8 +154,6 @@ RUN --network=none \
# Rails controllers, helpers, and views in addition to the JavaScript source.
FROM ruby-base AS frontend-assets

ARG TARGETARCH

COPY app/javascript app/javascript
COPY app/assets/tailwind app/assets/tailwind
COPY app/controllers app/controllers
Expand All @@ -182,11 +165,12 @@ COPY svelte.config.js ./
COPY tsconfig.json tsconfig.node.json ./
COPY vite.config.ts ./
COPY --from=route-helpers /rails/app/javascript/api app/javascript/api
COPY --from=javascript-dependencies /rails/.deps-ready /rails/.deps-ready

RUN --mount=type=cache,id=hackatime-javascript-dependencies-${TARGETARCH},target=/rails/.deps \
RUN --mount=type=bind,from=javascript-dependencies,source=/rails/node_modules,target=/rails/node_modules \
--mount=type=cache,target=/rails/node_modules/.vite-client \
--mount=type=cache,target=/rails/node_modules/.vite-ssr \
--mount=type=tmpfs,target=/rails/node_modules/.vite-temp \
--mount=type=cache,target=/root/.bun/install/cache \
ln -s .deps/node_modules node_modules && \
(VITE_CACHE_DIR=node_modules/.vite-client bun x --bun vite build & \
client_pid=$!; \
VITE_CACHE_DIR=node_modules/.vite-ssr bun x --bun vite build --ssr & \
Expand Down