From ce48e6e574aed5fb10ff7adbd6e8a18d239cc682 Mon Sep 17 00:00:00 2001
From: Robert Resch <robert@resch.dev>
Date: Sat, 23 Mar 2024 11:22:38 +0100
Subject: [PATCH] Fix building images for nightlies (#114054)

---
 .github/workflows/builder.yml | 4 ++--
 Dockerfile                    | 9 +++------
 requirements_test.txt         | 2 +-
 script/hassfest/docker.py     | 7 ++-----
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 09277721e48..09a25eac37a 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -148,7 +148,7 @@ jobs:
             sed -i "s|home-assistant-frontend==.*|home-assistant-frontend==${BASH_REMATCH[1]}|" \
               homeassistant/package_constraints.txt
 
-            python -m script.gen_requirements_all
+            sed -i "s|home-assistant-frontend==.*||" requirements_all.txt
           fi
 
           if [[ "$(ls home_assistant_intents*.whl)" =~ ^home_assistant_intents-(.*)-py3-none-any.whl$ ]]; then
@@ -166,7 +166,7 @@ jobs:
             sed -i "s|home-assistant-intents==.*|home-assistant-intents==${BASH_REMATCH[1]}|" \
               homeassistant/package_constraints.txt
 
-            python -m script.gen_requirements_all
+            sed -i "s|home-assistant-intents==.*||" requirements_all.txt
           fi
 
       - name: Adjustments for armhf
diff --git a/Dockerfile b/Dockerfile
index 700964d93ea..2a27402be6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ ENV \
 ARG QEMU_CPU
 
 # Install uv
-RUN pip3 install uv==0.1.22
+RUN pip3 install uv==0.1.24
 
 WORKDIR /usr/src
 
@@ -26,11 +26,8 @@ RUN \
 
 COPY requirements_all.txt home_assistant_frontend-* home_assistant_intents-* homeassistant/
 RUN \
-    if ls homeassistant/home_assistant_frontend*.whl 1> /dev/null 2>&1; then \
-        uv pip install homeassistant/home_assistant_frontend-*.whl; \
-    fi \
-    && if ls homeassistant/home_assistant_intents*.whl 1> /dev/null 2>&1; then \
-        uv pip install homeassistant/home_assistant_intents-*.whl; \
+    if ls homeassistant/home_assistant_*.whl 1> /dev/null 2>&1; then \
+        uv pip install homeassistant/home_assistant_*.whl; \
     fi \
     && if [ "${BUILD_ARCH}" = "i386" ]; then \
         LD_PRELOAD="/usr/local/lib/libjemalloc.so.2" \
diff --git a/requirements_test.txt b/requirements_test.txt
index e19cfc1a363..888c39fd239 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -51,4 +51,4 @@ types-pytz==2023.3.1.1
 types-PyYAML==6.0.12.12
 types-requests==2.31.0.3
 types-xmltodict==0.13.0.3
-uv==0.1.22
\ No newline at end of file
+uv==0.1.24
\ No newline at end of file
diff --git a/script/hassfest/docker.py b/script/hassfest/docker.py
index 8a3c3b6937d..4e348d4ae6c 100644
--- a/script/hassfest/docker.py
+++ b/script/hassfest/docker.py
@@ -34,11 +34,8 @@ RUN \
 
 COPY requirements_all.txt home_assistant_frontend-* home_assistant_intents-* homeassistant/
 RUN \
-    if ls homeassistant/home_assistant_frontend*.whl 1> /dev/null 2>&1; then \
-        uv pip install homeassistant/home_assistant_frontend-*.whl; \
-    fi \
-    && if ls homeassistant/home_assistant_intents*.whl 1> /dev/null 2>&1; then \
-        uv pip install homeassistant/home_assistant_intents-*.whl; \
+    if ls homeassistant/home_assistant_*.whl 1> /dev/null 2>&1; then \
+        uv pip install homeassistant/home_assistant_*.whl; \
     fi \
     && if [ "${{BUILD_ARCH}}" = "i386" ]; then \
         LD_PRELOAD="/usr/local/lib/libjemalloc.so.2" \