From 45abc69ffb926c67b365ee4ed2595796a128e5af Mon Sep 17 00:00:00 2001 From: Stefan Allius <122395479+s-allius@users.noreply.github.com> Date: Sun, 23 Mar 2025 23:38:12 +0100 Subject: [PATCH 1/2] fix Add-on build errors - bump python to version 3.12.9-r0 - fix workspace path for VSCode --- ha_addons/Makefile | 3 ++- ha_addons/ha_addon/Dockerfile | 2 +- tsun.code-workspace | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ha_addons/Makefile b/ha_addons/Makefile index b8b4050..5b17d60 100644 --- a/ha_addons/Makefile +++ b/ha_addons/Makefile @@ -17,7 +17,8 @@ ADDON_PATH = ha_addon DST=$(ADDON_PATH)/rootfs DST_PROXY=$(DST)/home/proxy -INST_BASE=../../ha-addons/ha-addons +# base director of the add-on repro for installing the add-on git repros +INST_BASE=../../ha-addons TEMPL=templates diff --git a/ha_addons/ha_addon/Dockerfile b/ha_addons/ha_addon/Dockerfile index 1ed82ff..78d4dcd 100755 --- a/ha_addons/ha_addon/Dockerfile +++ b/ha_addons/ha_addon/Dockerfile @@ -18,7 +18,7 @@ ARG BUILD_FROM="ghcr.io/hassio-addons/base:17.2.1" FROM $BUILD_FROM AS base # Installiere Python, pip und virtuelle Umgebungstools -RUN apk add --no-cache python3=3.12.8-r1 py3-pip=24.3.1-r0 && \ +RUN apk add --no-cache python3=3.12.9-r0 py3-pip=24.3.1-r0 && \ python -m venv /opt/venv && \ . /opt/venv/bin/activate diff --git a/tsun.code-workspace b/tsun.code-workspace index e0558d2..64bc423 100644 --- a/tsun.code-workspace +++ b/tsun.code-workspace @@ -4,11 +4,11 @@ "path": "." }, { - "path": "../wiki" + "path": "../tsun-gen3-proxy.wiki" }, { "name": "ha-addons", - "path": "../ha-addons/ha-addons" + "path": "../ha-addons" } ], "settings": {} From f9be1718650185897ef2bf0fb2281c8e48a1a6ce Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 23 Mar 2025 23:43:25 +0100 Subject: [PATCH 2/2] Update ghcr.io/hassio-addons/base Docker tag to v17.2.2 (#315) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- ha_addons/ha_addon/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ha_addons/ha_addon/Dockerfile b/ha_addons/ha_addon/Dockerfile index 78d4dcd..925b342 100755 --- a/ha_addons/ha_addon/Dockerfile +++ b/ha_addons/ha_addon/Dockerfile @@ -13,7 +13,7 @@ # 1 Build Base Image # ###################### -ARG BUILD_FROM="ghcr.io/hassio-addons/base:17.2.1" +ARG BUILD_FROM="ghcr.io/hassio-addons/base:17.2.2" # hadolint ignore=DL3006 FROM $BUILD_FROM AS base