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/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 9b224a5..21b20da 100644 --- a/.github/workflows/deploy.yaml +++ b/.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 }} diff --git a/LICENSE.md b/LICENSE.md index 95bbdfe..04e4457 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # MIT License -Copyright (c) 2019-2023 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 3feedb6..82f1055 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ our [GitHub Repository][repository]. MIT License -Copyright (c) 2019-2023 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/2023.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 dc738ef..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/2023.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 93e13f2..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-2023 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 958889e..4eea0cc 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.0.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.8.2 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -20,34 +20,35 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.15.0" -ARG HA_CLI_VERSION="4.27.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 \ + libarchive-tools=3.6.2-1+deb12u2 \ build-essential=12.9 \ colordiff=1.0.20-1 \ - git=1:2.39.2-1.1 \ - iputils-ping=3:20221126-1 \ - locales=2.36-9 \ - mariadb-client=1:10.11.3-1 \ - mosquitto-clients=2.0.11-1.2 \ + 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 \ - openssl=3.0.9-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+b1 \ + uuid-runtime=2.38.1-5+deb12u1 \ wget>=1.21.3-1+b2 \ zip=3.0-13 \ - zsh=5.9-4+b2 \ - less=590-2 \ + 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 \ diff --git a/vscode/build.yaml b/vscode/build.yaml index 02ed244..30d90d3 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.0.0 - amd64: ghcr.io/hassio-addons/debian-base:7.0.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 diff --git a/vscode/config.yaml b/vscode/config.yaml index a680dc1..0921ef8 100644 --- a/vscode/config.yaml +++ b/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 diff --git a/vscode/requirements.txt b/vscode/requirements.txt index dd12604..0493acc 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.7.0 -yamllint==1.32.0 +esphome==2025.4.1 +yamllint==1.37.0 diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/finish b/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/finish index fc23311..7dc933d 100755 --- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/finish +++ b/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=$(