From a81546374d29cb532cfa5d7b6bf5fec46b09f696 Mon Sep 17 00:00:00 2001
From: Jade Ellis <jade@ellis.link>
Date: Wed, 10 Sep 2025 16:40:55 +0100
Subject: [PATCH] ci: Make timelord docker work locally

---
 .forgejo/workflows/release-image.yml | 14 ++------------
 docker/Dockerfile                    | 13 ++++++-------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/.forgejo/workflows/release-image.yml b/.forgejo/workflows/release-image.yml
index 22571b90..8505aa18 100644
--- a/.forgejo/workflows/release-image.yml
+++ b/.forgejo/workflows/release-image.yml
@@ -152,17 +152,6 @@ jobs:
       - uses: ./.forgejo/actions/timelord
         id: timelord
 
-      - name: Copy timelord cache to workspace
-        shell: bash
-        run: |
-          mkdir -p ./timelord
-          if [ -d "${{ steps.timelord.outputs.database-path }}" ]; then
-            cp -r "${{ steps.timelord.outputs.database-path }}"/* ./timelord/
-            echo "Copied timelord cache to workspace"
-          else
-            echo "No timelord cache to copy"
-          fi
-
       - name: Cache Rust registry
         if: ${{ env.BUILDKIT_ENDPOINT == '' }}
         uses: actions/cache@v3
@@ -210,7 +199,8 @@ jobs:
                 "id": "cargo-target-${{ matrix.target_cpu }}-${{ matrix.slug }}-${{ matrix.profile }}"
               },
               "var-cache-apt-${{ matrix.slug }}": "/var/cache/apt",
-              "var-lib-apt-${{ matrix.slug }}": "/var/lib/apt"
+              "var-lib-apt-${{ matrix.slug }}": "/var/lib/apt",
+              "{{ steps.timelord.outputs.database-path }}":"/timelord"
             }
           skip-extraction: ${{ steps.cache.outputs.cache-hit }}
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4cb750e4..185c6d6c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -53,6 +53,8 @@ ENV BINSTALL_VERSION=1.13.0
 ENV CARGO_SBOM_VERSION=0.9.1
 # renovate: datasource=crate depName=lddtree
 ENV LDDTREE_VERSION=0.3.7
+# renovate: datasource=crate depName=timelord-cli
+ENV TIMELORD_VERSION=3.0.1
 
 # Install unpackaged tools
 RUN <<EOF
@@ -60,7 +62,7 @@ RUN <<EOF
     curl --retry 5 -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
     cargo binstall --no-confirm cargo-sbom --version $CARGO_SBOM_VERSION
     cargo binstall --no-confirm lddtree --version $LDDTREE_VERSION
-    cargo binstall --no-confirm timelord-cli@3.0.1
+    cargo binstall --no-confirm timelord-cli --version $TIMELORD_VERSION
 EOF
 
 # Set up xx (cross-compilation scripts)
@@ -136,12 +138,9 @@ FROM toolchain AS builder
 COPY . .
 
 # Restore timestamps from timelord cache if available
-RUN if [ -f /app/timelord/timelord.db ]; then \
-        echo "Restoring timestamps from timelord cache"; \
-        timelord sync --source-dir /app --cache-dir /app/timelord; \
-    else \
-        echo "No timelord cache found, timestamps will be build time"; \
-    fi
+RUN --mount=type=cache,target=/timelord/ \
+    echo "Restoring timestamps from timelord cache"; \
+    timelord sync --source-dir /app --cache-dir /timelord;
 
 ARG TARGETPLATFORM