Skip to content

Fix shutdown timeout and make it upstream with Supervisor #33973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pvizeli merged 3 commits into from
Apr 10, 2020
Merged

Fix shutdown timeout and make it upstream with Supervisor #33973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ac93e9
Fix shutdown timeout and make it upstream with Supervisor
pvizeli Apr 10, 2020
8a111b0
Moved ENV command up
frenck Apr 10, 2020
912c11a
Update finish
pvizeli Apr 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
5 changes: 3 additions & 2 deletions rootfs/etc/services.d/home-assistant/finish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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