⬆️ Update esphome to v2025.4.1 (#961)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/dependabot.yaml

@@ -1,13 +0,0 @@
----
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: daily
-      time: "06:00"
-  - package-ecosystem: "pip"
-    directory: "/vscode"
-    schedule:
-      interval: daily
-      time: "06:00"

.github/renovate.json

@@ -0,0 +1,150 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "rebaseWhen": "behind-base-branch",
+  "dependencyDashboard": true,
+  "labels": ["dependencies", "no-stale"],
+  "commitMessagePrefix": "⬆️",
+  "commitMessageTopic": "{{depName}}",
+  "customManagers": [
+    {
+      "customType": "regex",
+      "fileMatch": ["/Dockerfile$", "/build.yaml$"],
+      "matchStringsStrategy": "any",
+      "matchStrings": [
+        "ARG BUILD_FROM=(?<depName>.*?):(?<currentValue>.*?)\\s+",
+        "(aarch64|amd64|armhf|armv7|i386):\\s[\"']?(?<depName>.*?):(?<currentValue>.*?)[\"']?\\s"
+      ],
+      "datasourceTemplate": "docker"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": ["/Dockerfile$"],
+      "matchStringsStrategy": "any",
+      "matchStrings": [
+        "\\s\\s(?<package>[a-z0-9][a-z0-9-]+)=(?<currentValue>[a-z0-9-:_+~.]+)\\s+"
+      ],
+      "versioningTemplate": "deb",
+      "datasourceTemplate": "repology",
+      "depNameTemplate": "debian_12/{{{replace 'openssh-client' 'openssh' package}}}"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": ["/Dockerfile$"],
+      "matchStrings": [
+        "ARG CODE_SERVER_VERSION=[\"']?(?<currentValue>.+?)[\"']?\\s+"
+      ],
+      "datasourceTemplate": "github-releases",
+      "depNameTemplate": "cdr/code-server"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": ["/Dockerfile$"],
+      "matchStrings": [
+        "ARG HA_CLI_VERSION=[\"']?(?<currentValue>.+?)[\"']?\\s+"
+      ],
+      "datasourceTemplate": "github-releases",
+      "depNameTemplate": "home-assistant/cli",
+      "versioningTemplate": "loose"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": ["vscode/vscode.extensions$"],
+      "matchStrings": ["emilast\\.LogFileHighlighter#(?<currentValue>.+)\\s"],
+      "datasourceTemplate": "github-releases",
+      "depNameTemplate": "emilast/vscode-logfile-highlighter"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": ["vscode/vscode.extensions$"],
+      "matchStrings": ["esbenp\\.prettier-vscode#(?<currentValue>.+)\\s"],
+      "datasourceTemplate": "github-releases",
+      "depNameTemplate": "prettier/prettier-vscode",
+      "extractVersionTemplate": "^v(?<version>.*)$"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": ["vscode/vscode.extensions$"],
+      "matchStrings": ["ESPHome\\.esphome-vscode#(?<currentValue>.+)\\s"],
+      "datasourceTemplate": "github-releases",
+      "depNameTemplate": "esphome/esphome-vscode",
+      "versioningTemplate": "loose",
+      "extractVersionTemplate": "^v(?<version>.*)$"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": ["vscode/vscode.extensions$"],
+      "matchStrings": [
+        "keesschollaart\\.vscode-home-assistant#(?<currentValue>.+)\\s"
+      ],
+      "datasourceTemplate": "github-releases",
+      "depNameTemplate": "keesschollaart81/vscode-home-assistant",
+      "extractVersionTemplate": "^v(?<version>.*)$"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": ["vscode/vscode.extensions$"],
+      "matchStrings": [
+        "lukas-tr\\.materialdesignicons-intellisense#(?<currentValue>.+)\\s"
+      ],
+      "datasourceTemplate": "github-releases",
+      "depNameTemplate": "lukas-tr/vscode-materialdesignicons-intellisense",
+      "extractVersionTemplate": "^v(?<version>.*)$"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": ["vscode/vscode.extensions$"],
+      "matchStrings": ["netcorext\\.uuid-generator#(?<currentValue>.+)\\s"],
+      "datasourceTemplate": "github-releases",
+      "depNameTemplate": "arenchen/vscode-uuid-generator"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": ["vscode/vscode.extensions$"],
+      "matchStrings": ["usernamehw\\.errorlens#(?<currentValue>.+)\\s"],
+      "datasourceTemplate": "github-releases",
+      "depNameTemplate": "usernamehw/vscode-error-lens",
+      "extractVersionTemplate": "^v(?<version>.*)$"
+    }
+  ],
+  "packageRules": [
+    {
+      "matchDatasources": ["repology"],
+      "automerge": true
+    },
+    {
+      "groupName": "Add-on base image",
+      "matchDatasources": ["docker"]
+    },
+    {
+      "groupName": "Add-on base image",
+      "matchDatasources": ["docker"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "automerge": true
+    },
+    {
+      "matchDatasources": ["github-releases"],
+      "matchDepNames": ["coder/code-server"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "automerge": true
+    },
+    {
+      "matchDatasources": ["github-releases"],
+      "matchDepNames": ["home-assistant/cli"],
+      "automerge": true
+    },
+    {
+      "matchManagers": ["pip_requirements"],
+      "addLabels": ["python"]
+    },
+    {
+      "matchManagers": ["pip_requirements"],
+      "matchDepTypes": ["dev"],
+      "rangeStrategy": "pin"
+    },
+    {
+      "matchManagers": ["pip_requirements"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "automerge": true
+    }
+  ]
+}

.github/workflows/deploy.yaml

@@ -16,5 +16,4 @@ jobs:
   workflows:
     uses: hassio-addons/workflows/.github/workflows/addon-deploy.yaml@main
     secrets:
-      CAS_API_KEY: ${{ secrets.CAS_API_KEY }}
       DISPATCH_TOKEN: ${{ secrets.DISPATCH_TOKEN }}

LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) 2019-2022 Franck Nijhof
+Copyright (c) 2019-2025 Franck Nijhof
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -81,7 +81,7 @@ our [GitHub Repository][repository].
 
 MIT License
 
-Copyright (c) 2019-2022 Franck Nijhof
+Copyright (c) 2019-2025 Franck Nijhof
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -122,7 +122,7 @@ SOFTWARE.
 [i386-shield]: https://img.shields.io/badge/i386-no-red.svg
 [issue]: https://github.com/hassio-addons/addon-vscode/issues
 [license-shield]: https://img.shields.io/github/license/hassio-addons/addon-vscode.svg
-[maintenance-shield]: https://img.shields.io/maintenance/yes/2022.svg
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2025.svg
 [patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png
 [patreon]: https://www.patreon.com/frenck
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg

vscode/.README.j2

@@ -70,7 +70,7 @@ If you are more interested in stable releases of our add-ons:
 [forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-visual-studio-code/107863?u=frenck
 [github-sponsors-shield]: https://frenck.dev/wp-content/uploads/2019/12/github_sponsor.png
 [github-sponsors]: https://github.com/sponsors/frenck
-[maintenance-shield]: https://img.shields.io/maintenance/yes/2022.svg
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2025.svg
 [patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png
 [patreon]: https://www.patreon.com/frenck
 [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg

vscode/DOCS.md

@@ -1,6 +1,6 @@
 # Home Assistant Community Add-on: Studio Code Server
 
-This add-on runs [code-server](https://github.com/cdr/code-server), which
+This add-on runs [code-server](https://github.com/coder/code-server), which
 gives you a Visual Studio Code experience straight from the browser. It allows
 you to edit your Home Assistant configuration directly from your web browser,
 directly from within the Home Assistant frontend.
@@ -154,7 +154,7 @@ check [the contributor's page][contributors].
 
 MIT License
 
-Copyright (c) 2019-2022 Franck Nijhof
+Copyright (c) 2019-2025 Franck Nijhof
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -184,5 +184,5 @@ SOFTWARE.
 [issue]: https://github.com/hassio-addons/addon-vscode/issues
 [reddit]: https://reddit.com/r/homeassistant
 [releases]: https://github.com/hassio-addons/addon-vscode/releases
-[semver]: http://semver.org/spec/v2.0.0
+[semver]: https://semver.org/spec/v2.0.0
 [ubuntu-packages]: https://packages.ubuntu.com

vscode/Dockerfile

@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.2.0
+ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.8.2
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -6,7 +6,8 @@ FROM ${BUILD_FROM}
 ENV \
     LANG=en_US.UTF-8 \
     LANGUAGE=en_US:en \
-    LC_ALL=en_US.UTF-8
+    LC_ALL=en_US.UTF-8 \
+    PIP_BREAK_SYSTEM_PACKAGES=1
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -19,32 +20,35 @@ COPY vscode.extensions /root/vscode.extensions
 
 # Setup base system
 ARG BUILD_ARCH=amd64
+ARG CODE_SERVER_VERSION="v4.99.3"
+ARG HA_CLI_VERSION="4.38.0"
 # hadolint ignore=SC2181, DL3008
 RUN \
     apt-get update \
     \
     && apt-get install -y --no-install-recommends \
-        ack=3.4.0-1 \
-        libarchive-tools=3.4.3-2+deb11u1 \
+        ack=3.6.0-1 \
+        libarchive-tools=3.6.2-1+deb12u2 \
         build-essential=12.9 \
-        colordiff=1.0.18-1.1 \
-        git=1:2.30.2-1 \
-        iputils-ping=3:20210202-1 \
-        locales=2.31-13+deb11u5 \
-        mariadb-client=1:10.5.18-0+deb11u1 \
-        mosquitto-clients=2.0.11-1 \
-        net-tools=1.60+git20181103.0eebece-1 \
-        nmap=7.91+dfsg1+really7.80+dfsg1-2 \
-        openssh-client=1:8.4p1-5+deb11u1 \
-        openssl=1.1.1n-0+deb11u3 \
-        python3-dev=3.9.2-3 \
-        python3=3.9.2-3 \
-        unzip=6.0-26+deb11u1 \
-        uuid-runtime=2.36.1-8+deb11u1 \
-        wget=1.21-1+deb11u1 \
-        zip=3.0-12 \
-        zsh=5.8-6+deb11u1 \
-        less=551-2 \
+        colordiff=1.0.20-1 \
+        git=1:2.39.5-0+deb12u2 \
+        iputils-ping=3:20221126-1+deb12u1 \
+        locales=2.36-9+deb12u7 \
+        mariadb-client=1:10.11.11-0+deb12u1 \
+        mosquitto-clients=2.0.11-1.2+deb12u1 \
+        net-tools=2.10-0.1 \
+        nmap=7.93+dfsg1-1 \
+        openssh-client=1:9.2p1-2+deb12u5 \
+        openssl=3.0.15-1~deb12u1 \
+        python3-dev=3.11.2-1+b1 \
+        python3-venv=3.11.2-1+b1 \
+        python3=3.11.2-1+b1 \
+        unzip=6.0-28 \
+        uuid-runtime=2.38.1-5+deb12u1 \
+        wget>=1.21.3-1+b2 \
+        zip=3.0-13 \
+        zsh=5.9-4+b5 \
+        less=590-2.1~deb12u2 \
     \
     && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \
     && locale-gen \
@@ -54,14 +58,13 @@ RUN \
     && if [[ "${BUILD_ARCH}" = "aarch64" ]]; then ARCH="arm64"; fi \
     && if [[ "${BUILD_ARCH}" = "amd64" ]]; then ARCH="amd64"; fi \
     && curl -J -L -o /tmp/code.tar.gz \
-        "https://github.com/cdr/code-server/releases/download/v4.9.1/code-server-4.9.1-linux-${ARCH}.tar.gz" \
+        "https://github.com/coder/code-server/releases/download/${CODE_SERVER_VERSION}/code-server-${CODE_SERVER_VERSION#v}-linux-${ARCH}.tar.gz" \
     && mkdir -p /usr/local/lib/code-server \
     && tar zxvf \
         /tmp/code.tar.gz \
         --strip 1 -C /usr/local/lib/code-server \
     \
     && ln -s /usr/local/lib/code-server/bin/code-server /usr/local/bin/code-server \
-    && ln -s /usr/local/lib/code-server/bin/code-server /usr/local/bin/code \
     \
     && mkdir -p /root/.code-server/extensions \
     && uuid=$(uuidgen) \
@@ -87,7 +90,7 @@ RUN \
     && ls -la /usr/local/lib/code-server/lib/vscode/extensions/ \
     \
     && curl -L -s -o /usr/bin/ha \
-        "https://github.com/home-assistant/cli/releases/download/4.23.0/ha_${BUILD_ARCH}" \
+        "https://github.com/home-assistant/cli/releases/download/${HA_CLI_VERSION}/ha_${BUILD_ARCH}" \
     && chmod a+x /usr/bin/ha \
     \
     && git clone --branch master --single-branch --depth 1 \
@@ -108,8 +111,8 @@ RUN \
     && pip3 install --no-cache-dir -r /tmp/requirements.txt \
     \
     && apt-get purge -y --auto-remove \
-        bsdtar \
         build-essential \
+        libarchive-tools \
         python3-dev \
         uuid-runtime \
     \
@@ -127,6 +130,10 @@ RUN \
 # Copy root filesystem
 COPY rootfs /
 
+# Health check
+HEALTHCHECK \
+    CMD curl --fail http://127.0.0.1:1337/healthz || exit 1
+
 # Build arguments
 ARG BUILD_ARCH
 ARG BUILD_DATE

vscode/build.yaml

@@ -1,7 +1,7 @@
 ---
 build_from:
-  aarch64: ghcr.io/hassio-addons/debian-base:6.2.0
-  amd64: ghcr.io/hassio-addons/debian-base:6.2.0
+  aarch64: ghcr.io/hassio-addons/debian-base:7.8.2
+  amd64: ghcr.io/hassio-addons/debian-base:7.8.2
 codenotary:
   base_image: codenotary@frenck.dev
   signer: codenotary@frenck.dev

vscode/config.yaml

@@ -19,12 +19,21 @@ hassio_api: true
 hassio_role: manager
 homeassistant_api: true
 map:
-  - config:rw
-  - ssl:rw
-  - addons:rw
-  - media:rw
-  - share:rw
-  - backup:rw
+  - type: addons
+    read_only: false
+  - type: all_addon_configs
+    read_only: false
+  - type: backup
+    read_only: false
+  - type: homeassistant_config
+    read_only: false
+    path: /config
+  - type: media
+    read_only: false
+  - type: share
+    read_only: false
+  - type: ssl
+    read_only: false
 services:
   - mysql:want
   - mqtt:want

vscode/requirements.txt

@@ -1,2 +1,2 @@
-esphome==2022.12.3
-yamllint==1.28.0
+esphome==2025.4.1
+yamllint==1.37.0

vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/finish

@@ -4,7 +4,6 @@
 # Home Assistant Community Add-on: Studio Code Server
 # Take down the S6 supervision tree when the code server fails
 # ==============================================================================
-declare exit_code
 readonly exit_code_container=$(</run/s6-linux-init-container-results/exitcode)
 readonly exit_code_service="${1}"
 readonly exit_code_signal="${2}"

vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run

@@ -4,7 +4,7 @@
 # Home Assistant Community Add-on: Studio Code Server
 # Persists user settings and installs custom user packages.
 # ==============================================================================
-readonly -a DIRECTORIES=(addons backup config media share ssl)
+readonly -a DIRECTORIES=(addon_configs addons backup homeassistant media share ssl)
 readonly GIT_USER_PATH=/data/git
 readonly SSH_USER_PATH=/data/.ssh
 readonly ZSH_HISTORY_FILE=/root/.zsh_history
@@ -12,10 +12,16 @@ readonly ZSH_HISTORY_PERSISTANT_FILE=/data/.zsh_history
 
 # Links some common directories to the user's home folder for convenience
 for dir in "${DIRECTORIES[@]}"; do
-    ln -s "/${dir}" "${HOME}/${dir}" \
+    ln -sn "/${dir}" "${HOME}/${dir}" \
         || bashio::log.warning "Failed linking common directory: ${dir}"
 done
 
+# Some links to old locations, to not mess with the user's muscle memory
+ln -sn "/config" "${HOME}/config" \
+    || bashio::log.warning "Failed linking common directory: ${HOME}/config"
+ln -sn "/config" "/homeassistant" \
+    || bashio::log.warning "Failed linking common directory: /homeassistant"
+
 # Store SSH settings in add-on data folder
 if ! bashio::fs.directory_exists "${SSH_USER_PATH}"; then
     mkdir -p "${SSH_USER_PATH}" \
@@ -25,7 +31,7 @@ if ! bashio::fs.directory_exists "${SSH_USER_PATH}"; then
         || bashio::exit.nok \
             'Failed setting permissions on persistent .ssh folder'
 fi
-ln -s "${SSH_USER_PATH}" ~/.ssh
+ln -sn "${SSH_USER_PATH}" ~/.ssh || bashio::log.warning "Failed linking .ssh"
 
 # Sets up ZSH shell
 touch "${ZSH_HISTORY_PERSISTANT_FILE}" \
@@ -52,7 +58,7 @@ if ! bashio::fs.file_exists "${GIT_USER_PATH}/.gitconfig"; then
     touch "${GIT_USER_PATH}/.gitconfig" \
         || bashio::exit.nok 'Failed to create .gitconfig'
 fi
-ln -s "${GIT_USER_PATH}/.gitconfig" ~/.gitconfig
+ln -s "${GIT_USER_PATH}/.gitconfig" ~/.gitconfig || bashio::log.warning "Failed linking .gitconfig"
 
 # Install user configured/requested packages
 if bashio::config.has_value 'packages'; then

vscode/rootfs/usr/local/bin/code

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/local/lib/code-server/bin/code-server "${@}"

vscode/vscode.extensions

@@ -1,7 +1,7 @@
-emilast.LogFileHighlighter#2.16.0
-esbenp.prettier-vscode#9.10.3
-ESPHome.esphome-vscode#2022.11.0
-keesschollaart.vscode-home-assistant#1.32.0
+emilast.LogFileHighlighter#3.4.0
+esbenp.prettier-vscode#11.0.0
+ESPHome.esphome-vscode#2023.9.0
+keesschollaart.vscode-home-assistant#1.43.0
 lukas-tr.materialdesignicons-intellisense#4.1.0
 netcorext.uuid-generator#0.0.5
 oderwat.indent-rainbow#8.3.1