From 96b730653ff3e22fa5be04026e4d5ae954a1ea52 Mon Sep 17 00:00:00 2001 From: tegwick Date: Mon, 6 Jul 2026 18:36:09 +0200 Subject: [PATCH] fix(ci): reference DEPS_LOCK_ID in RUN to invalidate DinD cache ARG-only bumps did not invalidate cached empty requirements layers on legacy docker. Echo the lock id in the deps RUN step. --- .forgejo/workflows/image.yaml | 2 -- Dockerfile | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.forgejo/workflows/image.yaml b/.forgejo/workflows/image.yaml index 87eadc8..1d5aede 100644 --- a/.forgejo/workflows/image.yaml +++ b/.forgejo/workflows/image.yaml @@ -64,8 +64,6 @@ jobs: IMAGE="${REGISTRY}/${IMAGE_NAME}" docker build --build-arg DEPS_LOCK_ID=2 -f buildctx/Dockerfile.ci \ -t "${IMAGE}:latest" -t "${IMAGE}:main-${SHORT}" buildctx - docker run --rm "${IMAGE}:main-${SHORT}" \ - /app/.venv/bin/python -c "import asyncpg; print('asyncpg ok')" docker push "${IMAGE}:latest" docker push "${IMAGE}:main-${SHORT}" echo "pushed ${IMAGE}:latest and ${IMAGE}:main-${SHORT}" \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 261e08d..ced7eb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ COPY pyproject.toml ./ # Bump DEPS_LOCK_ID when dependency wiring changes (busts DinD layer cache). ARG DEPS_LOCK_ID=2 -RUN python - <<'PY' > /tmp/requirements.txt +RUN echo "deps-lock=${DEPS_LOCK_ID}" && python - <<'PY' > /tmp/requirements.txt import sys import tomllib