From 013d7088b42751b0d6541e5c26238d535ad1074d Mon Sep 17 00:00:00 2001 From: Matthew Martin Date: Mon, 6 Apr 2026 19:48:28 -0400 Subject: [PATCH 1/3] docker works with uv now --- Dockerfile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 491782c..2a31373 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,16 @@ -FROM python:3.11 +FROM python:3.14 RUN useradd --user-group bagit-tester RUN install -d -o bagit-tester /bagit -USER bagit-tester WORKDIR /bagit +COPY pyproject.toml /bagit/pyproject.toml COPY .git/ /bagit/.git/ -COPY *.rst *.py /bagit/ +COPY *.rst /bagit/ +COPY src/ /bagit/src/ +COPY test.py /bagit/ COPY test-data /bagit/test-data/ -CMD [ "python", "setup.py", "test" ] +COPY utils/ /bagit/ +RUN pip install --upgrade pip && pip install uv && uv sync --all-extras +RUN mkdir /home/bagit-tester/ && mkdir /home/bagit-tester/.cache && mkdir /home/bagit-tester/.cache/uv +RUN chown bagit-tester /home/bagit-tester/.cache/uv +USER bagit-tester +CMD [ "uv", "run", "pytest" ] From 126b0d02b1ba6c36e886ee408391de13467dbb84 Mon Sep 17 00:00:00 2001 From: Matthew Martin Date: Wed, 8 Apr 2026 19:27:05 -0400 Subject: [PATCH 2/3] Remove pip, switch to uv base image --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2a31373..f601960 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.14 +FROM ghcr.io/astral-sh/uv:0.11.5-python3.14-trixie RUN useradd --user-group bagit-tester RUN install -d -o bagit-tester /bagit WORKDIR /bagit @@ -9,8 +9,9 @@ COPY src/ /bagit/src/ COPY test.py /bagit/ COPY test-data /bagit/test-data/ COPY utils/ /bagit/ -RUN pip install --upgrade pip && pip install uv && uv sync --all-extras -RUN mkdir /home/bagit-tester/ && mkdir /home/bagit-tester/.cache && mkdir /home/bagit-tester/.cache/uv +ENV UV_LINK_MODE=copy +RUN mkdir /home/bagit-tester/ && mkdir /home/bagit-tester/.cache && mkdir /home/bagit-tester/.cache/uv && \ + apt-get update && apt-get install dos2unix -y && find test-data -name 'README' |xargs dos2unix RUN chown bagit-tester /home/bagit-tester/.cache/uv USER bagit-tester CMD [ "uv", "run", "pytest" ] From d6c7e40d0d0307b4c4cd64fe9843e82b550a7508 Mon Sep 17 00:00:00 2001 From: Matthew Martin Date: Wed, 8 Apr 2026 19:32:23 -0400 Subject: [PATCH 3/3] Merge run commands --- Dockerfile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index f601960..ba6cdc7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ghcr.io/astral-sh/uv:0.11.5-python3.14-trixie -RUN useradd --user-group bagit-tester -RUN install -d -o bagit-tester /bagit +RUN useradd --user-group bagit-tester && \ + install -d -o bagit-tester /bagit WORKDIR /bagit COPY pyproject.toml /bagit/pyproject.toml COPY .git/ /bagit/.git/ @@ -10,8 +10,12 @@ COPY test.py /bagit/ COPY test-data /bagit/test-data/ COPY utils/ /bagit/ ENV UV_LINK_MODE=copy -RUN mkdir /home/bagit-tester/ && mkdir /home/bagit-tester/.cache && mkdir /home/bagit-tester/.cache/uv && \ - apt-get update && apt-get install dos2unix -y && find test-data -name 'README' |xargs dos2unix -RUN chown bagit-tester /home/bagit-tester/.cache/uv +RUN mkdir /home/bagit-tester/ && \ + mkdir /home/bagit-tester/.cache && \ + mkdir /home/bagit-tester/.cache/uv && \ + apt-get update && \ + apt-get install dos2unix -y && \ + find test-data -name 'README' | xargs dos2unix && \ + chown bagit-tester /home/bagit-tester/.cache/uv USER bagit-tester CMD [ "uv", "run", "pytest" ]