Reformat Dockerfile to reduce merge conflicts (#146435)

This commit is contained in:
Franck Nijhof
2025-06-10 11:14:31 +02:00
committed by GitHub
parent 0c18fe35e5
commit 5ad96dedfa
2 changed files with 17 additions and 4 deletions

View File

@ -103,7 +103,10 @@ RUN --mount=from=ghcr.io/astral-sh/uv:{uv},source=/uv,target=/bin/uv \
--no-cache \
-c /usr/src/homeassistant/homeassistant/package_constraints.txt \
-r /usr/src/homeassistant/requirements.txt \
stdlib-list==0.10.0 pipdeptree=={pipdeptree} tqdm=={tqdm} ruff=={ruff} \
stdlib-list==0.10.0 \
pipdeptree=={pipdeptree} \
tqdm=={tqdm} \
ruff=={ruff} \
{required_components_packages}
LABEL "name"="hassfest"
@ -169,7 +172,7 @@ def _generate_hassfest_dockerimage(
return File(
_HASSFEST_TEMPLATE.format(
timeout=timeout,
required_components_packages=" ".join(sorted(packages)),
required_components_packages=" \\\n ".join(sorted(packages)),
**package_versions,
),
config.root / "script/hassfest/docker/Dockerfile",

View File

@ -24,8 +24,18 @@ RUN --mount=from=ghcr.io/astral-sh/uv:0.7.1,source=/uv,target=/bin/uv \
--no-cache \
-c /usr/src/homeassistant/homeassistant/package_constraints.txt \
-r /usr/src/homeassistant/requirements.txt \
stdlib-list==0.10.0 pipdeptree==2.26.1 tqdm==4.67.1 ruff==0.11.12 \
PyTurboJPEG==1.8.0 go2rtc-client==0.2.1 ha-ffmpeg==3.2.2 hassil==2.2.3 home-assistant-intents==2025.5.28 mutagen==1.47.0 pymicro-vad==1.0.1 pyspeex-noise==1.0.2
stdlib-list==0.10.0 \
pipdeptree==2.26.1 \
tqdm==4.67.1 \
ruff==0.11.12 \
PyTurboJPEG==1.8.0 \
go2rtc-client==0.2.1 \
ha-ffmpeg==3.2.2 \
hassil==2.2.3 \
home-assistant-intents==2025.5.28 \
mutagen==1.47.0 \
pymicro-vad==1.0.1 \
pyspeex-noise==1.0.2
LABEL "name"="hassfest"
LABEL "maintainer"="Home Assistant <hello@home-assistant.io>"