From 5c27a26e785f83c733bcb48be1c4bbe632ffc4e5 Mon Sep 17 00:00:00 2001 From: phil Date: Thu, 5 Dec 2024 18:59:55 +0100 Subject: [PATCH] Update registry and containers for CI --- .forgejo/workflows/test_and_build.yaml | 2 +- Containerfile | 2 +- Containerfile.ci | 2 +- Containerfile.deps | 2 +- Containerfile.full_copy | 1 + Containerfile.trixie_python | 14 +++++++------- uv.lock | 2 +- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.forgejo/workflows/test_and_build.yaml b/.forgejo/workflows/test_and_build.yaml index d384e1e..bbaedf9 100644 --- a/.forgejo/workflows/test_and_build.yaml +++ b/.forgejo/workflows/test_and_build.yaml @@ -98,6 +98,6 @@ jobs: if: fromJSON(steps.builder.outputs.run) uses: actions/push-to-registry@v2 with: - registry: "docker://${{ vars.REGISTRY }}" + registry: "docker://${{ vars.REGISTRY }}/${{ vars.ORGANISATION }}" image: treetrail-backend tags: ${{ steps.version.outputs.version }} diff --git a/Containerfile b/Containerfile index 0351e3d..07fadf4 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -# Build: podman build -t treetrail-backend-base -f Containerfile.base +# Build: podman build -t code.philo.ydns.eu/philorg/treetrail-backend-base -f Containerfile.base FROM tiptop:5000/treetrail-backend-deps diff --git a/Containerfile.ci b/Containerfile.ci index 4725b1c..76b217f 100644 --- a/Containerfile.ci +++ b/Containerfile.ci @@ -1,4 +1,4 @@ -# Build: podman build -t treetrail-backend-ci -f Containerfile.ci +# Build: podman build -t code.philo.ydns.eu/philorg/treetrail-backend-ci -f Containerfile.ci FROM tiptop:5000/python-ci diff --git a/Containerfile.deps b/Containerfile.deps index dd111f8..c80eeff 100644 --- a/Containerfile.deps +++ b/Containerfile.deps @@ -1,4 +1,4 @@ -# Build: podman build -t treetrail-backend-deps -f Containerfile.deps +# Build: podman build -t code.philo.ydns.eu/philorg/treetrail-backend-deps -f Containerfile.deps FROM tiptop:5000/trixie_python diff --git a/Containerfile.full_copy b/Containerfile.full_copy index 357a81f..c725c87 100644 --- a/Containerfile.full_copy +++ b/Containerfile.full_copy @@ -1,3 +1,4 @@ +# Build: podman build -t code.philo.ydns.eu/philorg/treetrail-backend-full -f Containerfile.full_copy FROM localhost/trixie_python ENV PYTHONPATH $UV_PROJECT_ENVIRONMENT/lib/python3.12/site-packages diff --git a/Containerfile.trixie_python b/Containerfile.trixie_python index 53d6c3c..34ae5ff 100644 --- a/Containerfile.trixie_python +++ b/Containerfile.trixie_python @@ -1,4 +1,4 @@ -# Build: podman build -t trixie_python -f Containerfile.trixie_python +# Build: podman build -t code.philo.ydns.eu/philorg/trixie_python -f Containerfile.trixie_python FROM debian:trixie-slim @@ -15,9 +15,9 @@ EOT COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv ENV UV_LINK_MODE=copy \ - UV_COMPILE_BYTECODE=1 \ - UV_PYTHON_DOWNLOADS=never \ - #UV_PYTHON=python3.12 \ - UV_PROJECT_ENVIRONMENT=/app \ - PYTHONPATH=/app/lib/python3.12/site-packages \ - PATH=/app/bin:$PATH + UV_COMPILE_BYTECODE=1 \ + UV_PYTHON_DOWNLOADS=never \ + #UV_PYTHON=python3.12 \ + UV_PROJECT_ENVIRONMENT=/app \ + PYTHONPATH=/app/lib/python3.12/site-packages \ + PATH=/app/bin:$PATH diff --git a/uv.lock b/uv.lock index 6bce419..5947abe 100644 --- a/uv.lock +++ b/uv.lock @@ -1589,7 +1589,7 @@ wheels = [ [[package]] name = "treetrail-backend" -version = "0.3.0" +version = "0.0.0" source = { editable = "." } dependencies = [ { name = "aiofiles" },