diff --git a/docker/Dockerfile.py313 b/docker/Dockerfile.py313 index bd0d0d60..0a8a7a85 100644 --- a/docker/Dockerfile.py313 +++ b/docker/Dockerfile.py313 @@ -32,6 +32,14 @@ RUN --mount=type=cache,target=/tmp/build --mount=type=bind,source=.,target=/opt/ FROM python:3.13-slim AS runner +RUN --mount=type=cache,target=/var/cache/apt \ + apt-get update && apt install -y \ + imagemagick \ + libmagic1 + COPY --from=builder /opt /opt -COPY --from=builder /*.whl /tmp -RUN pip3 install /tmp/*.whl && rm /tmp/*.whl +COPY --from=builder /savant_rs-*.whl /tmp +RUN SAVANT_RS_WHL=$(ls /tmp/savant_rs-*.whl | head -n 1) && \ + echo "SAVANT_RS_WHL=$SAVANT_RS_WHL" && \ + pip3 install $SAVANT_RS_WHL[clientsdk] && \ + rm $SAVANT_RS_WHL diff --git a/docker/Dockerfile.py314 b/docker/Dockerfile.py314 index 067ee15a..6e4ef23f 100644 --- a/docker/Dockerfile.py314 +++ b/docker/Dockerfile.py314 @@ -32,6 +32,21 @@ RUN --mount=type=cache,target=/tmp/build --mount=type=bind,source=.,target=/opt/ FROM python:3.14-slim AS runner +RUN --mount=type=cache,target=/var/cache/apt \ + apt-get update && apt install -y \ + imagemagick \ + libmagic1 \ + build-essential + COPY --from=builder /opt /opt -COPY --from=builder /*.whl /tmp -RUN pip3 install /tmp/*.whl && rm /tmp/*.whl +COPY --from=builder /savant_rs-*.whl /tmp +RUN SAVANT_RS_WHL=$(ls /tmp/savant_rs-*.whl | head -n 1) && \ + echo "SAVANT_RS_WHL=$SAVANT_RS_WHL" && \ + pip3 install $SAVANT_RS_WHL[clientsdk] && \ + rm $SAVANT_RS_WHL + +RUN --mount=type=cache,target=/var/cache/apt \ + apt remove -y build-essential && \ + apt autoremove -y && \ + apt clean && \ + rm -rf /var/lib/apt/lists/* diff --git a/savant_python/pyproject.toml b/savant_python/pyproject.toml index c95a30c9..e6055618 100644 --- a/savant_python/pyproject.toml +++ b/savant_python/pyproject.toml @@ -23,6 +23,8 @@ clientsdk = [ "opencv-python~=4.12.0" ] + + [tool.black] skip-string-normalization = true