From 1190718e984aeb8b5e3538bf62a08a44eb0363dc Mon Sep 17 00:00:00 2001 From: phil Date: Wed, 25 Jun 2025 14:47:11 +0200 Subject: [PATCH 1/5] Use local images --- .woodpecker/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index ef00013..a5de771 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -21,7 +21,7 @@ steps: from_secret: registry_password sync: - image: ghcr.io/astral-sh/uv:python3.13-alpine + image: code.philo.ydns.eu/philorg/uv volumes: - uv-cache:/uv-cache environment: @@ -31,7 +31,7 @@ steps: - uv sync build: - image: ghcr.io/astral-sh/uv:python3.13-alpine + image: code.philo.ydns.eu/philorg/uv volumes: - uv-cache:/uv-cache environment: @@ -42,7 +42,7 @@ steps: - uv cache prune --ci push_python: - image: ghcr.io/astral-sh/uv:python3.13-alpine + image: code.philo.ydns.eu/philorg/uv environment: OWNER: philorg REGISTRY_URL: https://code.philo.ydns.eu From e5e6c029fa9a89d8997f8de3c9af6e7154f894f5 Mon Sep 17 00:00:00 2001 From: phil Date: Wed, 25 Jun 2025 14:57:16 +0200 Subject: [PATCH 2/5] AAdd access to git in Containerfile --- Containerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 0c139a6..17e619d 100644 --- a/Containerfile +++ b/Containerfile @@ -7,6 +7,8 @@ COPY . /app # Sync the project into a new environment, using the frozen lockfile WORKDIR /app -RUN --mount=from=ghcr.io/astral-sh/uv:alpine,source=/usr/local/bin/uv,target=/bin/uv uv pip install --system . +RUN --mount=from=code.philorg.ydns.eu/uv:alpine,source=/usr/local/bin/uv,target=/bin/uv \ + --mount=from=code.philorg.ydns.eu/uv:alpine,source=/usr/bin/git,target=/bin/git \ + uv pip install --system . ENTRYPOINT ["foo"] From 9a948fde8ebc842de874546e37af5a4b9eff501b Mon Sep 17 00:00:00 2001 From: phil Date: Wed, 25 Jun 2025 15:00:40 +0200 Subject: [PATCH 3/5] Fix --- Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index 17e619d..4c34d3b 100644 --- a/Containerfile +++ b/Containerfile @@ -7,8 +7,8 @@ COPY . /app # Sync the project into a new environment, using the frozen lockfile WORKDIR /app -RUN --mount=from=code.philorg.ydns.eu/uv:alpine,source=/usr/local/bin/uv,target=/bin/uv \ - --mount=from=code.philorg.ydns.eu/uv:alpine,source=/usr/bin/git,target=/bin/git \ +RUN --mount=from=code.philorg.ydns.eu/philorg/uv:alpine,source=/usr/local/bin/uv,target=/bin/uv \ + --mount=from=code.philorg.ydns.eu/philorg/uv:alpine,source=/usr/bin/git,target=/bin/git \ uv pip install --system . ENTRYPOINT ["foo"] From d1c9bc1c0177bf614a8f34dd4883bd3df776d17e Mon Sep 17 00:00:00 2001 From: phil Date: Wed, 25 Jun 2025 15:33:43 +0200 Subject: [PATCH 4/5] Ficx --- Containerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index 4c34d3b..f875859 100644 --- a/Containerfile +++ b/Containerfile @@ -4,11 +4,13 @@ FROM docker.io/python:alpine COPY . /app -# Sync the project into a new environment, using the frozen lockfile WORKDIR /app -RUN --mount=from=code.philorg.ydns.eu/philorg/uv:alpine,source=/usr/local/bin/uv,target=/bin/uv \ - --mount=from=code.philorg.ydns.eu/philorg/uv:alpine,source=/usr/bin/git,target=/bin/git \ +# Sync the project into a new environment, using the frozen lockfile +RUN \ + --mount=from=code.philo.ydns.eu/philorg/uv,source=/usr/local/bin/uv,target=/bin/uv \ + --mount=from=code.philo.ydns.eu/philorg/uv,source=/usr/lib/libpcre2-8.so.0,target=/usr/lib/libpcre2-8.so.0 \ + --mount=from=code.philo.ydns.eu/philorg/uv,source=/usr/bin/git,target=/usr/bin/git \ uv pip install --system . ENTRYPOINT ["foo"] From 763e9aa70bf1bdfb5826c9e3718f4aa2e5ef2ba6 Mon Sep 17 00:00:00 2001 From: phil Date: Wed, 25 Jun 2025 15:37:29 +0200 Subject: [PATCH 5/5] Rename container --- .woodpecker/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index a5de771..f328164 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -11,7 +11,7 @@ steps: image: code.philo.ydns.eu/philorg/woodpecker-buildah settings: registry: code.philo.ydns.eu - repository: philorg/test-woodpecker + repository: philorg/test-woodpecker-python tags: ${CI_COMMIT_SHA} architectures: amd64 context: Containerfile