Fix shutdown timeout and make it upstream with Supervisor (#33973)

* Fix shutdown timeout and make it upstream with Supervisor

* Moved ENV command up

* Update finish

Co-authored-by: Franck Nijhof <git@frenck.dev>
This commit is contained in:
Pascal VizeliandFranck Nijhof authored and Paulus Schoutsen committed 2020-04-10 14:07:35 -07:00
1 parent 2243855209
commit eb17b68ad3
2 files changed
+8 -3

No files matched your search

+5 -1
View File
@@ -1,11 +1,15 @@
ARG BUILD_FROM
FROM ${BUILD_FROM}
ENV \
S6_SERVICES_GRACETIME=60000
WORKDIR /usr/src
## Setup Home Assistant
COPY . homeassistant/
RUN pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
RUN \
pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
-r homeassistant/requirements_all.txt -c homeassistant/homeassistant/package_constraints.txt \
&& pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
-e ./homeassistant \
+3 -2
View File
@@ -1,7 +1,8 @@
#!/usr/bin/execlineb -S0
#!/usr/bin/execlineb -S1
# ==============================================================================
# Take down the S6 supervision tree when Home Assistant fails
# ==============================================================================
if { s6-test ${1} -ne 100 }
if { s6-test ${1} -ne 256 }
s6-svscanctl -t /var/run/s6/services
s6-svscanctl -t /var/run/s6/services