Home-Assistant/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-12-20 02:18:37 +00:00
Code Activity

Start Supervisor container with its cidfile mounted to /run/cid (#4276)

Browse Source 
Use the --cidfile Docker CLI argument when starting the container and
bind-mount the generated file containing full ID of the container to the
container itself.

Using --mount instead of --volume is needed, as --volume is racy and creates
empty directory volume at the destination path instead.

This is prerequisite for home-assistant/supervisor#6006 but can come handy for
other cases too.
This commit is contained in:
Jan Čermák
2025-09-09 20:16:11 +02:00
committed by GitHub
parent 9a1e0015d8
commit 0e3fd2c021
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor
View File

@@ -11,6 +11,7 @@ set -e
# Init supervisor # Init supervisor
SUPERVISOR_DATA=/mnt/data/supervisor SUPERVISOR_DATA=/mnt/data/supervisor
SUPERVISOR_STARTUP_MARKER="/run/supervisor/startup-marker" SUPERVISOR_STARTUP_MARKER="/run/supervisor/startup-marker"
SUPERVISOR_CIDFILE="${SUPERVISOR_DATA}/hassio_supervisor.cid"
SUPERVISOR_STARTSCRIPT_VERSION="/mnt/data/.hassos-supervisor-version" SUPERVISOR_STARTSCRIPT_VERSION="/mnt/data/.hassos-supervisor-version"
SUPERVISOR_IMAGE="ghcr.io/home-assistant/${SUPERVISOR_ARCH}-hassio-supervisor" SUPERVISOR_IMAGE="ghcr.io/home-assistant/${SUPERVISOR_ARCH}-hassio-supervisor"
@@ -58,8 +59,8 @@ if [ -z "${SUPERVISOR_IMAGE_ID}" ]; then
docker tag "${SUPERVISOR_IMAGE}:${SUPERVISOR_VERSION}" "${SUPERVISOR_IMAGE}:latest" docker tag "${SUPERVISOR_IMAGE}:${SUPERVISOR_VERSION}" "${SUPERVISOR_IMAGE}:latest"
else else
# Pull failed, updater info might be corrupted or the release might have # Pull failed, updater info might be corrupted or the release might have
# been removed from the container registry, delete the updater info # been removed from the container registry, delete the updater info
# to start from scratch on next try. # to start from scratch on next try.
echo "[ERROR] Supervisor download failed." echo "[ERROR] Supervisor download failed."
rm -f "${SUPERVISOR_DATA}/updater.json" rm -f "${SUPERVISOR_DATA}/updater.json"
exit 1 exit 1
@@ -87,12 +88,18 @@ fi
# If Supervisor container is missing, create it # If Supervisor container is missing, create it
if [ -z "${SUPERVISOR_CONTAINER_ID}" ]; then if [ -z "${SUPERVISOR_CONTAINER_ID}" ]; then
# We need to remove the CID file here, Docker will refuse to start if the
# file is present. Single instance is ensured by other code paths.
[ -f "${SUPERVISOR_CIDFILE}" ] && rm -f "${SUPERVISOR_CIDFILE}"
echo "[INFO] Creating a new Supervisor container..." echo "[INFO] Creating a new Supervisor container..."
# shellcheck disable=SC2086 # shellcheck disable=SC2086
docker container create \ docker container create \
--name hassio_supervisor \ --name hassio_supervisor \
--privileged --security-opt apparmor="hassio-supervisor" \ --privileged --security-opt apparmor="hassio-supervisor" \
--oom-score-adj=-300 \ --oom-score-adj=-300 \
--cidfile "${SUPERVISOR_CIDFILE}" \
--mount type=bind,src="${SUPERVISOR_CIDFILE}",dst=/run/cid,readonly \
-v /run/docker.sock:/run/docker.sock:rw \ -v /run/docker.sock:/run/docker.sock:rw \
-v /run/containerd/containerd.sock:/run/containerd/containerd.sock:rw \ -v /run/containerd/containerd.sock:/run/containerd/containerd.sock:rw \
-v /run/systemd/journal/socket:/run/systemd/journal/socket:rw \ -v /run/systemd/journal/socket:/run/systemd/journal/socket:rw \