From 61d82ae9ab173e0be186b4b361f3144278eb217c Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Wed, 29 Nov 2023 15:20:21 +0100 Subject: [PATCH] Tweak dockerfile generation (#104717) --- script/hassfest/docker.py | 44 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/script/hassfest/docker.py b/script/hassfest/docker.py index 1849e8e7ec8..3bd44736038 100644 --- a/script/hassfest/docker.py +++ b/script/hassfest/docker.py @@ -4,14 +4,14 @@ from homeassistant.util import executor, thread from .model import Config, Integration -DOCKERFILE_TEMPLATE = """# Automatically generated by hassfest. +DOCKERFILE_TEMPLATE = r"""# Automatically generated by hassfest. # # To update, run python3 -m script.hassfest -p docker ARG BUILD_FROM FROM ${{BUILD_FROM}} # Synchronize with homeassistant/core.py:async_stop -ENV \\ +ENV \ S6_SERVICES_GRACETIME={timeout} ARG QEMU_CPU @@ -21,33 +21,33 @@ WORKDIR /usr/src ## Setup Home Assistant Core dependencies COPY requirements.txt homeassistant/ COPY homeassistant/package_constraints.txt homeassistant/homeassistant/ -RUN \\ - pip3 install \\ - --only-binary=:all: \\ +RUN \ + pip3 install \ + --only-binary=:all: \ -r homeassistant/requirements.txt 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 \\ - pip3 install homeassistant/home_assistant_frontend-*.whl; \\ - fi \\ - && if ls homeassistant/home_assistant_intents*.whl 1> /dev/null 2>&1; then \\ - pip3 install homeassistant/home_assistant_intents-*.whl; \\ - fi \\ - && \\ - LD_PRELOAD="/usr/local/lib/libjemalloc.so.2" \\ - MALLOC_CONF="background_thread:true,metadata_thp:auto,dirty_decay_ms:20000,muzzy_decay_ms:20000" \\ - pip3 install \\ - --only-binary=:all: \\ +RUN \ + if ls homeassistant/home_assistant_frontend*.whl 1> /dev/null 2>&1; then \ + pip3 install homeassistant/home_assistant_frontend-*.whl; \ + fi \ + && if ls homeassistant/home_assistant_intents*.whl 1> /dev/null 2>&1; then \ + pip3 install homeassistant/home_assistant_intents-*.whl; \ + fi \ + && \ + LD_PRELOAD="/usr/local/lib/libjemalloc.so.2" \ + MALLOC_CONF="background_thread:true,metadata_thp:auto,dirty_decay_ms:20000,muzzy_decay_ms:20000" \ + pip3 install \ + --only-binary=:all: \ -r homeassistant/requirements_all.txt ## Setup Home Assistant Core COPY . homeassistant/ -RUN \\ - pip3 install \\ - --only-binary=:all: \\ - -e ./homeassistant \\ - && python3 -m compileall \\ +RUN \ + pip3 install \ + --only-binary=:all: \ + -e ./homeassistant \ + && python3 -m compileall \ homeassistant/homeassistant # Home Assistant S6-Overlay