diff --git a/.github/renovate.json b/.github/renovate.json index 46fb1d7..66059a2 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -5,8 +5,9 @@ "labels": ["dependencies", "no-stale"], "commitMessagePrefix": "⬆️", "commitMessageTopic": "{{depName}}", - "regexManagers": [ + "customManagers": [ { + "customType": "regex", "fileMatch": ["/Dockerfile$", "/build.yaml$"], "matchStringsStrategy": "any", "matchStrings": [ @@ -16,6 +17,7 @@ "datasourceTemplate": "docker" }, { + "customType": "regex", "fileMatch": ["/Dockerfile$"], "matchStringsStrategy": "any", "matchStrings": [ @@ -26,6 +28,7 @@ "depNameTemplate": "debian_12/{{{replace 'openssh-client' 'openssh' package}}}" }, { + "customType": "regex", "fileMatch": ["/Dockerfile$"], "matchStrings": [ "ARG CODE_SERVER_VERSION=[\"']?(?.+?)[\"']?\\s+" @@ -34,6 +37,7 @@ "depNameTemplate": "cdr/code-server" }, { + "customType": "regex", "fileMatch": ["/Dockerfile$"], "matchStrings": [ "ARG HA_CLI_VERSION=[\"']?(?.+?)[\"']?\\s+" @@ -43,12 +47,14 @@ "versioningTemplate": "loose" }, { + "customType": "regex", "fileMatch": ["vscode/vscode.extensions$"], "matchStrings": ["emilast\\.LogFileHighlighter#(?.+)\\s"], "datasourceTemplate": "github-releases", "depNameTemplate": "emilast/vscode-logfile-highlighter" }, { + "customType": "regex", "fileMatch": ["vscode/vscode.extensions$"], "matchStrings": ["esbenp\\.prettier-vscode#(?.+)\\s"], "datasourceTemplate": "github-releases", @@ -56,6 +62,7 @@ "extractVersionTemplate": "^v(?.*)$" }, { + "customType": "regex", "fileMatch": ["vscode/vscode.extensions$"], "matchStrings": ["ESPHome\\.esphome-vscode#(?.+)\\s"], "datasourceTemplate": "github-releases", @@ -64,6 +71,7 @@ "extractVersionTemplate": "^v(?.*)$" }, { + "customType": "regex", "fileMatch": ["vscode/vscode.extensions$"], "matchStrings": [ "keesschollaart\\.vscode-home-assistant#(?.+)\\s" @@ -73,6 +81,7 @@ "extractVersionTemplate": "^v(?.*)$" }, { + "customType": "regex", "fileMatch": ["vscode/vscode.extensions$"], "matchStrings": [ "lukas-tr\\.materialdesignicons-intellisense#(?.+)\\s" @@ -82,12 +91,14 @@ "extractVersionTemplate": "^v(?.*)$" }, { + "customType": "regex", "fileMatch": ["vscode/vscode.extensions$"], "matchStrings": ["netcorext\\.uuid-generator#(?.+)\\s"], "datasourceTemplate": "github-releases", "depNameTemplate": "arenchen/vscode-uuid-generator" }, { + "customType": "regex", "fileMatch": ["vscode/vscode.extensions$"], "matchStrings": ["usernamehw\\.errorlens#(?.+)\\s"], "datasourceTemplate": "github-releases", diff --git a/LICENSE.md b/LICENSE.md index 6db2d79..04e4457 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # MIT License -Copyright (c) 2019-2024 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 diff --git a/README.md b/README.md index db89a90..82f1055 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ our [GitHub Repository][repository]. MIT License -Copyright (c) 2019-2024 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/2024.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 diff --git a/vscode/.README.j2 b/vscode/.README.j2 index dd55865..54cbbe1 100644 --- a/vscode/.README.j2 +++ b/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/2024.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 diff --git a/vscode/DOCS.md b/vscode/DOCS.md index 9c7f66c..4670bf0 100644 --- a/vscode/DOCS.md +++ b/vscode/DOCS.md @@ -154,7 +154,7 @@ check [the contributor's page][contributors]. MIT License -Copyright (c) 2019-2024 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 diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 12f09e9..4eea0cc 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.5.1 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.8.2 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -20,27 +20,28 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.93.1" -ARG HA_CLI_VERSION="4.36.0" +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.6.0-1 \ - libarchive-tools=3.6.2-1+deb12u1 \ + libarchive-tools=3.6.2-1+deb12u2 \ build-essential=12.9 \ colordiff=1.0.20-1 \ - git=1:2.39.5-0+deb12u1 \ - iputils-ping=3:20221126-1 \ + git=1:2.39.5-0+deb12u2 \ + iputils-ping=3:20221126-1+deb12u1 \ locales=2.36-9+deb12u7 \ - mariadb-client=1:10.11.6-0+deb12u1 \ + 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+deb12u3 \ - openssl=3.0.14-1~deb12u2 \ + 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 \ diff --git a/vscode/build.yaml b/vscode/build.yaml index 1198a3e..30d90d3 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.5.1 - amd64: ghcr.io/hassio-addons/debian-base:7.5.1 + 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 diff --git a/vscode/requirements.txt b/vscode/requirements.txt index b249a30..0493acc 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.10.0 -yamllint==1.35.1 +esphome==2025.4.1 +yamllint==1.37.0 diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run index 6e560fc..1c35507 100755 --- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run @@ -12,14 +12,14 @@ 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 -s "/config" "${HOME}/config" \ +ln -sn "/config" "${HOME}/config" \ || bashio::log.warning "Failed linking common directory: ${HOME}/config" -ln -s "/config" "/homeassistant" \ +ln -sn "/config" "/homeassistant" \ || bashio::log.warning "Failed linking common directory: /homeassistant" # Store SSH settings in add-on data folder @@ -31,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}" \ @@ -58,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 diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 79b84e8..8e02abe 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#3.3.4 +emilast.LogFileHighlighter#3.4.0 esbenp.prettier-vscode#11.0.0 ESPHome.esphome-vscode#2023.9.0 keesschollaart.vscode-home-assistant#1.43.0