mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-08-20 11:57:19 +02:00
* fix(claude_desktop): persist sign-in by opting into Electron safeStorage Claude Desktop asked the user to sign in again on every start. The v1.35 fix was inert: --password-store=basic did reach the process (confirmed on a live install's /proc/<pid>/cmdline), but the app still logged "safeStorage not available, tokens will not persist" on every launch. Electron refuses its built-in basic_text backend unless the application calls safeStorage.setUsePlainTextEncryption(true) before the ready event, and Claude Desktop never calls it - the symbol is present in the shipped Electron binary but absent from resources/app.asar. So isEncryptionAvailable() stayed false and the auth token was never persisted. Verified against a standalone Electron of the same generation: without the opt-in it is false; with it, true, and a separate later process decrypts a blob written by an earlier one. There is no equivalent command-line switch, and NODE_OPTIONS=--require is ignored by packaged Electron apps (verified against the real binary), so the opt-in is injected into the app's main bundle inside app.asar. gnome-keyring stays out of the image: its first-boot password prompt blocks the app from launching at all. The patcher fails closed, rebuilds the archive preserving unpacked/symlink entries, recomputes the changed entry's SHA-256 integrity record, and fully re-validates the result from disk before renaming it into place. It re-runs on every boot after 81-claude_update.sh, since an apt upgrade ships a fresh unpatched app.asar, and is marker-guarded so an unchanged app is a no-op. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix(claude_desktop): harden the safeStorage hook against review findings - Sweep stale .app.asar.addon-tmp.* from the shell hook. `timeout` kills the patcher outright, so a run that hits the 120s cap never executes its own cleanup; the live archive stays unpatched, so every later boot would retry under a new pid and strand another archive-sized file. - End the hook with an explicit `exit 0`. The logging `while` loop's status became the script's status, so an empty last line could exit non-zero and fail cont-init - the opposite of the documented "never block startup". Both raised in review on #2922. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
281 lines
12 KiB
Docker
281 lines
12 KiB
Docker
#============================#
|
|
# ALEXBELGIUM'S DOCKERFILE #
|
|
#============================#
|
|
#=== Home Assistant Addon ===#
|
|
|
|
#################
|
|
# 1 Build Image #
|
|
#################
|
|
|
|
ARG BUILD_FROM
|
|
ARG BUILD_VERSION
|
|
ARG RTK_VERSION="v0.43.0"
|
|
ARG RTK_COMMIT="5a7880d404db8364d602f2ecdc41dd790f64013f"
|
|
ARG TOKENSAVE_VERSION="7.4.0"
|
|
ARG VIRTIOFSD_VERSION="1.14.0"
|
|
|
|
# The upstream aarch64 release is cross-built on ubuntu-latest and requires
|
|
# GLIBC 2.39. Build the pinned source on Bookworm instead so it is compatible
|
|
# with the add-on runtime on both supported architectures.
|
|
FROM rust:1.91-bookworm AS rtk-builder
|
|
ARG RTK_VERSION
|
|
ARG RTK_COMMIT
|
|
RUN git clone --depth 1 --branch "${RTK_VERSION}" https://github.com/rtk-ai/rtk.git /src/rtk && \
|
|
test "$(git -C /src/rtk rev-parse HEAD)" = "${RTK_COMMIT}" && \
|
|
cd /src/rtk && \
|
|
cargo build --release --locked && \
|
|
install -D -m 0755 target/release/rtk /out/rtk && \
|
|
/out/rtk --version
|
|
|
|
# tokensave ships no Bookworm-compatible prebuilt binary either; build the pinned
|
|
# crates.io release from source so GLIBC matches the add-on runtime.
|
|
FROM rust:1.91-bookworm AS tokensave-builder
|
|
ARG TOKENSAVE_VERSION
|
|
RUN cargo install tokensave --version "${TOKENSAVE_VERSION}" --locked --root /out && \
|
|
/out/bin/tokensave --version
|
|
|
|
# virtiofsd is only packaged for Debian trixie/sid, not Bookworm or bookworm-backports;
|
|
# installing the trixie .deb on the Bookworm runtime would pull a binary linked against a
|
|
# newer GLIBC. Build the pinned crates.io release from source on Bookworm so the daemon's
|
|
# ABI matches the add-on runtime (same rationale as the rtk and tokensave builders above).
|
|
# Cowork shares the workspace into its qemu microVM through virtiofsd.
|
|
FROM rust:1.91-bookworm AS virtiofsd-builder
|
|
ARG VIRTIOFSD_VERSION
|
|
RUN apt-get update && \
|
|
apt-get install -y --no-install-recommends \
|
|
libseccomp-dev \
|
|
libcap-ng-dev \
|
|
pkg-config \
|
|
clang \
|
|
libclang-dev && \
|
|
cargo install virtiofsd --version "${VIRTIOFSD_VERSION}" --locked --root /out && \
|
|
/out/bin/virtiofsd --version && \
|
|
rm -rf /var/lib/apt/lists/*
|
|
|
|
FROM ${BUILD_FROM}
|
|
ARG BUILD_ARCH
|
|
ARG TARGETARCH
|
|
|
|
##################
|
|
# 2 Modify Image #
|
|
##################
|
|
|
|
# Set S6 wait time
|
|
ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|
S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
|
|
S6_SERVICES_GRACETIME=0
|
|
|
|
USER root
|
|
|
|
# load volume
|
|
VOLUME [ "/sys/fs/cgroup" ]
|
|
|
|
# Allow UID and GID setting
|
|
# hadolint ignore=SC2015,DL4006,SC2013,SC2086
|
|
RUN \
|
|
usermod --home /data/data abc && \
|
|
if [[ -d /etc/services.d ]] && ls /etc/services.d/*/run 1> /dev/null 2>&1; then sed -i "1a set +e" /etc/services.d/*/run; fi
|
|
|
|
ARG TEMPLATE_BASE_URL="https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates"
|
|
|
|
# Global LSIO modifications
|
|
ARG CONFIGLOCATION="/data/data"
|
|
RUN curl -fsSL --retry 3 --retry-delay 2 \
|
|
-o /ha_lsio.sh "${TEMPLATE_BASE_URL}/ha_lsio.sh" && \
|
|
chmod 744 /ha_lsio.sh && \
|
|
if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && \
|
|
rm /ha_lsio.sh
|
|
|
|
##################
|
|
# 3 Install apps #
|
|
##################
|
|
|
|
# Add rootfs. Only the directories this add-on ships scripts in are traversed, so the chmod
|
|
# cannot alter executables elsewhere in the image.
|
|
COPY rootfs/ /
|
|
RUN find /etc/cont-init.d /etc/s6-overlay /defaults /usr/local/bin -type f \
|
|
\( -name "*.sh" -o -name "run" -o -name "finish" -o -name "ha-cli" -o -name "codex-login" \) -print -exec chmod +x {} \; && \
|
|
chmod +x /usr/local/bin/claude
|
|
|
|
# Uses /bin for compatibility purposes
|
|
# hadolint ignore=DL4005
|
|
RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \
|
|
if [ ! -f /bin/bash ] && [ -f /usr/bin/bash ]; then ln -s /usr/bin/bash /bin/bash; fi
|
|
|
|
# Install Claude Desktop, Claude Code, Python tooling, and lightweight local validators.
|
|
# gnome-keyring is intentionally NOT installed: it prompts for a keyring password on first
|
|
# boot, which blocks Claude Desktop from launching. Sign-in persistence instead uses Electron's
|
|
# built-in --password-store=basic (rootfs/defaults/autostart) — no daemon, no prompt — together
|
|
# with rootfs/etc/cont-init.d/86-claude_safestorage.sh, which patches app.asar to opt into that
|
|
# backend. Electron ignores --password-store=basic without the app-side opt-in, so both are
|
|
# required for the sign-in to survive a restart.
|
|
# The cowork virtualization stack (qemu-system-x86 + ovmf firmware) lets Claude Code launch
|
|
# its sandbox microVM; libseccomp2 and libcap-ng0 are the shared libraries the source-built
|
|
# virtiofsd daemon links against at runtime. Docker itself is NOT installed here: this base
|
|
# image already ships Docker-in-Docker (docker-ce + containerd.io from Docker's own apt repo,
|
|
# started via the pre-existing START_DOCKER env var) — installing Debian's docker.io package
|
|
# on top pulls in Debian's own containerd/runc, which apt refuses because they Conflict with
|
|
# the base image's already-installed containerd.io.
|
|
RUN install -d -m 0755 /etc/apt/keyrings && \
|
|
curl -fsSLo /usr/share/keyrings/claude-desktop-archive-keyring.asc https://downloads.claude.ai/claude-desktop/key.asc && \
|
|
curl -fsSLo /etc/apt/keyrings/claude-code.asc https://downloads.claude.ai/keys/claude-code.asc && \
|
|
echo "deb [arch=amd64,arm64 signed-by=/usr/share/keyrings/claude-desktop-archive-keyring.asc] https://downloads.claude.ai/claude-desktop/apt/stable stable main" > /etc/apt/sources.list.d/claude-desktop.list && \
|
|
echo "deb [signed-by=/etc/apt/keyrings/claude-code.asc] https://downloads.claude.ai/claude-code/apt/stable stable main" > /etc/apt/sources.list.d/claude-code.list && \
|
|
apt-get update && \
|
|
apt-get install -y --no-install-recommends \
|
|
claude-desktop \
|
|
claude-code \
|
|
python3-pip \
|
|
libsecret-1-0 \
|
|
dbus-x11 \
|
|
git \
|
|
gh \
|
|
ripgrep \
|
|
jq \
|
|
shellcheck \
|
|
yamllint \
|
|
qemu-system-x86 \
|
|
ovmf \
|
|
libseccomp2 \
|
|
libcap-ng0 && \
|
|
test -x /usr/bin/claude && \
|
|
apt-get clean && \
|
|
rm -rf /var/lib/apt/lists/*
|
|
|
|
# The Intel N150/Twin Lake iGPU uses the host's i915 kernel driver through the mapped
|
|
# /dev/dri nodes. Explicitly install the amd64 userspace stack needed for accelerated
|
|
# OpenGL rendering, VA-API video encoding, and Vulkan, then fail the build if any driver
|
|
# payload is missing. Keep aarch64 unchanged because these Intel packages are amd64-only.
|
|
RUN if [[ "${TARGETARCH}" == "amd64" ]]; then \
|
|
apt-get update && \
|
|
apt-get install -y --no-install-recommends \
|
|
intel-media-va-driver-non-free \
|
|
libgl1-mesa-dri \
|
|
mesa-vulkan-drivers \
|
|
vainfo && \
|
|
test -f /usr/lib/x86_64-linux-gnu/dri/iHD_drv_video.so && \
|
|
test -f /usr/lib/x86_64-linux-gnu/dri/iris_dri.so && \
|
|
test -f /usr/share/vulkan/icd.d/intel_icd.x86_64.json && \
|
|
command -v vainfo > /dev/null; \
|
|
fi && \
|
|
apt-get clean && \
|
|
rm -rf /var/lib/apt/lists/*
|
|
|
|
# Install the current upstream hadolint and actionlint releases for both supported
|
|
ARG HADOLINT_VERSION=v2.14.0
|
|
ARG ACTIONLINT_VERSION=v1.7.12
|
|
|
|
RUN set -eux; \
|
|
case "${TARGETARCH}" in \
|
|
amd64) hadolint_arch="x86_64"; actionlint_arch="amd64" ;; \
|
|
arm64) hadolint_arch="arm64"; actionlint_arch="arm64" ;; \
|
|
*) echo "Unsupported validation-tools architecture: ${TARGETARCH}" >&2; exit 1 ;; \
|
|
esac; \
|
|
curl -fsSL --retry 3 --retry-delay 2 \
|
|
-o /usr/local/bin/hadolint \
|
|
"https://github.com/hadolint/hadolint/releases/download/${HADOLINT_VERSION}/hadolint-linux-${hadolint_arch}"; \
|
|
chmod 0755 /usr/local/bin/hadolint; \
|
|
curl -fsSL --retry 3 --retry-delay 2 \
|
|
-o /tmp/actionlint.tar.gz \
|
|
"https://github.com/rhysd/actionlint/releases/download/${ACTIONLINT_VERSION}/actionlint_${ACTIONLINT_VERSION#v}_linux_${actionlint_arch}.tar.gz"; \
|
|
tar -xzf /tmp/actionlint.tar.gz -C /tmp actionlint; \
|
|
install -m 0755 /tmp/actionlint /usr/local/bin/actionlint; \
|
|
rm -f /tmp/actionlint /tmp/actionlint.tar.gz; \
|
|
hadolint --version; \
|
|
actionlint -version
|
|
|
|
# Copy the pinned Bookworm-built RTK and tokensave binaries and execute them in the final
|
|
# image. This makes an ABI mismatch fail the image build instead of surfacing at runtime.
|
|
COPY --from=rtk-builder /out/rtk /usr/local/bin/rtk
|
|
COPY --from=tokensave-builder /out/bin/tokensave /usr/local/bin/tokensave
|
|
COPY --from=virtiofsd-builder /out/bin/virtiofsd /usr/bin/virtiofsd
|
|
RUN /usr/local/bin/rtk --version && \
|
|
/usr/local/bin/tokensave --version && \
|
|
/usr/bin/virtiofsd --version
|
|
|
|
# Install only the Headroom proxy, code-compression, and MCP features used by this add-on,
|
|
# plus mcp-proxy (stdio->HTTP bridge for the Home Assistant MCP server) and uv (fast
|
|
# installer used for the additional_pip option). The `proxy` extra already ships the ONNX
|
|
# runtime + transformers needed by the Kompress compressor — the `ml` extra (full PyTorch,
|
|
# ~5 GB with CUDA wheels) is deliberately NOT installed; svc-headroom pre-warms the ONNX
|
|
# model into the persistent HF cache instead.
|
|
RUN apt-get update && \
|
|
apt-get install -y --no-install-recommends nodejs && \
|
|
pip3 install --break-system-packages "headroom-ai[proxy,code,mcp]" mcp-proxy uv websockets && \
|
|
apt-get clean && \
|
|
rm -rf /var/lib/apt/lists/* /root/.cache
|
|
|
|
# Fix Selkies startup when PulseAudio module initialization fails
|
|
RUN if [ -f /etc/s6-overlay/s6-rc.d/svc-selkies/run ]; then \
|
|
sed -i "1a\set +e" /etc/s6-overlay/s6-rc.d/svc-selkies/run; \
|
|
fi
|
|
|
|
# Modules
|
|
ARG MODULES="00-banner.sh 00-global_var.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh 90-dns_set.sh"
|
|
|
|
# Automatic modules download
|
|
RUN curl -fsSL --retry 3 --retry-delay 2 \
|
|
-o /ha_automodules.sh "${TEMPLATE_BASE_URL}/ha_automodules.sh" && \
|
|
chmod 744 /ha_automodules.sh && \
|
|
/ha_automodules.sh "$MODULES" && \
|
|
rm /ha_automodules.sh
|
|
|
|
# Manual apps
|
|
ENV PACKAGES="nginx"
|
|
|
|
# Automatic apps & bashio
|
|
RUN curl -fsSL --retry 3 --retry-delay 2 \
|
|
-o /ha_autoapps.sh "${TEMPLATE_BASE_URL}/ha_autoapps.sh" && \
|
|
chmod 744 /ha_autoapps.sh && \
|
|
/ha_autoapps.sh "$PACKAGES" && \
|
|
rm /ha_autoapps.sh
|
|
|
|
################
|
|
# 4 Entrypoint #
|
|
################
|
|
|
|
# Add entrypoint and standalone bashio compatibility
|
|
RUN curl -fsSL --retry 3 --retry-delay 2 \
|
|
-o /ha_entrypoint.sh "${TEMPLATE_BASE_URL}/ha_entrypoint.sh" && \
|
|
curl -fsSL --retry 3 --retry-delay 2 \
|
|
-o /usr/local/lib/bashio-standalone.sh "${TEMPLATE_BASE_URL}/bashio-standalone.sh" && \
|
|
chmod 0777 /ha_entrypoint.sh && \
|
|
chmod 0755 /usr/local/lib/bashio-standalone.sh
|
|
|
|
ENTRYPOINT [ "/usr/bin/env" ]
|
|
CMD [ "/ha_entrypoint.sh" ]
|
|
|
|
############
|
|
# 5 Labels #
|
|
############
|
|
|
|
ARG BUILD_DATE
|
|
ARG BUILD_DESCRIPTION
|
|
ARG BUILD_NAME
|
|
ARG BUILD_REF
|
|
ARG BUILD_REPOSITORY
|
|
ARG BUILD_VERSION
|
|
ENV BUILD_VERSION="${BUILD_VERSION}"
|
|
LABEL \
|
|
io.hass.name="${BUILD_NAME}" \
|
|
io.hass.description="${BUILD_DESCRIPTION}" \
|
|
io.hass.arch="${BUILD_ARCH}" \
|
|
io.hass.type="addon" \
|
|
io.hass.version=${BUILD_VERSION} \
|
|
maintainer="alexbelgium (https://github.com/alexbelgium)" \
|
|
org.opencontainers.image.title="${BUILD_NAME}" \
|
|
org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
|
|
org.opencontainers.image.vendor="Home Assistant Add-ons" \
|
|
org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \
|
|
org.opencontainers.image.licenses="MIT" \
|
|
org.opencontainers.image.url="https://github.com/alexbelgium" \
|
|
org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
|
|
org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
|
|
org.opencontainers.image.created=${BUILD_DATE} \
|
|
org.opencontainers.image.revision=${BUILD_REF} \
|
|
org.opencontainers.image.version=${BUILD_VERSION}
|
|
|
|
####################
|
|
# 6 HealthcheckNOT #
|
|
####################
|