From 159611cc7dfebbbf2980e3cf0b706fd45b98f4e9 Mon Sep 17 00:00:00 2001 From: Robert Resch Date: Mon, 11 Mar 2024 13:59:37 +0100 Subject: [PATCH] Only set uv index --- alpine/Dockerfile | 3 ++- python/3.12/Dockerfile | 13 ++----------- python/3.12/build.yaml | 1 - 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 69c6007..a82e54d 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -13,7 +13,8 @@ ENV \ S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_CMD_WAIT_FOR_SERVICES=1 \ - S6_SERVICES_READYTIME=50 + S6_SERVICES_READYTIME=50 \ + UV_EXTRA_INDEX_URL="https://wheels.home-assistant.io/musllinux-index/" # Set shell SHELL ["/bin/ash", "-o", "pipefail", "-c"] diff --git a/python/3.12/Dockerfile b/python/3.12/Dockerfile index abf2f55..a209429 100644 --- a/python/3.12/Dockerfile +++ b/python/3.12/Dockerfile @@ -5,15 +5,10 @@ ARG \ PYTHON_VERSION \ PIP_VERSION \ GPG_KEY \ - QEMU_CPU \ - UV_VERSION + QEMU_CPU # ensure local python is preferred over distribution python -# add cargo to path to run rust tools like uv -# set uv index url -ENV \ - PATH="/usr/local/bin:$PATH:/root/.cargo/bin" \ - UV_EXTRA_INDEX_URL="https://wheels.home-assistant.io/musllinux-index/" +ENV PATH /usr/local/bin:$PATH # Set shell SHELL ["/bin/ash", "-o", "pipefail", "-c"] @@ -134,7 +129,3 @@ RUN set -ex; \ -type d -a \( -name test -o -name tests \) \ \) -exec rm -rf '{}' +; \ rm -f get-pip.py - -# install uv -RUN set -ex; \ - curl -LsSf https://github.com/astral-sh/uv/releases/download/${UV_VERSION}/uv-installer.sh | sh \ No newline at end of file diff --git a/python/3.12/build.yaml b/python/3.12/build.yaml index 93131d7..0254886 100644 --- a/python/3.12/build.yaml +++ b/python/3.12/build.yaml @@ -11,7 +11,6 @@ cosign: args: PYTHON_VERSION: 3.12.2 PIP_VERSION: 24.0 - UV_VERSION: 0.1.17 GPG_KEY: 7169605F62C751356D054A26A821E680E5FA6305 labels: io.hass.base.name: python