From 9c5fc7abb3f67d1d65851997dbe1ed386a1817cd Mon Sep 17 00:00:00 2001 From: Robert Resch Date: Tue, 3 Sep 2024 11:14:16 +0000 Subject: [PATCH 1/2] Use fixed uv version --- script/hassfest/docker.py | 2 +- script/hassfest/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/script/hassfest/docker.py b/script/hassfest/docker.py index c0bdfd3fb3e466..bce77e1ece0cd1 100644 --- a/script/hassfest/docker.py +++ b/script/hassfest/docker.py @@ -82,7 +82,7 @@ COPY . /usr/src/homeassistant # Uv is only needed during build -RUN --mount=from=ghcr.io/astral-sh/uv,source=/uv,target=/bin/uv \ +RUN --mount=from=ghcr.io/astral-sh/uv:{uv},source=/uv,target=/bin/uv \ # Required for PyTurboJPEG apk add --no-cache libturbojpeg \ && uv pip install \ diff --git a/script/hassfest/docker/Dockerfile b/script/hassfest/docker/Dockerfile index 1e09faaa9642ab..0d99b04c44c94a 100644 --- a/script/hassfest/docker/Dockerfile +++ b/script/hassfest/docker/Dockerfile @@ -14,7 +14,7 @@ WORKDIR "/github/workspace" COPY . /usr/src/homeassistant # Uv is only needed during build -RUN --mount=from=ghcr.io/astral-sh/uv,source=/uv,target=/bin/uv \ +RUN --mount=from=ghcr.io/astral-sh/uv:0.2.27,source=/uv,target=/bin/uv \ # Required for PyTurboJPEG apk add --no-cache libturbojpeg \ && uv pip install \ From 1be03d8c3fbabce125f996a987dd4ddc31e0cf19 Mon Sep 17 00:00:00 2001 From: Robert Resch Date: Tue, 3 Sep 2024 11:15:18 +0000 Subject: [PATCH 2/2] Use cli params instead env --- script/hassfest/docker/Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/script/hassfest/docker/Dockerfile b/script/hassfest/docker/Dockerfile index 0d99b04c44c94a..23331f39df2f25 100644 --- a/script/hassfest/docker/Dockerfile +++ b/script/hassfest/docker/Dockerfile @@ -3,10 +3,6 @@ # To update, run python3 -m script.hassfest -p docker FROM python:alpine -ENV \ - UV_SYSTEM_PYTHON=true \ - UV_EXTRA_INDEX_URL="https://wheels.home-assistant.io/musllinux-index/" - SHELL ["/bin/sh", "-o", "pipefail", "-c"] ENTRYPOINT ["/usr/src/homeassistant/script/hassfest/docker/entrypoint.sh"] WORKDIR "/github/workspace" @@ -20,6 +16,8 @@ RUN --mount=from=ghcr.io/astral-sh/uv:0.2.27,source=/uv,target=/bin/uv \ && uv pip install \ --no-build \ --no-cache \ + --system \ + --extra-index-url "https://wheels.home-assistant.io/musllinux-index/" \ -c /usr/src/homeassistant/homeassistant/package_constraints.txt \ -r /usr/src/homeassistant/requirements.txt \ stdlib-list==0.10.0 pipdeptree==2.23.1 tqdm==4.66.4 ruff==0.6.2 \