From ea3b7e99810af1fd6195b900ded228a1505dcfc8 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 1 Feb 2026 03:31:39 +0200 Subject: [PATCH] Fix apk musl conflict: derive Alpine repo version dynamically; bump add-on to 0.5.22 --- openclaw_assistant/Dockerfile | 13 +++++++++---- openclaw_assistant/config.yaml | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/openclaw_assistant/Dockerfile b/openclaw_assistant/Dockerfile index 83eab75..d397907 100644 --- a/openclaw_assistant/Dockerfile +++ b/openclaw_assistant/Dockerfile @@ -5,10 +5,15 @@ FROM ${BUILD_FROM} # OpenClaw requires Node 20+, so we install a Node 20 musl build directly. ARG NODE_VERSION=22.12.0 -# Base image may not include community repo; cmake lives there. -RUN apk add --no-cache \ - --repository=https://dl-cdn.alpinelinux.org/alpine/v3.18/main \ - --repository=https://dl-cdn.alpinelinux.org/alpine/v3.18/community \ +# Base image is Alpine, but its exact patch-level varies. +# Do NOT hardcode v3.xx repos (can cause musl/musl-dev conflicts). +# Instead, derive the repo version from /etc/alpine-release at build time. +RUN set -eu; \ + ALPINE_VER="$(cut -d. -f1,2 /etc/alpine-release)"; \ + echo "Using Alpine repos for v${ALPINE_VER}"; \ + apk add --no-cache \ + --repository="https://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VER}/main" \ + --repository="https://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VER}/community" \ bash \ git \ openssh-client \ diff --git a/openclaw_assistant/config.yaml b/openclaw_assistant/config.yaml index d674fbf..373814b 100644 --- a/openclaw_assistant/config.yaml +++ b/openclaw_assistant/config.yaml @@ -1,5 +1,5 @@ name: OpenClaw Assistant -version: "0.5.21" +version: "0.5.22" slug: openclaw_assistant description: Run OpenClaw Assistant (OpenClaw-compatible) as a Home Assistant add-on. url: https://github.com/techartdev/OpenClawHomeAssistant