coulomb/state-hub
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(ci): single RUN for deps + uv install on legacy DinD
All checks were successful
CI Smoke / host-smoke (push) Successful in 0s
Details
CI Smoke / container-smoke (push) Successful in 14s
Details
Build and Publish Multi-Context Image / build-and-push (push) Successful in 1m2s
Details

Browse source 
Legacy docker cannot chain shell after heredoc and does not persist
/tmp between RUN steps. Use python -c and one RUN for requirements
generation and venv install.
This commit is contained in:
tegwick 2026-07-06 18:44:21 +02:00
parent 3a7fe235b1
commit d1a4fcffa9
2 changed files with 7 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.forgejo/workflows/image.yaml
View file

@ -65,7 +65,7 @@ jobs:
export PATH="${HOME}/bin:${PATH}"
echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY}" -u "${REGISTRY_USER}" --password-stdin
IMAGE="${REGISTRY}/${IMAGE_NAME}"
docker build --build-arg DEPS_LOCK_ID=4 -f buildctx/Dockerfile.ci \
docker build --build-arg DEPS_LOCK_ID=5 -f buildctx/Dockerfile.ci \
-t "${IMAGE}:latest" -t "${IMAGE}:main-${SHORT}" buildctx
docker push "${IMAGE}:latest"
docker push "${IMAGE}:main-${SHORT}"

36
Dockerfile
View file

@ -14,36 +14,12 @@ RUN apt-get update \
COPY pyproject.toml ./
# Bump DEPS_LOCK_ID when dependency wiring changes (busts DinD layer cache).
ARG DEPS_LOCK_ID=4
RUN echo "deps-lock=${DEPS_LOCK_ID}" && python - <<'PY'
import sys
import tomllib
from pathlib import Path
with open("pyproject.toml", "rb") as f:
project = tomllib.load(f)["project"]
deps = project.get("dependencies") or []
if not deps:
sys.exit("pyproject.toml has no dependencies")
skip = {"llm-connect", "hub-core"}
lines = [
dep
for dep in deps
if dep not in skip
]
if not lines:
sys.exit("no installable dependencies after filter")
req_path = Path("/app/requirements.txt")
req_path.write_text("\n".join(lines) + "\n", encoding="utf-8")
if req_path.stat().st_size == 0:
sys.exit("requirements.txt is empty")
print(f"wrote {len(lines)} requirements to {req_path}")
PY
RUN uv venv /app/.venv \
ARG DEPS_LOCK_ID=5
RUN echo "deps-lock=${DEPS_LOCK_ID}" \
&& python -c "import tomllib,sys; from pathlib import Path; project=tomllib.load(open('pyproject.toml','rb'))['project']; deps=[d for d in (project.get('dependencies') or []) if d not in {'llm-connect','hub-core'}]; \
sys.exit('no installable dependencies') if not deps else None; Path('/app/requirements.txt').write_text('\\n'.join(deps)+'\\n'); print(f'wrote {len(deps)} requirements')" \
&& test -s /app/requirements.txt \
&& uv venv /app/.venv \
&& uv pip install --python /app/.venv/bin/python --no-cache -r /app/requirements.txt
COPY --from=hub_core_src pyproject.toml /tmp/hub-core/pyproject.toml