From 64d3a5236a23871f950894097af5efc5b0acc4b5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 28 Mar 2019 23:49:29 +0100 Subject: [PATCH 001/778] :fire: Removes password option from documentation --- README.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/README.md b/README.md index b41a5c1..a099b8e 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,6 @@ Example add-on configuration: ```json { "log_level": "info", - "password": "ChooChooHomie", "ssl": false, "certfile": "fullchain.pem", "keyfile": "privkey.pem", @@ -95,12 +94,6 @@ more severe level, e.g., `debug` also shows `info` messages. By default, the `log_level` is set to `info`, which is the recommended setting unless you are troubleshooting. -### Option: `password` - -Password needed to login into the Visual Studio Code. - -**Note**: _This option support secrets, e.g., `!secret vscode_password`._ - ### Option: `ssl` Enables/Disables SSL (HTTPS). Set it `true` to enable it, `false` otherwise. From 4b04c8b905b923826a73bd3fc3bc461db861072e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 28 Mar 2019 23:50:01 +0100 Subject: [PATCH 002/778] :fire: Removes now obsolete i_like_to_be_pwned option --- README.md | 8 -------- vscode/config.json | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/README.md b/README.md index a099b8e..205e2d7 100644 --- a/README.md +++ b/README.md @@ -132,14 +132,6 @@ authentication on the VSCode by setting it to `true`. **Note**: _We STRONGLY suggest, not to use this, even if this add-on is only exposed to your internal network. USE AT YOUR OWN RISK!_ -### Option: `i_like_to_be_pwned` - -Adding this option to the add-on configuration allows to you bypass the -HaveIBeenPwned password requirement by setting it to `true`. - -**Note**: _We STRONGLY suggest picking a stronger/safer password instead of -using this option! USE AT YOUR OWN RISK!_ - ## Embedding into Home Assistant It is possible to embed VSCode directly into Home Assistant, allowing diff --git a/vscode/config.json b/vscode/config.json index 7179eca..ebd32d7 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -40,7 +40,6 @@ "keyfile": "str", "packages": ["str"], "init_commands": ["str"], - "leave_front_door_open": "bool?", - "i_like_to_be_pwned": "bool?" + "leave_front_door_open": "bool?" } } From 6b4dc36665bd5a2fcaa7386067f38bc406b0922a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 30 Mar 2019 12:53:17 +0100 Subject: [PATCH 003/778] :arrow_up: Upgrades hassio-cli to v2.2.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 9b7a4bc..e91d2ff 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -90,7 +90,7 @@ RUN \ && chmod a+x /usr/local/bin/code-server \ \ && curl -L -s -o /usr/bin/hassio \ - "https://github.com/home-assistant/hassio-cli/releases/download/2.1.0/hassio_${BUILD_ARCH}" \ + "https://github.com/home-assistant/hassio-cli/releases/download/2.2.0/hassio_${BUILD_ARCH}" \ && chmod a+x /usr/bin/hassio \ \ && git clone --branch master --single-branch --depth 1 \ From d34817704641a79e285c8000254bb542fdff0d03 Mon Sep 17 00:00:00 2001 From: Erik-jan Riemers Date: Fri, 5 Apr 2019 15:20:52 +0200 Subject: [PATCH 004/778] :books:Updates installation steps in README (#14) * Update README.md * :pencil2: Tweak --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 205e2d7..0b2b8e5 100644 --- a/README.md +++ b/README.md @@ -45,10 +45,11 @@ comparison to installing any other Hass.io add-on. 1. [Add our Hass.io add-ons repository][repository] to your Hass.io instance. 1. Install the "Visual Studio Code" add-on. -1. Configure a "password" in the add-on settings. 1. Start the "Visual Studio Code" add-on. 1. Check the logs of the "Visual Studio Code" add-on to see if everything went well. +1. Click the "OPEN WEB UI" button to open Visual Studio Code and use the same + username & password as you would use with the Home Assistant frontend. **NOTE**: Do not add this repository to Hass.io, please use: `https://github.com/hassio-addons/repository`. From 7463b1c18911d5c24661ec45e2ff5e30ec43d5f9 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 6 Apr 2019 21:51:30 +0200 Subject: [PATCH 005/778] :sparkles: Adds ack --- vscode/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index e91d2ff..b62ee1b 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -73,6 +73,7 @@ RUN \ python3=3.6.7-1~18.04 \ wget=1.19.4-1ubuntu2.1 \ zsh=5.4.2-3ubuntu3.1 \ + ack=2.22-1 \ \ && luarocks install lua-resty-http 0.13-0 \ \ From 37796108c6db1a3517eb876f9f2cebbcc035cc14 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 6 Apr 2019 21:51:56 +0200 Subject: [PATCH 006/778] :arrow_up: Upgrades code-server to 1.691-vsc1.33.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index b62ee1b..a2723d0 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -82,7 +82,7 @@ RUN \ && locale-gen en_US.UTF-8 \ \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/codercom/code-server/releases/download/1.32.0-310/code-server-1.32.0-310-linux-x64.tar.gz" \ + "https://github.com/codercom/code-server/releases/download/1.691-vsc1.33.0/code-server1.691-vsc1.33.0-linux-x64.tar.gz" \ && tar zxvf \ /tmp/code.tar.gz \ --strip 1 -C /tmp \ From a7ed7982b487d15038f9ace970b8f9266f010563 Mon Sep 17 00:00:00 2001 From: Erik-jan Riemers Date: Sun, 14 Apr 2019 15:07:20 +0200 Subject: [PATCH 007/778] Update README.md (#19) * Update README.md * :pencil2: Tweaks --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 0b2b8e5..dca5e8a 100644 --- a/README.md +++ b/README.md @@ -155,6 +155,10 @@ panel_iframe: - This add-on currently only supports AMD64 machines, although we hope we are able to support ARM devices in the future, it is most likely that most devices will lack the resources to run this add-on (e.g., Raspberry Pi). +- If you get a blank screen (and it worked before), it could be that you changed + your workspace. Reinstalling the add-on will not help since it keeps the data + in your browser. To remove it (Chrome) open up developer mode, then application + tab and find "clear storage". Now refresh the page and your back. - "Visual Studio Code is unable to watch for file changes in this large workspace" (error ENOSPC) From 94402d72b07129675321fbfcb6fe898745828b8f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 14 Apr 2019 22:17:23 +0200 Subject: [PATCH 008/778] :arrow_up: Upgrades base image to v3.1.0 --- .gitlab-ci.yml | 2 +- vscode/Dockerfile | 2 +- vscode/build.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 05f61df..6d0094d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,4 @@ variables: ADDON_ARMV7: "false" ADDON_I386: "false" - ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:3.0.0" + ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:3.1.0" diff --git a/vscode/Dockerfile b/vscode/Dockerfile index a2723d0..060edac 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/ubuntu-base:3.0.0 +ARG BUILD_FROM=hassioaddons/ubuntu-base:3.1.0 ############################################################################### # Build container to get custom vscode extensions. ############################################################################### diff --git a/vscode/build.json b/vscode/build.json index 1a64553..54e2fdb 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { "build_from": { - "amd64": "hassioaddons/ubuntu-base-amd64:3.0.0" + "amd64": "hassioaddons/ubuntu-base-amd64:3.1.0" }, "args": {} } From 868cee242842f04b7157d65c871d9198e77a2e15 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 14 Apr 2019 22:17:46 +0200 Subject: [PATCH 009/778] :arrow_up: Upgrades wget to 1.19.4-1ubuntu2.2 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 060edac..df3e132 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -71,7 +71,7 @@ RUN \ openssl=1.1.0g-2ubuntu4.3 \ python3-dev=3.6.7-1~18.04 \ python3=3.6.7-1~18.04 \ - wget=1.19.4-1ubuntu2.1 \ + wget=1.19.4-1ubuntu2.2 \ zsh=5.4.2-3ubuntu3.1 \ ack=2.22-1 \ \ From 85090406be1cbafaaae6fb27055810e20b63306c Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 14 Apr 2019 22:18:15 +0200 Subject: [PATCH 010/778] :arrow_up: Upgrades code-server to 1.792-vsc1.33.1 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index df3e132..43ad106 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -82,7 +82,7 @@ RUN \ && locale-gen en_US.UTF-8 \ \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/codercom/code-server/releases/download/1.691-vsc1.33.0/code-server1.691-vsc1.33.0-linux-x64.tar.gz" \ + "https://github.com/codercom/code-server/releases/download/1.792-vsc1.33.1/code-server1.792-vsc1.33.1-linux-x64.tar.gz" \ && tar zxvf \ /tmp/code.tar.gz \ --strip 1 -C /tmp \ From 5b716764fa95e6b2cb6d378328c46d70736385af Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 14 Apr 2019 22:19:02 +0200 Subject: [PATCH 011/778] :hammer: Improves S6 finish scripts --- vscode/rootfs/etc/services.d/code/finish | 4 ++-- vscode/rootfs/etc/services.d/nginx/finish | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vscode/rootfs/etc/services.d/code/finish b/vscode/rootfs/etc/services.d/code/finish index eb3f950..5e98225 100644 --- a/vscode/rootfs/etc/services.d/code/finish +++ b/vscode/rootfs/etc/services.d/code/finish @@ -3,7 +3,7 @@ # Community Hass.io Add-ons: Visual Studio Code # Take down the S6 supervision tree when the code server fails # ============================================================================== -if -n { s6-test $# -ne 0 } -if -n { s6-test ${1} -eq 256 } +if { s6-test ${1} -ne 0 } +if { s6-test ${1} -ne 256 } s6-svscanctl -t /var/run/s6/services diff --git a/vscode/rootfs/etc/services.d/nginx/finish b/vscode/rootfs/etc/services.d/nginx/finish index 9fe3ffb..5378801 100644 --- a/vscode/rootfs/etc/services.d/nginx/finish +++ b/vscode/rootfs/etc/services.d/nginx/finish @@ -3,7 +3,7 @@ # Community Hass.io Add-ons: Visual Studio Code # Take down the S6 supervision tree when Nginx fails # ============================================================================== -if -n { s6-test $# -ne 0 } -if -n { s6-test ${1} -eq 256 } +if { s6-test ${1} -ne 0 } +if { s6-test ${1} -ne 256 } s6-svscanctl -t /var/run/s6/services From 2d030869eed155054e08187b7f95d7e59bffbdf2 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 14 Apr 2019 22:20:04 +0200 Subject: [PATCH 012/778] :sparkles: Adds Hassio Ingress support + General refactor --- README.md | 25 +---- vscode/Dockerfile | 6 +- vscode/config.json | 11 ++- .../rootfs/etc/cont-init.d/10-requirements.sh | 6 -- vscode/rootfs/etc/cont-init.d/11-nginx.sh | 17 ---- .../etc/cont-init.d/20-link-common-dirs.sh | 11 --- .../etc/cont-init.d/50-user-ssh-folder.sh | 17 ---- .../rootfs/etc/cont-init.d/51-git-config.sh | 22 ----- .../etc/cont-init.d/80-user-packages.sh | 14 --- .../rootfs/etc/cont-init.d/81-user-scripts.sh | 11 --- .../{30-defaults.sh => code-server.sh} | 2 +- vscode/rootfs/etc/cont-init.d/nginx.sh | 32 +++++++ vscode/rootfs/etc/cont-init.d/user.sh | 53 ++++++++++ vscode/rootfs/etc/nginx/includes/mime.types | 96 +++++++++++++++++++ .../etc/nginx/includes/proxy_params.conf | 15 +++ .../rootfs/etc/nginx/includes/resolver.conf | 1 + .../etc/nginx/includes/server_params.conf | 6 ++ .../rootfs/etc/nginx/includes/ssl_params.conf | 9 ++ .../rootfs/etc/nginx/includes/upstream.conf | 3 + vscode/rootfs/etc/nginx/{ => lua}/ha-auth.lua | 0 vscode/rootfs/etc/nginx/modules/ndk_http.conf | 1 + .../etc/nginx/modules/ngx_http_lua.conf | 1 + vscode/rootfs/etc/nginx/nginx-ssl.conf | 71 -------------- vscode/rootfs/etc/nginx/nginx.conf | 81 ++++++++-------- .../etc/nginx/servers/direct-ssl.disabled | 16 ++++ .../rootfs/etc/nginx/servers/direct.disabled | 11 +++ vscode/rootfs/etc/nginx/servers/ingress.conf | 13 +++ vscode/rootfs/etc/services.d/code/run | 3 +- vscode/rootfs/etc/services.d/nginx/run | 15 +-- 29 files changed, 321 insertions(+), 248 deletions(-) delete mode 100644 vscode/rootfs/etc/cont-init.d/10-requirements.sh delete mode 100644 vscode/rootfs/etc/cont-init.d/11-nginx.sh delete mode 100644 vscode/rootfs/etc/cont-init.d/20-link-common-dirs.sh delete mode 100644 vscode/rootfs/etc/cont-init.d/50-user-ssh-folder.sh delete mode 100644 vscode/rootfs/etc/cont-init.d/51-git-config.sh delete mode 100644 vscode/rootfs/etc/cont-init.d/80-user-packages.sh delete mode 100644 vscode/rootfs/etc/cont-init.d/81-user-scripts.sh rename vscode/rootfs/etc/cont-init.d/{30-defaults.sh => code-server.sh} (95%) create mode 100644 vscode/rootfs/etc/cont-init.d/nginx.sh create mode 100644 vscode/rootfs/etc/cont-init.d/user.sh create mode 100644 vscode/rootfs/etc/nginx/includes/mime.types create mode 100644 vscode/rootfs/etc/nginx/includes/proxy_params.conf create mode 100644 vscode/rootfs/etc/nginx/includes/resolver.conf create mode 100644 vscode/rootfs/etc/nginx/includes/server_params.conf create mode 100644 vscode/rootfs/etc/nginx/includes/ssl_params.conf create mode 100644 vscode/rootfs/etc/nginx/includes/upstream.conf rename vscode/rootfs/etc/nginx/{ => lua}/ha-auth.lua (100%) create mode 100644 vscode/rootfs/etc/nginx/modules/ndk_http.conf create mode 100644 vscode/rootfs/etc/nginx/modules/ngx_http_lua.conf delete mode 100644 vscode/rootfs/etc/nginx/nginx-ssl.conf create mode 100644 vscode/rootfs/etc/nginx/servers/direct-ssl.disabled create mode 100644 vscode/rootfs/etc/nginx/servers/direct.disabled create mode 100644 vscode/rootfs/etc/nginx/servers/ingress.conf diff --git a/README.md b/README.md index dca5e8a..2f03d5e 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,7 @@ comparison to installing any other Hass.io add-on. 1. Start the "Visual Studio Code" add-on. 1. Check the logs of the "Visual Studio Code" add-on to see if everything went well. -1. Click the "OPEN WEB UI" button to open Visual Studio Code and use the same - username & password as you would use with the Home Assistant frontend. +1. Click the "OPEN WEB UI" button to open Visual Studio Code. **NOTE**: Do not add this repository to Hass.io, please use: `https://github.com/hassio-addons/repository`. @@ -70,7 +69,7 @@ Example add-on configuration: "mariadb-client" ], "init_commands": [ - "pip3 install yamllint" + "ls -la" ] } ``` @@ -99,6 +98,9 @@ you are troubleshooting. Enables/Disables SSL (HTTPS). Set it `true` to enable it, `false` otherwise. +**Note**: _The SSL settings only apply to direct access and has no effect +on the Hass.io Ingress service._ + ### Option: `certfile` The certificate file to use for SSL. @@ -133,23 +135,6 @@ authentication on the VSCode by setting it to `true`. **Note**: _We STRONGLY suggest, not to use this, even if this add-on is only exposed to your internal network. USE AT YOUR OWN RISK!_ -## Embedding into Home Assistant - -It is possible to embed VSCode directly into Home Assistant, allowing -you to access your VSCode through the Home Assistant frontend. - -Home Assistant provides the `panel_iframe` component, for these purposes. - -Example configuration: - -```yaml -panel_iframe: - vscode: - title: Visual Studio Code - icon: mdi:visual-studio-code - url: https://address.to.your.hass.io:1337 -``` - ## Known issues and limitations - This add-on currently only supports AMD64 machines, although we hope diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 43ad106..b3ffc29 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -123,8 +123,12 @@ RUN \ \ && rm -fr \ /tmp/* \ + /etc/nginx \ /var/{cache,log}/* \ - /var/lib/apt/lists/* + /var/lib/apt/lists/* \ + \ + && mkdir -p /var/log/nginx \ + && touch /var/log/nginx/error.log # Copy root filesystem COPY rootfs / diff --git a/vscode/config.json b/vscode/config.json index ebd32d7..6fc954a 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -4,8 +4,11 @@ "slug": "vscode", "description": "Fully featured VSCode experience, to edit your HA config in the browser, including auto-completion!", "url": "https://github.com/hassio-addons/addon-vscode", - "webui": "[PROTO:ssl]://[HOST]:[PORT:1337]", + "webui": "[PROTO:ssl]://[HOST]:[PORT:80]", + "ingress": true, + "ingress_port": 1337, "startup": "services", + "homeassistant": "0.91.3", "arch": [ "amd64" ], @@ -14,10 +17,12 @@ "auth_api": true, "hassio_role": "manager", "homeassistant_api": true, - "host_network": false, "auto_uart": true, "ports": { - "1337/tcp": 1337 + "80/tcp": null + }, + "ports_description": { + "80/tcp": "VSCode (Not required for Hass.io Ingress)" }, "map": [ "config:rw", diff --git a/vscode/rootfs/etc/cont-init.d/10-requirements.sh b/vscode/rootfs/etc/cont-init.d/10-requirements.sh deleted file mode 100644 index f722ae9..0000000 --- a/vscode/rootfs/etc/cont-init.d/10-requirements.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Community Hass.io Add-ons: Visual Studio Code -# This files check if all user configuration requirements are met -# ============================================================================== -bashio::config.require.ssl diff --git a/vscode/rootfs/etc/cont-init.d/11-nginx.sh b/vscode/rootfs/etc/cont-init.d/11-nginx.sh deleted file mode 100644 index 422b5a9..0000000 --- a/vscode/rootfs/etc/cont-init.d/11-nginx.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Community Hass.io Add-ons: Visual Studio Code -# Configures NGINX for use with code-server -# ============================================================================== -declare certfile -declare keyfile - -mkdir -p /var/log/nginx - -if bashio::config.true 'ssl'; then - certfile=$(bashio::config 'certfile') - keyfile=$(bashio::config 'keyfile') - - sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/nginx-ssl.conf - sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/nginx-ssl.conf -fi diff --git a/vscode/rootfs/etc/cont-init.d/20-link-common-dirs.sh b/vscode/rootfs/etc/cont-init.d/20-link-common-dirs.sh deleted file mode 100644 index fa66d22..0000000 --- a/vscode/rootfs/etc/cont-init.d/20-link-common-dirs.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Community Hass.io Add-ons: Visual Studio Code -# Links some common directories to the user's home folder for convenience -# ============================================================================== -readonly -a directories=(addons backup config share ssl) - -for dir in "${directories[@]}"; do - ln -s "/${dir}" "${HOME}/${dir}" \ - || bashio::log.warning "Failed linking common directory: ${dir}" -done diff --git a/vscode/rootfs/etc/cont-init.d/50-user-ssh-folder.sh b/vscode/rootfs/etc/cont-init.d/50-user-ssh-folder.sh deleted file mode 100644 index dfb40e9..0000000 --- a/vscode/rootfs/etc/cont-init.d/50-user-ssh-folder.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Community Hass.io Add-ons: Visual Studio Code -# Sets up the users .ssh folder to be persistent -# ============================================================================== -readonly SSH_USER_PATH=/data/.ssh - -if ! bashio::fs.directory_exists "${SSH_USER_PATH}"; then - mkdir -p "${SSH_USER_PATH}" \ - || bashio::exit.nok 'Failed to create a persistent .ssh folder' - - chmod 700 "${SSH_USER_PATH}" \ - || bashio::exit.nok \ - 'Failed setting permissions on persistent .ssh folder' -fi - -ln -s "${SSH_USER_PATH}" ~/.ssh diff --git a/vscode/rootfs/etc/cont-init.d/51-git-config.sh b/vscode/rootfs/etc/cont-init.d/51-git-config.sh deleted file mode 100644 index 0f3fda3..0000000 --- a/vscode/rootfs/etc/cont-init.d/51-git-config.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Community Hass.io Add-ons: Visual Studio Code -# Sets up the users git global config to be persistent -# ============================================================================== -readonly GIT_USER_PATH=/data/git - -if ! bashio::fs.directory_exists "${GIT_USER_PATH}"; then - mkdir -p "${GIT_USER_PATH}" \ - || bashio::exit.nok 'Failed to create a persistent git folder' - - chmod 700 "${GIT_USER_PATH}" \ - || bashio::exit.nok \ - 'Failed setting permissions on persistent git folder' -fi - -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 diff --git a/vscode/rootfs/etc/cont-init.d/80-user-packages.sh b/vscode/rootfs/etc/cont-init.d/80-user-packages.sh deleted file mode 100644 index 835fba6..0000000 --- a/vscode/rootfs/etc/cont-init.d/80-user-packages.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Community Hass.io Add-ons: Visual Studio Code -# Install user configured/requested packages -# ============================================================================== -if bashio::config.has_value 'packages'; then - apt update \ - || bashio::exit.nok 'Failed updating Ubuntu packages repository indexes' - - for package in $(bashio::config 'packages'); do - apt-get install -y "$package" \ - || bashio::exit.nok "Failed installing package ${package}" - done -fi diff --git a/vscode/rootfs/etc/cont-init.d/81-user-scripts.sh b/vscode/rootfs/etc/cont-init.d/81-user-scripts.sh deleted file mode 100644 index c72c425..0000000 --- a/vscode/rootfs/etc/cont-init.d/81-user-scripts.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Community Hass.io Add-ons: Visual Studio Code -# Executes user configured/requested commands on startup -# ============================================================================== -if bashio::config.has_value 'init_commands'; then - while read -r cmd; do - eval "${cmd}" \ - || bashio::exit.nok "Failed executing init command: ${cmd}" - done <<< "$(bashio::config 'init_commands')" -fi diff --git a/vscode/rootfs/etc/cont-init.d/30-defaults.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh similarity index 95% rename from vscode/rootfs/etc/cont-init.d/30-defaults.sh rename to vscode/rootfs/etc/cont-init.d/code-server.sh index 2e3af84..a69b9c6 100644 --- a/vscode/rootfs/etc/cont-init.d/30-defaults.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -1,7 +1,7 @@ #!/usr/bin/with-contenv bashio # ============================================================================== # Community Hass.io Add-ons: Visual Studio Code -# Updates/installs build-in extensions and set up initial user configuration. +# Sets up code-server. # ============================================================================== # Ensure persistent data folder exists diff --git a/vscode/rootfs/etc/cont-init.d/nginx.sh b/vscode/rootfs/etc/cont-init.d/nginx.sh new file mode 100644 index 0000000..427386d --- /dev/null +++ b/vscode/rootfs/etc/cont-init.d/nginx.sh @@ -0,0 +1,32 @@ +#!/usr/bin/with-contenv bashio +# ============================================================================== +# Community Hass.io Add-ons: Visual Studio Code +# Configures NGINX for use with code-server +# ============================================================================== +declare port +declare certfile +declare ingress_interface +declare ingress_port +declare keyfile + +port=$(bashio::addon.port 80) +if bashio::var.has_value "${port}"; then + bashio::config.require.ssl + + if bashio::config.true 'ssl'; then + certfile=$(bashio::config 'certfile') + keyfile=$(bashio::config 'keyfile') + + mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf + sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf + sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf + + else + mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf + fi +fi + +ingress_port=$(bashio::addon.ingress_port) +ingress_interface=$(bashio::addon.ip_address) +sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf +sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf diff --git a/vscode/rootfs/etc/cont-init.d/user.sh b/vscode/rootfs/etc/cont-init.d/user.sh new file mode 100644 index 0000000..b30edaa --- /dev/null +++ b/vscode/rootfs/etc/cont-init.d/user.sh @@ -0,0 +1,53 @@ +#!/usr/bin/with-contenv bashio +# ============================================================================== +# Community Hass.io Add-ons: Visual Studio Code +# Persists user settings and installs custom user packages. +# ============================================================================== +readonly GIT_USER_PATH=/data/git +readonly SSH_USER_PATH=/data/.ssh + +# Store SSH settings in add-on data folder +if ! bashio::fs.directory_exists "${SSH_USER_PATH}"; then + mkdir -p "${SSH_USER_PATH}" \ + || bashio::exit.nok 'Failed to create a persistent .ssh folder' + + chmod 700 "${SSH_USER_PATH}" \ + || bashio::exit.nok \ + 'Failed setting permissions on persistent .ssh folder' +fi +ln -s "${SSH_USER_PATH}" ~/.ssh + +# Store user GIT settings in add-on data folder +if ! bashio::fs.directory_exists "${GIT_USER_PATH}"; then + mkdir -p "${GIT_USER_PATH}" \ + || bashio::exit.nok 'Failed to create a persistent git folder' + + chmod 700 "${GIT_USER_PATH}" \ + || bashio::exit.nok \ + 'Failed setting permissions on persistent git folder' +fi + +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 + +# Install user configured/requested packages +if bashio::config.has_value 'packages'; then + apt update \ + || bashio::exit.nok 'Failed updating Ubuntu packages repository indexes' + + for package in $(bashio::config 'packages'); do + apt-get install -y "$package" \ + || bashio::exit.nok "Failed installing package ${package}" + done +fi + +# Executes user configured/requested commands on startup +if bashio::config.has_value 'init_commands'; then + while read -r cmd; do + eval "${cmd}" \ + || bashio::exit.nok "Failed executing init command: ${cmd}" + done <<< "$(bashio::config 'init_commands')" +fi diff --git a/vscode/rootfs/etc/nginx/includes/mime.types b/vscode/rootfs/etc/nginx/includes/mime.types new file mode 100644 index 0000000..7c7cdef --- /dev/null +++ b/vscode/rootfs/etc/nginx/includes/mime.types @@ -0,0 +1,96 @@ +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/vscode/rootfs/etc/nginx/includes/proxy_params.conf b/vscode/rootfs/etc/nginx/includes/proxy_params.conf new file mode 100644 index 0000000..ec26601 --- /dev/null +++ b/vscode/rootfs/etc/nginx/includes/proxy_params.conf @@ -0,0 +1,15 @@ +proxy_http_version 1.1; +proxy_ignore_client_abort off; +proxy_read_timeout 86400s; +proxy_redirect off; +proxy_send_timeout 86400s; +proxy_max_temp_file_size 0; + +proxy_set_header Accept-Encoding "gzip"; +proxy_set_header Connection $connection_upgrade; +proxy_set_header Host $http_host; +proxy_set_header Upgrade $http_upgrade; +proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +proxy_set_header X-Forwarded-Proto $scheme; +proxy_set_header X-NginX-Proxy true; +proxy_set_header X-Real-IP $remote_addr; diff --git a/vscode/rootfs/etc/nginx/includes/resolver.conf b/vscode/rootfs/etc/nginx/includes/resolver.conf new file mode 100644 index 0000000..6485af1 --- /dev/null +++ b/vscode/rootfs/etc/nginx/includes/resolver.conf @@ -0,0 +1 @@ +resolver 127.0.0.11; diff --git a/vscode/rootfs/etc/nginx/includes/server_params.conf b/vscode/rootfs/etc/nginx/includes/server_params.conf new file mode 100644 index 0000000..09c0654 --- /dev/null +++ b/vscode/rootfs/etc/nginx/includes/server_params.conf @@ -0,0 +1,6 @@ +root /dev/null; +server_name $hostname; + +add_header X-Content-Type-Options nosniff; +add_header X-XSS-Protection "1; mode=block"; +add_header X-Robots-Tag none; diff --git a/vscode/rootfs/etc/nginx/includes/ssl_params.conf b/vscode/rootfs/etc/nginx/includes/ssl_params.conf new file mode 100644 index 0000000..6f15005 --- /dev/null +++ b/vscode/rootfs/etc/nginx/includes/ssl_params.conf @@ -0,0 +1,9 @@ +ssl_protocols TLSv1.2; +ssl_prefer_server_ciphers on; +ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA; +ssl_ecdh_curve secp384r1; +ssl_session_timeout 10m; +ssl_session_cache shared:SSL:10m; +ssl_session_tickets off; +ssl_stapling on; +ssl_stapling_verify on; diff --git a/vscode/rootfs/etc/nginx/includes/upstream.conf b/vscode/rootfs/etc/nginx/includes/upstream.conf new file mode 100644 index 0000000..8c9b878 --- /dev/null +++ b/vscode/rootfs/etc/nginx/includes/upstream.conf @@ -0,0 +1,3 @@ +upstream backend { + server 127.0.0.1:8443; +} diff --git a/vscode/rootfs/etc/nginx/ha-auth.lua b/vscode/rootfs/etc/nginx/lua/ha-auth.lua similarity index 100% rename from vscode/rootfs/etc/nginx/ha-auth.lua rename to vscode/rootfs/etc/nginx/lua/ha-auth.lua diff --git a/vscode/rootfs/etc/nginx/modules/ndk_http.conf b/vscode/rootfs/etc/nginx/modules/ndk_http.conf new file mode 100644 index 0000000..2663122 --- /dev/null +++ b/vscode/rootfs/etc/nginx/modules/ndk_http.conf @@ -0,0 +1 @@ +load_module "/usr/lib/nginx/modules/ndk_http_module.so"; diff --git a/vscode/rootfs/etc/nginx/modules/ngx_http_lua.conf b/vscode/rootfs/etc/nginx/modules/ngx_http_lua.conf new file mode 100644 index 0000000..f885ed9 --- /dev/null +++ b/vscode/rootfs/etc/nginx/modules/ngx_http_lua.conf @@ -0,0 +1 @@ +load_module "/usr/lib/nginx/modules/ngx_http_lua_module.so"; diff --git a/vscode/rootfs/etc/nginx/nginx-ssl.conf b/vscode/rootfs/etc/nginx/nginx-ssl.conf deleted file mode 100644 index bfea197..0000000 --- a/vscode/rootfs/etc/nginx/nginx-ssl.conf +++ /dev/null @@ -1,71 +0,0 @@ -worker_processes 1; -pid /var/run/nginx.pid; -error_log stderr; -env HASSIO_TOKEN; -env DISABLE_HA_AUTHENTICATION; -load_module "/usr/lib/nginx/modules/ndk_http_module.so"; -load_module "/usr/lib/nginx/modules/ngx_http_lua_module.so"; - -events { - worker_connections 1024; -} - -http { - access_log stdout; - include mime.types; - default_type application/octet-stream; - sendfile on; - keepalive_timeout 65; - lua_shared_dict auths 16k; - resolver 127.0.0.11; - - upstream code { - ip_hash; - server 127.0.0.1:8443; - } - - map $http_upgrade $connection_upgrade { - default upgrade; - '' close; - } - - server { - server_name hassio.local; - listen 1337 default_server ssl; - root /dev/null; - - ssl_certificate /ssl/%%certfile%%; - ssl_certificate_key /ssl/%%keyfile%%; - ssl_protocols TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA; - ssl_ecdh_curve secp384r1; - ssl_session_timeout 10m; - ssl_session_cache shared:SSL:10m; - ssl_session_tickets off; - ssl_stapling on; - ssl_stapling_verify on; - - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; - - location / { - access_by_lua_file /etc/nginx/ha-auth.lua; - - proxy_redirect off; - proxy_pass http://code; - - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - proxy_set_header Authorization ""; - - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $http_host; - proxy_set_header X-NginX-Proxy true; - } - } -} diff --git a/vscode/rootfs/etc/nginx/nginx.conf b/vscode/rootfs/etc/nginx/nginx.conf index a0f8ccf..0b7a81e 100644 --- a/vscode/rootfs/etc/nginx/nginx.conf +++ b/vscode/rootfs/etc/nginx/nginx.conf @@ -1,57 +1,58 @@ -worker_processes 1; +# Run nginx in foreground. +daemon off; + +# This is run inside Docker. +user root; + +# Pid storage location. pid /var/run/nginx.pid; -error_log stderr; + +# Set number of worker processes. +worker_processes 1; + +# Enables the use of JIT for regular expressions to speed-up their processing. +pcre_jit on; + +# Write error log to Hass.io add-on log. +error_log /proc/1/fd/1 error; + +# Load allowed environment vars env HASSIO_TOKEN; env DISABLE_HA_AUTHENTICATION; -load_module "/usr/lib/nginx/modules/ndk_http_module.so"; -load_module "/usr/lib/nginx/modules/ngx_http_lua_module.so"; +# Load dynamic modules. +include /etc/nginx/modules/*.conf; + +# Max num of simultaneous connections by a worker process. events { - worker_connections 1024; + worker_connections 512; } http { - access_log stdout; - include mime.types; - default_type application/octet-stream; - sendfile on; - keepalive_timeout 65; - lua_shared_dict auths 16k; - resolver 127.0.0.11; + include /etc/nginx/includes/mime.types; - upstream code { - ip_hash; - server 127.0.0.1:8443; - } + log_format hassio '[$time_local] $status ' + '$http_x_forwarded_for($remote_addr) ' + '$request ($http_user_agent)'; + + access_log /proc/1/fd/1 hassio; + client_max_body_size 4G; + default_type application/octet-stream; + gzip on; + keepalive_timeout 65; + lua_shared_dict auths 16k; + sendfile on; + server_tokens off; + tcp_nodelay on; + tcp_nopush on; map $http_upgrade $connection_upgrade { default upgrade; '' close; } - server { - server_name hassio.local; - listen 1337 default_server; - root /dev/null; + include /etc/nginx/includes/resolver.conf; + include /etc/nginx/includes/upstream.conf; - location / { - access_by_lua_file /etc/nginx/ha-auth.lua; - - proxy_redirect off; - proxy_pass http://code; - - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - proxy_set_header Authorization ""; - - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $http_host; - proxy_set_header X-NginX-Proxy true; - proxy_read_timeout 86400s; - proxy_send_timeout 86400s; - } - } + include /etc/nginx/servers/*.conf; } diff --git a/vscode/rootfs/etc/nginx/servers/direct-ssl.disabled b/vscode/rootfs/etc/nginx/servers/direct-ssl.disabled new file mode 100644 index 0000000..5587fbe --- /dev/null +++ b/vscode/rootfs/etc/nginx/servers/direct-ssl.disabled @@ -0,0 +1,16 @@ +server { + listen 80 default_server ssl http2; + + include /etc/nginx/includes/server_params.conf; + include /etc/nginx/includes/ssl_params.conf; + include /etc/nginx/includes/proxy_params.conf; + + ssl on; + ssl_certificate /ssl/%%certfile%%; + ssl_certificate_key /ssl/%%keyfile%%; + + location / { + access_by_lua_file /etc/nginx/lua/ha-auth.lua; + proxy_pass http://backend; + } +} diff --git a/vscode/rootfs/etc/nginx/servers/direct.disabled b/vscode/rootfs/etc/nginx/servers/direct.disabled new file mode 100644 index 0000000..0065acb --- /dev/null +++ b/vscode/rootfs/etc/nginx/servers/direct.disabled @@ -0,0 +1,11 @@ +server { + listen 80 default_server; + + include /etc/nginx/includes/server_params.conf; + include /etc/nginx/includes/proxy_params.conf; + + location / { + access_by_lua_file /etc/nginx/lua/ha-auth.lua; + proxy_pass http://backend; + } +} diff --git a/vscode/rootfs/etc/nginx/servers/ingress.conf b/vscode/rootfs/etc/nginx/servers/ingress.conf new file mode 100644 index 0000000..225f316 --- /dev/null +++ b/vscode/rootfs/etc/nginx/servers/ingress.conf @@ -0,0 +1,13 @@ +server { + listen %%interface%%:1337 default_server; + + include /etc/nginx/includes/server_params.conf; + include /etc/nginx/includes/proxy_params.conf; + + location / { + allow 172.30.32.2; + deny all; + + proxy_pass http://backend; + } +} diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index 4506982..0246e89 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -8,7 +8,8 @@ declare -a options bashio::log.info 'Starting the code server...' options+=(--port 8443) -options+=(--data-dir "/data/vscode") +options+=(--user-data-dir "/data/vscode") +options+=(--extensions-dir "/data/vscode/extensions") options+=(--host 127.0.0.1) options+=(--allow-http) diff --git a/vscode/rootfs/etc/services.d/nginx/run b/vscode/rootfs/etc/services.d/nginx/run index 653a417..2b393a9 100644 --- a/vscode/rootfs/etc/services.d/nginx/run +++ b/vscode/rootfs/etc/services.d/nginx/run @@ -3,14 +3,9 @@ # Community Hass.io Add-ons: Visual Studio Code # Runs the Nginx daemon # ============================================================================== -declare -a options # Wait for code-server to become available -s6-svwait -u -t 5000 /var/run/s6/services/code -timeout 15 \ - bash -c \ - 'until echo > /dev/tcp/localhost/8443 ; do sleep 0.5; done' \ - > /dev/null 2>&1 +bashio::net.wait_for 8443 bashio::log.info "Starting NGinx..." @@ -19,10 +14,4 @@ if bashio::config.true 'leave_front_door_open'; then export DISABLE_HA_AUTHENTICATION=true fi -options+=(-g "daemon off;") - -if bashio::config.true 'ssl'; then - options+=(-c /etc/nginx/nginx-ssl.conf) -fi - -exec nginx "${options[@]}" +exec nginx From 35a5a3525e506f620de34f00ea52fb6d8cb4cbfd Mon Sep 17 00:00:00 2001 From: Jorim Tielemans Date: Sun, 14 Apr 2019 22:34:56 +0200 Subject: [PATCH 013/778] :books: Fixes some typos in the documentation (#20) Your -> you're --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2f03d5e..76185ec 100644 --- a/README.md +++ b/README.md @@ -142,8 +142,8 @@ only exposed to your internal network. USE AT YOUR OWN RISK!_ most devices will lack the resources to run this add-on (e.g., Raspberry Pi). - If you get a blank screen (and it worked before), it could be that you changed your workspace. Reinstalling the add-on will not help since it keeps the data - in your browser. To remove it (Chrome) open up developer mode, then application - tab and find "clear storage". Now refresh the page and your back. + in your browser. To remove it (in Chrome) open up developer tools (F12), then go to the application + tab and click "clear storage". Now refresh the page and you're back in action. - "Visual Studio Code is unable to watch for file changes in this large workspace" (error ENOSPC) From ff64d8c6cb634a023247b43de476c3fc20fb6056 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 14 Apr 2019 23:22:11 +0200 Subject: [PATCH 014/778] :shirt: Fixes Markdownlint warnings --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 76185ec..050ac9a 100644 --- a/README.md +++ b/README.md @@ -142,10 +142,11 @@ only exposed to your internal network. USE AT YOUR OWN RISK!_ most devices will lack the resources to run this add-on (e.g., Raspberry Pi). - If you get a blank screen (and it worked before), it could be that you changed your workspace. Reinstalling the add-on will not help since it keeps the data - in your browser. To remove it (in Chrome) open up developer tools (F12), then go to the application - tab and click "clear storage". Now refresh the page and you're back in action. + in your browser. To remove it (in Chrome) open up developer tools (F12), + then go to the application tab and click "clear storage". + Now refresh the page and you're back in action. - "Visual Studio Code is unable to watch for file changes in this large - workspace" (error ENOSPC) + workspace" (error ENOSPC) This issue is caused by your system not having enough file handles, which causes VSCode to be unable to watch all your files. For HassOS, From bacec0d21face130420f671b9ac52e762edd3acc Mon Sep 17 00:00:00 2001 From: Timmo Date: Thu, 18 Apr 2019 10:20:13 +0100 Subject: [PATCH 015/778] :arrow_up: Update code server to 1.868-vsc1.33.1 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index b3ffc29..1e54a8d 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -82,7 +82,7 @@ RUN \ && locale-gen en_US.UTF-8 \ \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/codercom/code-server/releases/download/1.792-vsc1.33.1/code-server1.792-vsc1.33.1-linux-x64.tar.gz" \ + "https://github.com/codercom/code-server/releases/download/1.868-vsc1.33.1/code-server1.868-vsc1.33.1-linux-x64.tar.gz" \ && tar zxvf \ /tmp/code.tar.gz \ --strip 1 -C /tmp \ From cefcf7b0ba300179094b2f756bc7b70a634069bc Mon Sep 17 00:00:00 2001 From: Timmo Date: Thu, 18 Apr 2019 10:22:07 +0100 Subject: [PATCH 016/778] :hammer: Adds disable telemetry flag --- vscode/rootfs/etc/services.d/code/run | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index 0246e89..d7f46b1 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -12,6 +12,7 @@ options+=(--user-data-dir "/data/vscode") options+=(--extensions-dir "/data/vscode/extensions") options+=(--host 127.0.0.1) options+=(--allow-http) +options+=(--disable-telemetry) # Disable code authentication, we use HA authentication options+=(--no-auth) From ecab453e8bda015d6c1546526be93822cb8da5f2 Mon Sep 17 00:00:00 2001 From: Timmo Date: Thu, 18 Apr 2019 10:45:19 +0100 Subject: [PATCH 017/778] :hammer: Add disable telemetry as an option --- README.md | 7 ++++++- vscode/config.json | 4 +++- vscode/rootfs/etc/services.d/code/run | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 050ac9a..60c9371 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,8 @@ Example add-on configuration: ], "init_commands": [ "ls -la" - ] + ], + "disable_telemetry": false } ``` @@ -127,6 +128,10 @@ Customize your VSCode environment even more with the `init_commands` option. Add one or more shell commands to the list, and they will be executed every single time this add-on starts. +### Option: `disable_telemetry` + +Disables annonymous usage telemetry data from being sent to code-server. + ### Option: `leave_front_door_open` Adding this option to the add-on configuration allows you to disable diff --git a/vscode/config.json b/vscode/config.json index 6fc954a..713926b 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -36,7 +36,8 @@ "certfile": "fullchain.pem", "keyfile": "privkey.pem", "packages": [], - "init_commands": [] + "init_commands": [], + "disable_telemetry": false }, "schema": { "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?", @@ -45,6 +46,7 @@ "keyfile": "str", "packages": ["str"], "init_commands": ["str"], + "disable_telemetry": "bool?", "leave_front_door_open": "bool?" } } diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index d7f46b1..916cedd 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -12,7 +12,10 @@ options+=(--user-data-dir "/data/vscode") options+=(--extensions-dir "/data/vscode/extensions") options+=(--host 127.0.0.1) options+=(--allow-http) -options+=(--disable-telemetry) + +if bashio::config.true 'disable_telemetry'; then + options+=(--disable-telemetry) +fi # Disable code authentication, we use HA authentication options+=(--no-auth) From 54a2ca7a3462d12f6b196bf257c8774db27daf52 Mon Sep 17 00:00:00 2001 From: Erik-jan Riemers Date: Fri, 19 Apr 2019 12:32:51 +0200 Subject: [PATCH 018/778] :sparkles: Adds vscode YAML extension (#26) * Update to use !items in yaml * Add yaml checker --- vscode/rootfs/root/.code-server/settings.json | 15 ++++++++++++++- vscode/vscode.extensions | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index c65a119..1eeb5a0 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -8,5 +8,18 @@ "**/deps/**": true }, "editor.selectionClipboard": false, - "terminal.integrated.copyOnSelection": true + "terminal.integrated.copyOnSelection": true, + "settings": { + "editor.tabSize": 2, + "editor.renderWhitespace": "boundary", + "yaml.customTags": [ + "!secret", + "!yaml", + "!include", + "!include_dir_list", + "!include_dir_named", + "!include_dir_merge_list", + "!include_dir_merge_named" + ] + } } diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 2db10e0..d64c6c0 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,2 +1,3 @@ keesschollaart.vscode-home-assistant lukas-tr.materialdesignicons-intellisense +redhat.vscode-yaml From 62e959d3144d5464cbf7757f63cf9e598737fb7f Mon Sep 17 00:00:00 2001 From: hjanum Date: Fri, 19 Apr 2019 03:34:47 -0700 Subject: [PATCH 019/778] :sparkles: Adds *.dash extension for YAML (#24) Added dash extension for YAML --- vscode/rootfs/root/.code-server/settings.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index 1eeb5a0..e483485 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -7,6 +7,9 @@ "**/__pycache__/**": true, "**/deps/**": true }, + "files.associations": { + "*.dash": "yaml" + }, "editor.selectionClipboard": false, "terminal.integrated.copyOnSelection": true, "settings": { From bf63c46cc6f863cd29e3b9ebee0d3e977f630e1a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 19 Apr 2019 18:16:31 +0200 Subject: [PATCH 020/778] :sparkles: Adds user configuration upgrade method --- vscode/rootfs/etc/cont-init.d/code-server.sh | 19 +++++++++++--- vscode/rootfs/root/.code-server/settings.json | 25 ++++++++++--------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index a69b9c6..a4d2f9f 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -4,13 +4,18 @@ # Sets up code-server. # ============================================================================== -# Ensure persistent data folder exists +# List of previous config hashes, to allow upgrade "default" configs. +readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( + 86776df88391c3d94f79f62b430f9ff8538960628d5e04fb660165a5a46640d2e74f89cd68b3e6985dc59101ae2dda00a1e25aa48381acfd4736858c5f23878b +) + +# Ensure persistent data folder exists. if ! bashio::fs.directory_exists '/data/vscode'; then mkdir -p /data/vscode/extensions \ || bashio::exit.nok "Could not create persistent storage folder." fi -# Copy in the extensions we deliver +# Copy in the extensions we deliver. cp -R /root/.code-server/extensions/* /data/vscode/extensions # Sets up default user settings on first start. @@ -21,7 +26,13 @@ if ! bashio::fs.file_exists '/data/vscode/User/settings.json'; then cp /root/.code-server/settings.json /data/vscode/User/settings.json fi -# Workaround workspace bug for code-server +# Upgrade settings.json is still default from previous version. +current=$(sha512sum /data/vscode/User/settings.json|cut -d " " -f 1) +if [[ " ${PREVIOUS_DEFAULT_CONFIG_HASHES[*]} " == *" ${current} "* ]]; then + cp /root/.code-server/settings.json /data/vscode/User/settings.json +fi + +# Workaround workspace bug for code-server. # https://github.com/codercom/code-server/issues/121 if ! bashio::fs.file_exists '/data/vscode/Backups/workspaces.json'; then mkdir -p /data/vscode/Backups \ @@ -29,7 +40,7 @@ if ! bashio::fs.file_exists '/data/vscode/Backups/workspaces.json'; then cp /root/.code-server/workspaces.json /data/vscode/Backups/workspaces.json fi -# Workaround workspace bug for code-server (same as above, part 2) +# Workaround workspace bug for code-server (same as above, part 2). # https://github.com/codercom/code-server/issues/121 if ! bashio::fs.file_exists '/data/vscode/User/workspaceStorage'; then mkdir -p /data/vscode/User/workspaceStorage \ diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index e483485..f327008 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -13,16 +13,17 @@ "editor.selectionClipboard": false, "terminal.integrated.copyOnSelection": true, "settings": { - "editor.tabSize": 2, - "editor.renderWhitespace": "boundary", - "yaml.customTags": [ - "!secret", - "!yaml", - "!include", - "!include_dir_list", - "!include_dir_named", - "!include_dir_merge_list", - "!include_dir_merge_named" - ] - } + "editor.tabSize": 2, + "editor.renderWhitespace": "boundary", + "yaml.customTags": [ + "!env_var", + "!include_dir_list", + "!include_dir_merge_list", + "!include_dir_merge_named", + "!include_dir_named", + "!include", + "!secret", + "!yaml" + ] + } } From a1bbf10f65fa48e1f18ab1649e3cd6dc219a849e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 19 Apr 2019 18:18:19 +0200 Subject: [PATCH 021/778] :books: Updates README about section to match latest changes --- README.md | 2 +- vscode/.README.j2 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 60c9371..a259402 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ into the Home Assistant frontend UI. Visual Studio Code runs as a remote server using `code-server`, and is a fully fledged VSCode experience. -The add-on has the Home Assistant and MDI icons extensions pre-installed +The add-on has the Home Assistant, MDI icons and YAML extensions pre-installed and pre-configured right out of the box. This means that auto-completion works instantly, without the need for configuring anything. diff --git a/vscode/.README.j2 b/vscode/.README.j2 index 09355e2..99df7d1 100644 --- a/vscode/.README.j2 +++ b/vscode/.README.j2 @@ -19,8 +19,8 @@ into the Home Assistant frontend UI. Visual Studio Code runs as a remote server using `code-server`, and is a fully fledged VSCode experience. -The add-on has the Home Assistant and MDI icons extensions pre-installed -and pre-configured right out of the box. This means that autocompletion works +The add-on has the Home Assistant, MDI icons and YAML extensions pre-installed +and pre-configured right out of the box. This means that auto-completion works instantly, without the need for configuring anything. [Click here for the full documentation][docs] From 3eb4c16a691aea1921a7e6a8924ae066a17ee627 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 19 Apr 2019 19:35:10 +0200 Subject: [PATCH 022/778] :sparkles: Persist user's ZSH history across restarts --- vscode/rootfs/etc/cont-init.d/user.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/vscode/rootfs/etc/cont-init.d/user.sh b/vscode/rootfs/etc/cont-init.d/user.sh index b30edaa..5faf30c 100644 --- a/vscode/rootfs/etc/cont-init.d/user.sh +++ b/vscode/rootfs/etc/cont-init.d/user.sh @@ -5,6 +5,8 @@ # ============================================================================== readonly GIT_USER_PATH=/data/git readonly SSH_USER_PATH=/data/.ssh +readonly ZSH_HISTORY_FILE=/root/.zsh_history +readonly ZSH_HISTORY_PERSISTANT_FILE=/data/.zsh_history # Store SSH settings in add-on data folder if ! bashio::fs.directory_exists "${SSH_USER_PATH}"; then @@ -17,6 +19,17 @@ if ! bashio::fs.directory_exists "${SSH_USER_PATH}"; then fi ln -s "${SSH_USER_PATH}" ~/.ssh +# Sets up ZSH shell +touch "${ZSH_HISTORY_PERSISTANT_FILE}" \ + || bashio::exit.nok 'Failed creating a persistent ZSH history file' + +chmod 600 "$ZSH_HISTORY_PERSISTANT_FILE" \ + || bashio::exit.nok \ + 'Failed setting the correct permissions to the ZSH history file' + +ln -s -f "$ZSH_HISTORY_PERSISTANT_FILE" "$ZSH_HISTORY_FILE" \ + || bashio::exit.nok 'Failed linking the persistant ZSH history file' + # Store user GIT settings in add-on data folder if ! bashio::fs.directory_exists "${GIT_USER_PATH}"; then mkdir -p "${GIT_USER_PATH}" \ From 43e6fa95bb300f25fbb257dbb2eef89ce1ebff57 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 19 Apr 2019 19:35:47 +0200 Subject: [PATCH 023/778] :hammer: Tweaked default user settings for a better starting experience --- vscode/rootfs/root/.code-server/settings.json | 52 +++++++++++-------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index f327008..55fc4e9 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -1,29 +1,39 @@ { - "files.watcherExclude": { - "**/__pycache__/**": true, - "**/deps/**": true - }, - "search.exclude": { - "**/__pycache__/**": true, - "**/deps/**": true - }, + "editor.renderWhitespace": "boundary", + "editor.selectionClipboard": false, "files.associations": { "*.dash": "yaml" }, - "editor.selectionClipboard": false, + "files.watcherExclude": { + "**/__pycache__/**": true, + "**/deps/**": true, + ".Trash-0/**": true, + ".nfs**": true, + }, + "search.exclude": { + "**/__pycache__/**": true, + "**/deps/**": true, + ".Trash-0/**": true, + }, "terminal.integrated.copyOnSelection": true, - "settings": { + "yaml.customTags": [ + "!env_var scalar", + "!include_dir_list scalar", + "!include_dir_merge_list scalar", + "!include_dir_merge_named scalar", + "!include_dir_named scalar", + "!include scalar", + "!secret scalar" + ], + "yaml.format.enable": true, + "[yaml]": { + "editor.autoIndent": true, + "editor.insertSpaces": true, "editor.tabSize": 2, - "editor.renderWhitespace": "boundary", - "yaml.customTags": [ - "!env_var", - "!include_dir_list", - "!include_dir_merge_list", - "!include_dir_merge_named", - "!include_dir_named", - "!include", - "!secret", - "!yaml" - ] + "editor.quickSuggestions": { + "other": true, + "comments": false, + "strings": true + } } } From 5d58577ec9f98e1d8db8e1f24718472c21208604 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 19 Apr 2019 19:38:25 +0200 Subject: [PATCH 024/778] :shirt: Fixes JSON lint issue --- vscode/rootfs/root/.code-server/settings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index 55fc4e9..bb79bb3 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -8,12 +8,12 @@ "**/__pycache__/**": true, "**/deps/**": true, ".Trash-0/**": true, - ".nfs**": true, + ".nfs**": true }, "search.exclude": { "**/__pycache__/**": true, "**/deps/**": true, - ".Trash-0/**": true, + ".Trash-0/**": true }, "terminal.integrated.copyOnSelection": true, "yaml.customTags": [ From 45f86db5bec71e6ba8b1301ee3f8fc136ccfdc9b Mon Sep 17 00:00:00 2001 From: Timmo Date: Sat, 20 Apr 2019 13:48:41 +0100 Subject: [PATCH 025/778] :arrow_up: Updates code-server to 1.903-vsc1.33.1 (#29) --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 1e54a8d..53114d9 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -82,7 +82,7 @@ RUN \ && locale-gen en_US.UTF-8 \ \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/codercom/code-server/releases/download/1.868-vsc1.33.1/code-server1.868-vsc1.33.1-linux-x64.tar.gz" \ + "https://github.com/codercom/code-server/releases/download/1.903-vsc1.33.1/code-server1.903-vsc1.33.1-linux-x64.tar.gz" \ && tar zxvf \ /tmp/code.tar.gz \ --strip 1 -C /tmp \ From dc8e22dd80db1fde3e53d1cc028cf9d95f4b76a2 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 25 Apr 2019 08:19:34 +0200 Subject: [PATCH 026/778] :arrow_up: Updates Home Assistant requirement to 0.92.0b2 --- vscode/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/config.json b/vscode/config.json index 713926b..f69ff04 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -8,7 +8,7 @@ "ingress": true, "ingress_port": 1337, "startup": "services", - "homeassistant": "0.91.3", + "homeassistant": "0.92.0b2", "arch": [ "amd64" ], From b49ad9aa35dc2d187efc16d4b7c325040f8987bb Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 25 Apr 2019 08:20:46 +0200 Subject: [PATCH 027/778] :sparkles: Adds support for showing in sidebar --- vscode/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/config.json b/vscode/config.json index f69ff04..4f7b67f 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -7,6 +7,7 @@ "webui": "[PROTO:ssl]://[HOST]:[PORT:80]", "ingress": true, "ingress_port": 1337, + "panel_icon": "mdi:visual-studio-code", "startup": "services", "homeassistant": "0.92.0b2", "arch": [ From df40b6a0f81ddc80a557bdced3244dcecadb9eeb Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 6 May 2019 12:45:48 +0200 Subject: [PATCH 028/778] :arrow_up: Upgrades add-on base image to 3.1.1 --- .gitlab-ci.yml | 2 +- vscode/Dockerfile | 2 +- vscode/build.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d0094d..2ef564d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,4 @@ variables: ADDON_ARMV7: "false" ADDON_I386: "false" - ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:3.1.0" + ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:3.1.1" diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 53114d9..7d0a1bc 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/ubuntu-base:3.1.0 +ARG BUILD_FROM=hassioaddons/ubuntu-base:3.1.1 ############################################################################### # Build container to get custom vscode extensions. ############################################################################### diff --git a/vscode/build.json b/vscode/build.json index 54e2fdb..4c26788 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { "build_from": { - "amd64": "hassioaddons/ubuntu-base-amd64:3.1.0" + "amd64": "hassioaddons/ubuntu-base-amd64:3.1.1" }, "args": {} } From dbe3ae29e8f8d79ac09516d903597e94d7714dd5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 6 May 2019 12:51:28 +0200 Subject: [PATCH 029/778] :arrow_up: Upgrades code-server to 1.939-vsc1.33.1 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 7d0a1bc..9a83ca2 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -82,7 +82,7 @@ RUN \ && locale-gen en_US.UTF-8 \ \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/codercom/code-server/releases/download/1.903-vsc1.33.1/code-server1.903-vsc1.33.1-linux-x64.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/1.939-vsc1.33.1/code-server1.939-vsc1.33.1-linux-x64.tar.gz" \ && tar zxvf \ /tmp/code.tar.gz \ --strip 1 -C /tmp \ From 68d15ee1b1c3be148a6ca51e5efc7ece8304ef5e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 10 May 2019 12:14:58 +0200 Subject: [PATCH 030/778] :ambulance: Turns of Lua Resty core in Nginx --- vscode/rootfs/etc/nginx/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/rootfs/etc/nginx/nginx.conf b/vscode/rootfs/etc/nginx/nginx.conf index 0b7a81e..001b39e 100644 --- a/vscode/rootfs/etc/nginx/nginx.conf +++ b/vscode/rootfs/etc/nginx/nginx.conf @@ -40,6 +40,7 @@ http { default_type application/octet-stream; gzip on; keepalive_timeout 65; + lua_load_resty_core off; lua_shared_dict auths 16k; sendfile on; server_tokens off; From 833ff73808e077149b11d98a22a5f606da1ba34a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 10 May 2019 12:45:11 +0200 Subject: [PATCH 031/778] Revert ":ambulance: Turns of Lua Resty core in Nginx" This reverts commit 68d15ee1b1c3be148a6ca51e5efc7ece8304ef5e. --- vscode/rootfs/etc/nginx/nginx.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/vscode/rootfs/etc/nginx/nginx.conf b/vscode/rootfs/etc/nginx/nginx.conf index 001b39e..0b7a81e 100644 --- a/vscode/rootfs/etc/nginx/nginx.conf +++ b/vscode/rootfs/etc/nginx/nginx.conf @@ -40,7 +40,6 @@ http { default_type application/octet-stream; gzip on; keepalive_timeout 65; - lua_load_resty_core off; lua_shared_dict auths 16k; sendfile on; server_tokens off; From f765b617e5ce6d7a7a8488454a030922c77da036 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 10 May 2019 18:40:14 +0200 Subject: [PATCH 032/778] :hammer: Pins versions of VSCode extensions --- vscode/Dockerfile | 4 +++- vscode/vscode.extensions | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 9a83ca2..03ac672 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -30,7 +30,9 @@ RUN \ RUN \ while read -r ext; do \ echo "Installing vscode extension: ${ext}"; \ - code --user-data-dir /root/.config/Code --install-extension "${ext}"; \ + code \ + --user-data-dir /root/.config/Code \ + --install-extension "${ext%#*}"; \ done < /root/vscode.extensions \ && ls -la /root/.vscode/extensions diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index d64c6c0..a7d9cfb 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,3 @@ -keesschollaart.vscode-home-assistant -lukas-tr.materialdesignicons-intellisense -redhat.vscode-yaml +keesschollaart.vscode-home-assistant#0.5.6 +lukas-tr.materialdesignicons-intellisense#1.3.1 +redhat.vscode-yaml#0.4.0 From d57fa012519d23b62f27c9168331cf7850b7a7e5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 10 May 2019 18:41:22 +0200 Subject: [PATCH 033/778] :hammer: Extends file watcher exclude list --- vscode/rootfs/etc/cont-init.d/code-server.sh | 1 + vscode/rootfs/root/.code-server/settings.json | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index a4d2f9f..fec6d9e 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -7,6 +7,7 @@ # List of previous config hashes, to allow upgrade "default" configs. readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( 86776df88391c3d94f79f62b430f9ff8538960628d5e04fb660165a5a46640d2e74f89cd68b3e6985dc59101ae2dda00a1e25aa48381acfd4736858c5f23878b + 2be4c50575c05711d30121c3a1320698d3dbb034523c481be3aad3b638af3e0a46113d8c3f8cfc1b0f01e4cc10f32da3a30feca161c31b5b27177aeb7231bf70 ) # Ensure persistent data folder exists. diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index bb79bb3..4520b8f 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -5,10 +5,19 @@ "*.dash": "yaml" }, "files.watcherExclude": { - "**/__pycache__/**": true, - "**/deps/**": true, + ".nfs**": true, ".Trash-0/**": true, - ".nfs**": true + "**/__pycache__/**": true, + "**/._*": true, + "**/.git/objects/**": true, + "**/.git/subtree-cache/**": true, + "**/*.db-shm": true, + "**/*.db-wal": true, + "**/*.db": true, + "**/*.log": true, + "**/deps/**": true, + "**/OZW_Log.txt": true, + "**/pyozw.sqlite": true }, "search.exclude": { "**/__pycache__/**": true, From 69029577f8dfe8e5f8674fff00de95bb66cab578 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 10 May 2019 19:05:17 +0200 Subject: [PATCH 034/778] :hammer: Associates yaml file to Home Assistant by default --- vscode/rootfs/etc/cont-init.d/code-server.sh | 1 + vscode/rootfs/root/.code-server/settings.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index fec6d9e..dffe0ac 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -8,6 +8,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( 86776df88391c3d94f79f62b430f9ff8538960628d5e04fb660165a5a46640d2e74f89cd68b3e6985dc59101ae2dda00a1e25aa48381acfd4736858c5f23878b 2be4c50575c05711d30121c3a1320698d3dbb034523c481be3aad3b638af3e0a46113d8c3f8cfc1b0f01e4cc10f32da3a30feca161c31b5b27177aeb7231bf70 + d4745002643a0168f65bc5b465a9baff59af0fb4783b50553e1a4e8b3f1a569fc4905df19b7743f7f313a5809a5128d997fc4b5e0a0e5db0a01f47b3b7bec39d ) # Ensure persistent data folder exists. diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index 4520b8f..9793d42 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -2,7 +2,8 @@ "editor.renderWhitespace": "boundary", "editor.selectionClipboard": false, "files.associations": { - "*.dash": "yaml" + "*.dash": "yaml", + "*.yaml": "home-assistant" }, "files.watcherExclude": { ".nfs**": true, From ec97a5daeacf30291ed5fd27aa3c18e966d67e8e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 10 May 2019 19:32:51 +0200 Subject: [PATCH 035/778] :sparkles: Adds vscode settings reset command --- README.md | 12 ++++++++++++ vscode/rootfs/root/.zshrc | 1 + 2 files changed, 13 insertions(+) diff --git a/README.md b/README.md index a259402..a356aed 100644 --- a/README.md +++ b/README.md @@ -140,6 +140,18 @@ authentication on the VSCode by setting it to `true`. **Note**: _We STRONGLY suggest, not to use this, even if this add-on is only exposed to your internal network. USE AT YOUR OWN RISK!_ +## Resetting your VSCode settings to the add-on defaults + +The add-on updates your settings to be optimized for use with Home Assistant. +As soon as you change a setting, the add-on will stop doing that since it +might be destructive. However, in case you changed some things, but want to +return to the defaults as delivered by this add-on, do the following: + +1. Open the Visual Studio Code editor. +1. Click on `Terminal` in the top menu bar and clik on `New Terminal`. +1. Execute the following command in the terminal window: `reset-settings`. +1. Done! + ## Known issues and limitations - This add-on currently only supports AMD64 machines, although we hope diff --git a/vscode/rootfs/root/.zshrc b/vscode/rootfs/root/.zshrc index e4721be..3366aec 100755 --- a/vscode/rootfs/root/.zshrc +++ b/vscode/rootfs/root/.zshrc @@ -92,6 +92,7 @@ source $ZSH/oh-my-zsh.sh # Example aliases # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" +alias reset-settings="cp /root/.code-server/settings.json /data/vscode/User/settings.json && echo 'Setting restored!'" # Home Assistant CLI eval "$(_HASS_CLI_COMPLETE=source_zsh hass-cli)" From 853fd03db64824c68f0b98a54d2f893d6484aea5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 11 May 2019 09:33:05 +0200 Subject: [PATCH 036/778] :ambulance: Applies workaround for HA Config helper extension --- vscode/rootfs/etc/cont-init.d/code-server.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index dffe0ac..00aa65d 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -48,3 +48,8 @@ if ! bashio::fs.file_exists '/data/vscode/User/workspaceStorage'; then mkdir -p /data/vscode/User/workspaceStorage \ || bashio::exit.nok "Could not create persistent storage folder." fi + +# Hotfix for incorrect path reference in Home Assistant Config Helper +# extension. +cd /data/vscode/extensions/keesschollaart.vscode-home-assistant-* \ +&& ln -sf out src From 3717c46f5cde36ae813a1ef3b7b6fdc3aae8f9cc Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 11 May 2019 10:41:13 +0200 Subject: [PATCH 037/778] :arrow_up: Upgrades vscode-home-assistant to 0.5.7 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index a7d9cfb..f848c97 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,3 @@ -keesschollaart.vscode-home-assistant#0.5.6 +keesschollaart.vscode-home-assistant#0.5.7 lukas-tr.materialdesignicons-intellisense#1.3.1 redhat.vscode-yaml#0.4.0 From 914e69ab0adbe03343a53b9b7b42ad676f24e98c Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 11 May 2019 10:42:00 +0200 Subject: [PATCH 038/778] Revert ":ambulance: Applies workaround for HA Config helper extension" This reverts commit 853fd03db64824c68f0b98a54d2f893d6484aea5. --- vscode/rootfs/etc/cont-init.d/code-server.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index 00aa65d..dffe0ac 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -48,8 +48,3 @@ if ! bashio::fs.file_exists '/data/vscode/User/workspaceStorage'; then mkdir -p /data/vscode/User/workspaceStorage \ || bashio::exit.nok "Could not create persistent storage folder." fi - -# Hotfix for incorrect path reference in Home Assistant Config Helper -# extension. -cd /data/vscode/extensions/keesschollaart.vscode-home-assistant-* \ -&& ln -sf out src From bead6e88fa31662a743b8f05dbb034b95baa3f25 Mon Sep 17 00:00:00 2001 From: Jorim Tielemans Date: Sat, 18 May 2019 14:13:09 +0200 Subject: [PATCH 039/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20vscode-?= =?UTF-8?q?home-assistant=20to=200.6.0=20(#36)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index f848c97..897ae48 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,3 @@ -keesschollaart.vscode-home-assistant#0.5.7 +keesschollaart.vscode-home-assistant#0.6.0 lukas-tr.materialdesignicons-intellisense#1.3.1 redhat.vscode-yaml#0.4.0 From 4697ae2601b9bff0c4b3d0a261fa98781b0e90d0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Sat, 18 May 2019 14:14:32 +0200 Subject: [PATCH 040/778] :arrow_up: Updates homeassistant_cli to v0.7.0 (#35) --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index b0b1802..d12254e 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -homeassistant_cli==0.6.0 +homeassistant_cli==0.7.0 yamllint==1.15.0 From a4187493e29a90675feced8f823699c2fd4d7b35 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 21 May 2019 21:32:39 +0200 Subject: [PATCH 041/778] :arrow_up: Upgrades code-server to 1.1119-vsc1.33.11 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 03ac672..cd1a269 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -84,7 +84,7 @@ RUN \ && locale-gen en_US.UTF-8 \ \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/cdr/code-server/releases/download/1.939-vsc1.33.1/code-server1.939-vsc1.33.1-linux-x64.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/1.1119-vsc1.33.1/code-server1.1119-vsc1.33.1-linux-x64.tar.gz" \ && tar zxvf \ /tmp/code.tar.gz \ --strip 1 -C /tmp \ From 22c417fdc52856ede6c83f8e38bf0445d577dba3 Mon Sep 17 00:00:00 2001 From: Jorim Tielemans Date: Sun, 2 Jun 2019 16:36:10 +0200 Subject: [PATCH 042/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20vscode-?= =?UTF-8?q?home-assistant=20to=200.6.2=20(#38)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 897ae48..4bcf635 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,3 @@ -keesschollaart.vscode-home-assistant#0.6.0 +keesschollaart.vscode-home-assistant#0.6.2 lukas-tr.materialdesignicons-intellisense#1.3.1 redhat.vscode-yaml#0.4.0 From dbbbe6d7390a6fe5a08d6e994cb69f8fef4d4c3a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 5 Jun 2019 20:02:47 +0200 Subject: [PATCH 043/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 0.6.3 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 4bcf635..0b71d9c 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,3 @@ -keesschollaart.vscode-home-assistant#0.6.2 +keesschollaart.vscode-home-assistant#0.6.3 lukas-tr.materialdesignicons-intellisense#1.3.1 redhat.vscode-yaml#0.4.0 From d3800b6bbdf47b3e13f725c3820954c295323cc0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Fri, 7 Jun 2019 11:04:35 +0200 Subject: [PATCH 044/778] :arrow_up: Updates yamllint to v1.16.0 (#41) --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index d12254e..5c62dd7 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ homeassistant_cli==0.7.0 -yamllint==1.15.0 +yamllint==1.16.0 From 95ec18d9d11bdf1b65dff37aacf3d1e291b6ee24 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 16 Jun 2019 22:31:30 +0200 Subject: [PATCH 045/778] :arrow_up: Upgrades code-server to 1.1156-vsc1.33.1 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index cd1a269..5abd96b 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -84,7 +84,7 @@ RUN \ && locale-gen en_US.UTF-8 \ \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/cdr/code-server/releases/download/1.1119-vsc1.33.1/code-server1.1119-vsc1.33.1-linux-x64.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/1.1156-vsc1.33.1/code-server1.1156-vsc1.33.1-linux-x64.tar.gz" \ && tar zxvf \ /tmp/code.tar.gz \ --strip 1 -C /tmp \ From d313806c4bc479bb46b9ac69c9c21d5d4018ffe3 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 16 Jun 2019 22:32:30 +0200 Subject: [PATCH 046/778] :arrow_up: Upgrades redhat.vscode-yaml to 0.4.1 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 0b71d9c..32a4ef4 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,3 @@ keesschollaart.vscode-home-assistant#0.6.3 lukas-tr.materialdesignicons-intellisense#1.3.1 -redhat.vscode-yaml#0.4.0 +redhat.vscode-yaml#0.4.1 From 1a94e9507f799e09baf9f047b010d0b651aa5bb2 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 16 Jun 2019 22:33:14 +0200 Subject: [PATCH 047/778] :arrow_up: Upgrades lukas-tr.materialdesignicons-intellisense to 1.5.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 32a4ef4..31f68db 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,3 @@ keesschollaart.vscode-home-assistant#0.6.3 -lukas-tr.materialdesignicons-intellisense#1.3.1 +lukas-tr.materialdesignicons-intellisense#1.5.0 redhat.vscode-yaml#0.4.1 From dae4f9909eaacb490522d91666b1a9d7e2e257da Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 21 Jun 2019 01:34:32 +0200 Subject: [PATCH 048/778] :arrow_up: Upgrades add-on base image to v3.1.3 --- .gitlab-ci.yml | 2 +- vscode/Dockerfile | 2 +- vscode/build.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ef564d..027aabf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,4 @@ variables: ADDON_ARMV7: "false" ADDON_I386: "false" - ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:3.1.1" + ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:3.1.2" diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 5abd96b..fb998b6 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/ubuntu-base:3.1.1 +ARG BUILD_FROM=hassioaddons/ubuntu-base:3.1.2 ############################################################################### # Build container to get custom vscode extensions. ############################################################################### diff --git a/vscode/build.json b/vscode/build.json index 4c26788..8292038 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { "build_from": { - "amd64": "hassioaddons/ubuntu-base-amd64:3.1.1" + "amd64": "hassioaddons/ubuntu-base-amd64:3.1.2" }, "args": {} } From 07483328182e7f21602b0b5b810125ff5fa2a58f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 23 Jun 2019 09:06:43 +0200 Subject: [PATCH 049/778] :pencil2: Maintaince -> Maintenance --- .github/settings.yml | 4 ++-- renovate.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index 01dbf6a..209fe06 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -46,9 +46,9 @@ labels: - name: "Type: Discussion" color: d4c5f9 description: "Marks an issue as an generic discussion ticket." - - name: "Type: Maintaince" + - name: "Type: Maintenance" color: 2af79e - description: "Generic maintaince tasks, e.g., package updates." + description: "Generic maintenance tasks, e.g., package updates." # Additional markers - name: "Security" diff --git a/renovate.json b/renovate.json index 2b8ed04..58ca74e 100644 --- a/renovate.json +++ b/renovate.json @@ -6,6 +6,6 @@ "commitMessageTopic": "{{depName}}", "commitMessagePrefix": ":arrow_up:", "labels": [ - "Type: Maintaince" + "Type: Maintenance" ] } From af3666471c6e0e75ae0cf7e5a40c6667fedc4f5a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 23 Jun 2019 09:06:54 +0200 Subject: [PATCH 050/778] :sparkles: Adds FUNDING.yml --- .github/FUNDING.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..1a4828d --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,5 @@ +--- +# github: frenck +patreon: frenck +ko_fi: frenck +custom: https://frenck.dev/donate/ From c131a4664726b2cc94bbe89b11cd3bcbbe8c211a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 23 Jun 2019 09:23:26 +0200 Subject: [PATCH 051/778] :arrow_up: Upgrades mosquitto-clients to 1.4.15-2ubuntu0.18.04.3 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index fb998b6..047be85 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -65,7 +65,7 @@ RUN \ libnginx-mod-http-lua=1.14.0-0ubuntu1.2 \ locales=2.27-3ubuntu1 \ luarocks=2.4.2+dfsg-1 \ - mosquitto-clients=1.4.15-2ubuntu0.18.04.2 \ + mosquitto-clients=1.4.15-2ubuntu0.18.04.3 \ net-tools=1.60+git20161116.90da8a0-1ubuntu1 \ nginx=1.14.0-0ubuntu1.2 \ nmap=7.60-1ubuntu5 \ From 63c9c207757f1f210672f31ef3ae788c8f566b7e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 8 Jul 2019 12:35:23 +0200 Subject: [PATCH 052/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.0.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 31f68db..10ff40b 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,3 @@ -keesschollaart.vscode-home-assistant#0.6.3 +keesschollaart.vscode-home-assistant#1.0.0 lukas-tr.materialdesignicons-intellisense#1.5.0 redhat.vscode-yaml#0.4.1 From af04e7ed3f0323920092c4e03e38458ea9ac6318 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 10 Aug 2019 14:07:35 +0200 Subject: [PATCH 053/778] :arrow_up: Upgrades Martial Design Icons VSCode extension to v1.5.1 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 10ff40b..5989372 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,3 @@ keesschollaart.vscode-home-assistant#1.0.0 -lukas-tr.materialdesignicons-intellisense#1.5.0 +lukas-tr.materialdesignicons-intellisense#1.5.1 redhat.vscode-yaml#0.4.1 From db5eb2f74960d2b2cd113d26a8b7dbe52fa00a8b Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 10 Aug 2019 14:08:49 +0200 Subject: [PATCH 054/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.0.2 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 5989372..10715b2 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,3 @@ -keesschollaart.vscode-home-assistant#1.0.0 +keesschollaart.vscode-home-assistant#1.0.2 lukas-tr.materialdesignicons-intellisense#1.5.1 redhat.vscode-yaml#0.4.1 From 1576460a0987e027c6e2aa10917477d8bdac3586 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 10 Aug 2019 14:26:09 +0200 Subject: [PATCH 055/778] :arrow_up: Upgrades add-on base image to v3.1.4 --- .gitlab-ci.yml | 2 +- vscode/Dockerfile | 2 +- vscode/build.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 027aabf..685e25b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,4 @@ variables: ADDON_ARMV7: "false" ADDON_I386: "false" - ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:3.1.2" + ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:3.1.4" diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 047be85..9b16b79 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/ubuntu-base:3.1.2 +ARG BUILD_FROM=hassioaddons/ubuntu-base:3.1.4 ############################################################################### # Build container to get custom vscode extensions. ############################################################################### diff --git a/vscode/build.json b/vscode/build.json index 8292038..82b3650 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { "build_from": { - "amd64": "hassioaddons/ubuntu-base-amd64:3.1.2" + "amd64": "hassioaddons/ubuntu-base-amd64:3.1.4" }, "args": {} } From bdf1c77d9da02746b0b048185d6c039e9caab487 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 10 Aug 2019 14:26:33 +0200 Subject: [PATCH 056/778] :arrow_up: Upgrades libnginx-mod-http-lua to 1.14.0-0ubuntu1.3 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 9b16b79..780ae84 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -62,7 +62,7 @@ RUN \ build-essential=12.4ubuntu1 \ colordiff=1.0.18-1 \ git=1:2.17.1-1ubuntu0.4 \ - libnginx-mod-http-lua=1.14.0-0ubuntu1.2 \ + libnginx-mod-http-lua=1.14.0-0ubuntu1.3 \ locales=2.27-3ubuntu1 \ luarocks=2.4.2+dfsg-1 \ mosquitto-clients=1.4.15-2ubuntu0.18.04.3 \ From bf0905a82f24dc2d4c34d94e1d0759e749540413 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 10 Aug 2019 14:26:54 +0200 Subject: [PATCH 057/778] :arrow_up: Upgrades nginx to 1.14.0-0ubuntu1.3 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 780ae84..f3b7c06 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -67,7 +67,7 @@ RUN \ luarocks=2.4.2+dfsg-1 \ mosquitto-clients=1.4.15-2ubuntu0.18.04.3 \ net-tools=1.60+git20161116.90da8a0-1ubuntu1 \ - nginx=1.14.0-0ubuntu1.2 \ + nginx=1.14.0-0ubuntu1.3 \ nmap=7.60-1ubuntu5 \ openssh-client=1:7.6p1-4ubuntu0.3 \ openssl=1.1.0g-2ubuntu4.3 \ From 8c20f8739c3ff67a036f6ddffa4de7f140552d4f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 10 Aug 2019 14:27:11 +0200 Subject: [PATCH 058/778] :arrow_up: Upgrades openssl to 1.1.1-1ubuntu2.1~18.04.4 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index f3b7c06..75d111c 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -70,7 +70,7 @@ RUN \ nginx=1.14.0-0ubuntu1.3 \ nmap=7.60-1ubuntu5 \ openssh-client=1:7.6p1-4ubuntu0.3 \ - openssl=1.1.0g-2ubuntu4.3 \ + openssl=1.1.1-1ubuntu2.1~18.04.4 \ python3-dev=3.6.7-1~18.04 \ python3=3.6.7-1~18.04 \ wget=1.19.4-1ubuntu2.2 \ From 5c2929b0050ae3aa7508ed4b69d4916a6774d6c9 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 10 Aug 2019 15:16:47 +0200 Subject: [PATCH 059/778] :arrow_up: Upgrades Hassio CLI to 2.3.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 75d111c..ec15322 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -93,7 +93,7 @@ RUN \ && chmod a+x /usr/local/bin/code-server \ \ && curl -L -s -o /usr/bin/hassio \ - "https://github.com/home-assistant/hassio-cli/releases/download/2.2.0/hassio_${BUILD_ARCH}" \ + "https://github.com/home-assistant/hassio-cli/releases/download/2.3.0/hassio_${BUILD_ARCH}" \ && chmod a+x /usr/bin/hassio \ \ && git clone --branch master --single-branch --depth 1 \ From 52510db590c01e7600d42192d2f84b85941d88bb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2019 17:48:04 +0200 Subject: [PATCH 060/778] :arrow_up: Updates yamllint to v1.17.0 (#47) --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 5c62dd7..7b8e897 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ homeassistant_cli==0.7.0 -yamllint==1.16.0 +yamllint==1.17.0 From 0298e24cdf395047b013232fbd4c5aa119f5918d Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 16 Aug 2019 22:03:03 +0200 Subject: [PATCH 061/778] :arrow_up: Upgrades lukas-tr.materialdesignicons-intellisense to 1.5.2 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 10715b2..02117d7 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,3 @@ keesschollaart.vscode-home-assistant#1.0.2 -lukas-tr.materialdesignicons-intellisense#1.5.1 +lukas-tr.materialdesignicons-intellisense#1.5.2 redhat.vscode-yaml#0.4.1 From 26d879d5cb64fdbe0a04c360d1feca967039b8dd Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 16 Aug 2019 22:03:42 +0200 Subject: [PATCH 062/778] :arrow_up: Upgrades Hassio CLI to v3.0.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ec15322..8ed704b 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -93,7 +93,7 @@ RUN \ && chmod a+x /usr/local/bin/code-server \ \ && curl -L -s -o /usr/bin/hassio \ - "https://github.com/home-assistant/hassio-cli/releases/download/2.3.0/hassio_${BUILD_ARCH}" \ + "https://github.com/home-assistant/hassio-cli/releases/download/3.0.0/hassio_${BUILD_ARCH}" \ && chmod a+x /usr/bin/hassio \ \ && git clone --branch master --single-branch --depth 1 \ From 9d83005106845980a22c0e279456dffeaf440319 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 16 Aug 2019 22:43:05 +0200 Subject: [PATCH 063/778] :arrow_up: Upgrades nginx to 1.14.0-0ubuntu1.5 --- vscode/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 8ed704b..3bd6cc2 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -62,12 +62,12 @@ RUN \ build-essential=12.4ubuntu1 \ colordiff=1.0.18-1 \ git=1:2.17.1-1ubuntu0.4 \ - libnginx-mod-http-lua=1.14.0-0ubuntu1.3 \ + libnginx-mod-http-lua=1.14.0-0ubuntu1.5 \ locales=2.27-3ubuntu1 \ luarocks=2.4.2+dfsg-1 \ mosquitto-clients=1.4.15-2ubuntu0.18.04.3 \ net-tools=1.60+git20161116.90da8a0-1ubuntu1 \ - nginx=1.14.0-0ubuntu1.3 \ + nginx=1.14.0-0ubuntu1.5 \ nmap=7.60-1ubuntu5 \ openssh-client=1:7.6p1-4ubuntu0.3 \ openssl=1.1.1-1ubuntu2.1~18.04.4 \ From 26b9966034174f8be78b61df36f17cf94d73d8b1 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 18 Aug 2019 12:22:47 +0200 Subject: [PATCH 064/778] :arrow_up: Upgrades Hassio CLI to v3.1.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 3bd6cc2..68a5165 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -93,7 +93,7 @@ RUN \ && chmod a+x /usr/local/bin/code-server \ \ && curl -L -s -o /usr/bin/hassio \ - "https://github.com/home-assistant/hassio-cli/releases/download/3.0.0/hassio_${BUILD_ARCH}" \ + "https://github.com/home-assistant/hassio-cli/releases/download/3.1.0/hassio_${BUILD_ARCH}" \ && chmod a+x /usr/bin/hassio \ \ && git clone --branch master --single-branch --depth 1 \ From 0239fe81d82fa9f77c8ced1e6819d5e5eb1b6f14 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 21 Aug 2019 20:04:23 +0200 Subject: [PATCH 065/778] :arrow_up: Upgrades add-on base image to v3.2.0 --- .gitlab-ci.yml | 2 +- vscode/Dockerfile | 2 +- vscode/build.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 685e25b..dfe1d3e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,4 @@ variables: ADDON_ARMV7: "false" ADDON_I386: "false" - ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:3.1.4" + ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:3.2.0" diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 68a5165..1bcf867 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/ubuntu-base:3.1.4 +ARG BUILD_FROM=hassioaddons/ubuntu-base:3.2.0 ############################################################################### # Build container to get custom vscode extensions. ############################################################################### diff --git a/vscode/build.json b/vscode/build.json index 82b3650..c6de1ea 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { "build_from": { - "amd64": "hassioaddons/ubuntu-base-amd64:3.1.4" + "amd64": "hassioaddons/ubuntu-base-amd64:3.2.0" }, "args": {} } From 8e64482ff63ed216abc823a2319eae5a6dec1dcf Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 21 Aug 2019 20:04:53 +0200 Subject: [PATCH 066/778] :hammer: Updates HA Auth URL in NGinx LUA sccript --- vscode/rootfs/etc/nginx/lua/ha-auth.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/rootfs/etc/nginx/lua/ha-auth.lua b/vscode/rootfs/etc/nginx/lua/ha-auth.lua index 4c9ca91..998b509 100644 --- a/vscode/rootfs/etc/nginx/lua/ha-auth.lua +++ b/vscode/rootfs/etc/nginx/lua/ha-auth.lua @@ -31,7 +31,7 @@ function authenticate() --- HTTP request against Hassio API local httpc = http.new() - local res, err = httpc:request_uri("http://hassio/auth", { + local res, err = httpc:request_uri("http://supervisor.local.hass.io/auth", { method = "POST", body = ngx.encode_args({["username"]=username, ["password"]=password}), headers = { From 8595294987e60cc26f85f95664f2e76759d3235d Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 21 Aug 2019 20:05:11 +0200 Subject: [PATCH 067/778] :ambulance: Fixes path handling for SSL certificates --- vscode/rootfs/etc/cont-init.d/nginx.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vscode/rootfs/etc/cont-init.d/nginx.sh b/vscode/rootfs/etc/cont-init.d/nginx.sh index 427386d..be02b6f 100644 --- a/vscode/rootfs/etc/cont-init.d/nginx.sh +++ b/vscode/rootfs/etc/cont-init.d/nginx.sh @@ -18,8 +18,8 @@ if bashio::var.has_value "${port}"; then keyfile=$(bashio::config 'keyfile') mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf - sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf - sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf + sed -i "s#%%certfile%%#${certfile}#g" /etc/nginx/servers/direct.conf + sed -i "s#%%keyfile%%#${keyfile}#g" /etc/nginx/servers/direct.conf else mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf From 0216cc9f38c1ec0acac2dc8da6cfa7490cc774de Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 21 Aug 2019 20:06:11 +0200 Subject: [PATCH 068/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.1.1 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 02117d7..fad7979 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,3 @@ -keesschollaart.vscode-home-assistant#1.0.2 +keesschollaart.vscode-home-assistant#1.1.1 lukas-tr.materialdesignicons-intellisense#1.5.2 redhat.vscode-yaml#0.4.1 From c3ccfc2fbe8066c604daef8a768ca82bab6de8e0 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 21 Aug 2019 20:21:22 +0200 Subject: [PATCH 069/778] :arrow_up: Upgrades nginx to 1.14.0-0ubuntu1.6 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 1bcf867..ae6f4d6 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -67,7 +67,7 @@ RUN \ luarocks=2.4.2+dfsg-1 \ mosquitto-clients=1.4.15-2ubuntu0.18.04.3 \ net-tools=1.60+git20161116.90da8a0-1ubuntu1 \ - nginx=1.14.0-0ubuntu1.5 \ + nginx=1.14.0-0ubuntu1.6 \ nmap=7.60-1ubuntu5 \ openssh-client=1:7.6p1-4ubuntu0.3 \ openssl=1.1.1-1ubuntu2.1~18.04.4 \ From 1f5b2c9060fb7f64b2c6dc06a229ed31c2a67dda Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 21 Aug 2019 20:21:56 +0200 Subject: [PATCH 070/778] :arrow_up: Upgrades libnginx-mod-http-lua to 1.14.0-0ubuntu1.6 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ae6f4d6..bc0c7dd 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -62,7 +62,7 @@ RUN \ build-essential=12.4ubuntu1 \ colordiff=1.0.18-1 \ git=1:2.17.1-1ubuntu0.4 \ - libnginx-mod-http-lua=1.14.0-0ubuntu1.5 \ + libnginx-mod-http-lua=1.14.0-0ubuntu1.6 \ locales=2.27-3ubuntu1 \ luarocks=2.4.2+dfsg-1 \ mosquitto-clients=1.4.15-2ubuntu0.18.04.3 \ From 8d01dca9d65ca181a11ca43b043aeb2eb2e1c1aa Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 21 Aug 2019 20:22:14 +0200 Subject: [PATCH 071/778] :hammer: Use Hass.io DNS as NGinx resolver --- vscode/rootfs/etc/cont-init.d/nginx.sh | 4 ++++ vscode/rootfs/etc/nginx/includes/resolver.conf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/vscode/rootfs/etc/cont-init.d/nginx.sh b/vscode/rootfs/etc/cont-init.d/nginx.sh index be02b6f..c33ab00 100644 --- a/vscode/rootfs/etc/cont-init.d/nginx.sh +++ b/vscode/rootfs/etc/cont-init.d/nginx.sh @@ -5,6 +5,7 @@ # ============================================================================== declare port declare certfile +declare hassio_dns declare ingress_interface declare ingress_port declare keyfile @@ -30,3 +31,6 @@ ingress_port=$(bashio::addon.ingress_port) ingress_interface=$(bashio::addon.ip_address) sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf + +hassio_dns=$(bashio::dns.host) +sed -i "s/%%hassio_dns%%/${hassio_dns}/g" /etc/nginx/includes/resolver.conf diff --git a/vscode/rootfs/etc/nginx/includes/resolver.conf b/vscode/rootfs/etc/nginx/includes/resolver.conf index 6485af1..65c431d 100644 --- a/vscode/rootfs/etc/nginx/includes/resolver.conf +++ b/vscode/rootfs/etc/nginx/includes/resolver.conf @@ -1 +1 @@ -resolver 127.0.0.11; +resolver %%hassio_dns%%; From f4252f97cfe02cd5b4562e916438c31728c369f6 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 9 Sep 2019 14:06:21 +0200 Subject: [PATCH 072/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.2.4 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index fad7979..40a0d4e 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,3 @@ -keesschollaart.vscode-home-assistant#1.1.1 +keesschollaart.vscode-home-assistant#1.2.4 lukas-tr.materialdesignicons-intellisense#1.5.2 redhat.vscode-yaml#0.4.1 From 7e80a1f0ef0ee38b7c5c31a7adb284790801ff0a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 26 Sep 2019 17:20:35 +0200 Subject: [PATCH 073/778] :arrow_up: Upgrades add-on base image to v4.0.0 --- .gitlab-ci.yml | 2 +- vscode/Dockerfile | 2 +- vscode/build.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dfe1d3e..b385806 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,4 @@ variables: ADDON_ARMV7: "false" ADDON_I386: "false" - ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:3.2.0" + ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:4.0.0" diff --git a/vscode/Dockerfile b/vscode/Dockerfile index bc0c7dd..eddb180 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/ubuntu-base:3.2.0 +ARG BUILD_FROM=hassioaddons/ubuntu-base:4.0.0 ############################################################################### # Build container to get custom vscode extensions. ############################################################################### diff --git a/vscode/build.json b/vscode/build.json index c6de1ea..e3db7be 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { "build_from": { - "amd64": "hassioaddons/ubuntu-base-amd64:3.2.0" + "amd64": "hassioaddons/ubuntu-base-amd64:4.0.0" }, "args": {} } From 7d0a51e5c29515d02d73404f464b8430fce3dc42 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 26 Sep 2019 17:21:37 +0200 Subject: [PATCH 074/778] :arrow_up: Upgrades redhat.vscode-yaml to 0.5.3 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 40a0d4e..451d9f1 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,3 @@ keesschollaart.vscode-home-assistant#1.2.4 lukas-tr.materialdesignicons-intellisense#1.5.2 -redhat.vscode-yaml#0.4.1 +redhat.vscode-yaml#0.5.3 From 1e001d4c0e332295fa2a884a3b927398134b4e96 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2019 11:52:11 +0200 Subject: [PATCH 075/778] :arrow_up: Updates yamllint to v1.18.0 (#53) --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 7b8e897..243a351 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ homeassistant_cli==0.7.0 -yamllint==1.17.0 +yamllint==1.18.0 From a69e0996d8f5e78cae1ffd85c0b0629058ee5b13 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 26 Oct 2019 11:20:21 +0200 Subject: [PATCH 076/778] :arrow_up: Upgrades code-server to 2.1650-vsc1.39.2 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index eddb180..946cc0c 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -84,7 +84,7 @@ RUN \ && locale-gen en_US.UTF-8 \ \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/cdr/code-server/releases/download/1.1156-vsc1.33.1/code-server1.1156-vsc1.33.1-linux-x64.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/2.1650-vsc1.39.2/code-server2.1650-vsc1.39.2-linux-x86_64.tar.gz" \ && tar zxvf \ /tmp/code.tar.gz \ --strip 1 -C /tmp \ From e8d9b7d410080aad17a8e0b498696da7a054d74e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 26 Oct 2019 11:20:47 +0200 Subject: [PATCH 077/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.3.0 --- vscode/vscode.extensions | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 451d9f1..b718a4a 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,2 @@ -keesschollaart.vscode-home-assistant#1.2.4 -lukas-tr.materialdesignicons-intellisense#1.5.2 +keesschollaart.vscode-home-assistant#1.3.0 redhat.vscode-yaml#0.5.3 From 45c1411692a3392b86f2e522e30e664df05c5799 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 26 Oct 2019 11:21:07 +0200 Subject: [PATCH 078/778] :arrow_up: Upgrades lukas-tr.materialdesignicons-intellisense to 1.5.5 --- vscode/vscode.extensions | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index b718a4a..b0d3888 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,2 +1,3 @@ keesschollaart.vscode-home-assistant#1.3.0 +lukas-tr.materialdesignicons-intellisense#1.5.5 redhat.vscode-yaml#0.5.3 From 5fde7f5443e0001f0a96206244cae40e49616c70 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 26 Oct 2019 11:21:42 +0200 Subject: [PATCH 079/778] :sparkles: Adds Indent Rainbow extension by default --- vscode/vscode.extensions | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index b0d3888..eee6752 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,4 @@ keesschollaart.vscode-home-assistant#1.3.0 lukas-tr.materialdesignicons-intellisense#1.5.5 +oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.5.3 From 318d3ecd46c2fa2ce84c71eb3308190f1b1dec1f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 26 Oct 2019 11:22:31 +0200 Subject: [PATCH 080/778] :ambulance: Match VSCode default config with latest code-server --- vscode/rootfs/etc/cont-init.d/code-server.sh | 1 + vscode/rootfs/root/.code-server/settings.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index dffe0ac..ea87d0f 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -9,6 +9,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( 86776df88391c3d94f79f62b430f9ff8538960628d5e04fb660165a5a46640d2e74f89cd68b3e6985dc59101ae2dda00a1e25aa48381acfd4736858c5f23878b 2be4c50575c05711d30121c3a1320698d3dbb034523c481be3aad3b638af3e0a46113d8c3f8cfc1b0f01e4cc10f32da3a30feca161c31b5b27177aeb7231bf70 d4745002643a0168f65bc5b465a9baff59af0fb4783b50553e1a4e8b3f1a569fc4905df19b7743f7f313a5809a5128d997fc4b5e0a0e5db0a01f47b3b7bec39d + 6ed36f832778926fa614fc12eec97b8f813bbb1a04f709769c9e5f54bc8e3cfc05a110155921a3b2ae47fc8389d24fa2bd385e4ce5a6c94850813791a6ac1c82 ) # Ensure persistent data folder exists. diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index 9793d42..4845cac 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -1,6 +1,5 @@ { "editor.renderWhitespace": "boundary", - "editor.selectionClipboard": false, "files.associations": { "*.dash": "yaml", "*.yaml": "home-assistant" @@ -45,5 +44,6 @@ "comments": false, "strings": true } - } + }, + "terminal.integrated.shell.linux": "/usr/bin/zsh" } From e6174834084074c7a2366085879bb159fc11dd0a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 26 Oct 2019 11:23:36 +0200 Subject: [PATCH 081/778] :hammer: Modify code-server service with updated CLI arguments --- vscode/rootfs/etc/services.d/code/run | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index 916cedd..66a7165 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -11,14 +11,13 @@ options+=(--port 8443) options+=(--user-data-dir "/data/vscode") options+=(--extensions-dir "/data/vscode/extensions") options+=(--host 127.0.0.1) -options+=(--allow-http) if bashio::config.true 'disable_telemetry'; then options+=(--disable-telemetry) fi # Disable code authentication, we use HA authentication -options+=(--no-auth) +options+=(--auth none) # Export env variables for the Home Assistant extension export HASS_SERVER="http://hassio/homeassistant" From 699dbe2079be3b6bea7cc05a5013070a82e1e8cf Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 26 Oct 2019 12:13:53 +0200 Subject: [PATCH 082/778] :tada: Mark add-on as stable --- README.md | 2 +- vscode/.README.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a356aed..038a38f 100644 --- a/README.md +++ b/README.md @@ -275,7 +275,7 @@ SOFTWARE. [maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg [patreon-shield]: https://www.frenck.nl/images/patreon.png [patreon]: https://www.patreon.com/frenck -[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg +[project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg [reddit]: https://reddit.com/r/homeassistant [releases-shield]: https://img.shields.io/github/release/hassio-addons/addon-vscode.svg [releases]: https://github.com/hassio-addons/addon-vscode/releases diff --git a/vscode/.README.j2 b/vscode/.README.j2 index 99df7d1..e4d3f1e 100644 --- a/vscode/.README.j2 +++ b/vscode/.README.j2 @@ -76,7 +76,7 @@ If you are more interested in stable releases of our add-ons: [maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg [patreon-shield]: https://www.frenck.nl/images/patreon.png [patreon]: https://www.patreon.com/frenck -[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg +[project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg [release-shield]: https://img.shields.io/badge/version-{{ version }}-blue.svg [release]: {{ repo }}/tree/{{ version }} [screenshot]: {{ repo }}/raw/master/images/screenshot.png From b3d2de989aa3c1026c65e47f11a20d3c1f73ca59 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 31 Oct 2019 19:31:26 +0100 Subject: [PATCH 083/778] :arrow_up: Upgrades code-server to 2.1665-vsc1.39.2 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 946cc0c..936ba0f 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -84,7 +84,7 @@ RUN \ && locale-gen en_US.UTF-8 \ \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/cdr/code-server/releases/download/2.1650-vsc1.39.2/code-server2.1650-vsc1.39.2-linux-x86_64.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/2.1665-vsc1.39.2/code-server2.1665-vsc1.39.2-linux-x86_64.tar.gz" \ && tar zxvf \ /tmp/code.tar.gz \ --strip 1 -C /tmp \ From 1e74d5ed71ccefbca499b68ceeb6a908ae54b9d7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 2 Nov 2019 20:03:21 +0100 Subject: [PATCH 084/778] :sprakles: Adds ping commandline util --- vscode/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 936ba0f..a2765ed 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -59,9 +59,11 @@ RUN \ apt-get update \ \ && apt-get install -y --no-install-recommends \ + ack=2.22-1 \ build-essential=12.4ubuntu1 \ colordiff=1.0.18-1 \ git=1:2.17.1-1ubuntu0.4 \ + iputils-ping=3:20161105-1ubuntu3 \ libnginx-mod-http-lua=1.14.0-0ubuntu1.6 \ locales=2.27-3ubuntu1 \ luarocks=2.4.2+dfsg-1 \ @@ -75,7 +77,6 @@ RUN \ python3=3.6.7-1~18.04 \ wget=1.19.4-1ubuntu2.2 \ zsh=5.4.2-3ubuntu3.1 \ - ack=2.22-1 \ \ && luarocks install lua-resty-http 0.13-0 \ \ From 6579d636826aa236b1ead21815184fe5cda40b0c Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 2 Nov 2019 20:09:11 +0100 Subject: [PATCH 085/778] :arrow_up: Upgrades lukas-tr.materialdesignicons-intellisense to 1.5.6 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index eee6752..13da792 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ keesschollaart.vscode-home-assistant#1.3.0 -lukas-tr.materialdesignicons-intellisense#1.5.5 +lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.5.3 From 5a0844560acf9e7fdb97872883dffbc3970c6822 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 2 Nov 2019 20:10:43 +0100 Subject: [PATCH 086/778] :sparkles: Adds vscode icons pack --- vscode/rootfs/root/.code-server/settings.json | 4 +++- vscode/vscode.extensions | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index 4845cac..cac028a 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -45,5 +45,7 @@ "strings": true } }, - "terminal.integrated.shell.linux": "/usr/bin/zsh" + "terminal.integrated.shell.linux": "/usr/bin/zsh", + "workbench.iconTheme": "vscode-icons", + "vsicons.dontShowNewVersionMessage": true } diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 13da792..c9c4fc5 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -2,3 +2,4 @@ keesschollaart.vscode-home-assistant#1.3.0 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.5.3 +vscode-icons-team.vscode-icons#9.5.0 From ea0f63548c43237daca77c19724b96883dabc0b5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 2 Nov 2019 20:11:34 +0100 Subject: [PATCH 087/778] :sparkles: Adds support for syntax highlighting on Home Assistant log files --- vscode/vscode.extensions | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index c9c4fc5..1e2c963 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,3 +1,4 @@ +emilast.LogFileHighlighter#2.6.0 keesschollaart.vscode-home-assistant#1.3.0 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 From aadbcc05f92f447a18800a9a663deb5ee912bd20 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 2 Nov 2019 20:54:09 +0100 Subject: [PATCH 088/778] :sparkles: Adds the ErrorLens extension --- vscode/vscode.extensions | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 1e2c963..f3cedbc 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -3,4 +3,5 @@ keesschollaart.vscode-home-assistant#1.3.0 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.5.3 +usernamehw.errorlens#2.7.2 vscode-icons-team.vscode-icons#9.5.0 From 4200e5c32e4d82c657c265015d96a6644ab578dc Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 2 Nov 2019 20:58:04 +0100 Subject: [PATCH 089/778] :sparkles: Adds support for ESPHome --- README.md | 33 +++++++++++++++++++ vscode/rootfs/etc/cont-init.d/code-server.sh | 1 + vscode/rootfs/root/.code-server/settings.json | 3 ++ vscode/vscode.extensions | 1 + 4 files changed, 38 insertions(+) diff --git a/README.md b/README.md index 038a38f..9b483c9 100644 --- a/README.md +++ b/README.md @@ -152,6 +152,39 @@ return to the defaults as delivered by this add-on, do the following: 1. Execute the following command in the terminal window: `reset-settings`. 1. Done! +## Using with ESPHome + +The add-on has support for ESPHome (and its vscode extension), built-in! +It has been installed and pre-configured for you, however, it might need +an adjustment to your ESPHome add-on in order to function. + +1. Go to the ESPHome add-on configuration in your Hass.io panel. +1. Add the `leave_front_door_open` option, since the vscode extension of + ESPHome does not support authentication yet. The ESPHome add-on + configuration would look like this: + + ```json + { + "leave_front_door_open": true + } + ``` + +1. Save the add-on configuration. +1. Enable direct access to the ESPHome add-on, but enabling the network port. + This option can be found on the ESPHome add-on settings page, in the + "Network" section. In the "Host" field (that is now showing disabled), + enter `6052` and hit save. +1. Restart the ESPHome add-on. + +And you're set! + +No changes to the vscode add-on are needed, since it has been pre-configured. + +**Please note!** This opens up ESPHome for access within your network +without authentication! Currently, this is how ESPHome advises how to +set up your system, but it surely has security risks. We hope ESPHome +will come up with a better solution for this soon. + ## Known issues and limitations - This add-on currently only supports AMD64 machines, although we hope diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index ea87d0f..ead0838 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -10,6 +10,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( 2be4c50575c05711d30121c3a1320698d3dbb034523c481be3aad3b638af3e0a46113d8c3f8cfc1b0f01e4cc10f32da3a30feca161c31b5b27177aeb7231bf70 d4745002643a0168f65bc5b465a9baff59af0fb4783b50553e1a4e8b3f1a569fc4905df19b7743f7f313a5809a5128d997fc4b5e0a0e5db0a01f47b3b7bec39d 6ed36f832778926fa614fc12eec97b8f813bbb1a04f709769c9e5f54bc8e3cfc05a110155921a3b2ae47fc8389d24fa2bd385e4ce5a6c94850813791a6ac1c82 + 944d9ba57968666353df7e9dc78ec5d94b9b052e1abf863b51bc1f372d9f35cb2d93259f153e9ab3b3dd1b520bfcd7bddb54803bcfd9eb65975ae8fb5553663c ) # Ensure persistent data folder exists. diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index cac028a..7d36e8b 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -2,6 +2,7 @@ "editor.renderWhitespace": "boundary", "files.associations": { "*.dash": "yaml", + "**/esphome/*.yaml": "yaml", "*.yaml": "home-assistant" }, "files.watcherExclude": { @@ -46,6 +47,8 @@ } }, "terminal.integrated.shell.linux": "/usr/bin/zsh", + "esphome.validator": "dashboard", + "esphome.dashboardUri": "15ef4d2f-esphome.local.hass.io:6052", "workbench.iconTheme": "vscode-icons", "vsicons.dontShowNewVersionMessage": true } diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index f3cedbc..228337f 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,5 @@ emilast.LogFileHighlighter#2.6.0 +ESPHome.esphome-vscode#0.2.0 keesschollaart.vscode-home-assistant#1.3.0 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 From 1333a0644616ba595a595a24be056a7c02fa2763 Mon Sep 17 00:00:00 2001 From: HoppingMonk <44523113+HoppingMonk@users.noreply.github.com> Date: Sun, 3 Nov 2019 22:40:25 +0100 Subject: [PATCH 090/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.3.1=20(#62)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 228337f..b12c0fc 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.6.0 ESPHome.esphome-vscode#0.2.0 -keesschollaart.vscode-home-assistant#1.3.0 +keesschollaart.vscode-home-assistant#1.3.1 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.5.3 From 6dad5657f52c6b84a48c9ca46c95952baa24e34e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 4 Nov 2019 13:56:23 +0100 Subject: [PATCH 091/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.3.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index b12c0fc..8de054b 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.6.0 ESPHome.esphome-vscode#0.2.0 -keesschollaart.vscode-home-assistant#1.3.1 +keesschollaart.vscode-home-assistant#1.3.3 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.5.3 From 2325061e0d0f3ac6215fcbf8f93ca40c7b5151b5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 16 Nov 2019 19:02:59 +0100 Subject: [PATCH 092/778] :arrow_up: Upgrades code-server to 2.1692-vsc1.39.2 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index a2765ed..eb535a9 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -85,7 +85,7 @@ RUN \ && locale-gen en_US.UTF-8 \ \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/cdr/code-server/releases/download/2.1665-vsc1.39.2/code-server2.1665-vsc1.39.2-linux-x86_64.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/2.1692-vsc1.39.2/code-server2.1692-vsc1.39.2-linux-x86_64.tar.gz" \ && tar zxvf \ /tmp/code.tar.gz \ --strip 1 -C /tmp \ From 3a3bb775fc76d6ea4d408a8475e82b4763e21611 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2019 09:58:55 +0100 Subject: [PATCH 093/778] :arrow_up: Updates homeassistant_cli to v0.8.0 (#65) --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 243a351..6c79a98 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -homeassistant_cli==0.7.0 +homeassistant_cli==0.8.0 yamllint==1.18.0 From 284607bfea870afe189b3c54ccd110d6e2ab91ee Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2019 12:26:30 +0100 Subject: [PATCH 094/778] :arrow_up: Updates yamllint to v1.19.0 (#66) --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 6c79a98..dd4dcff 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ homeassistant_cli==0.8.0 -yamllint==1.18.0 +yamllint==1.19.0 From c0d5e971bd8050505d7597f551439026b7aab1de Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Nov 2019 12:56:35 +0100 Subject: [PATCH 095/778] :arrow_up: Upgrades add-on base image to v4.0.1 --- .gitlab-ci.yml | 2 +- vscode/Dockerfile | 2 +- vscode/build.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b385806..de152a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,4 @@ variables: ADDON_ARMV7: "false" ADDON_I386: "false" - ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:4.0.0" + ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:4.0.1" diff --git a/vscode/Dockerfile b/vscode/Dockerfile index eb535a9..6191747 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/ubuntu-base:4.0.0 +ARG BUILD_FROM=hassioaddons/ubuntu-base:4.0.1 ############################################################################### # Build container to get custom vscode extensions. ############################################################################### diff --git a/vscode/build.json b/vscode/build.json index e3db7be..eb8c697 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { "build_from": { - "amd64": "hassioaddons/ubuntu-base-amd64:4.0.0" + "amd64": "hassioaddons/ubuntu-base-amd64:4.0.1" }, "args": {} } From e7aa07d6b8bde20c93e98513fad5c741ba4043b8 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 24 Nov 2019 18:45:45 +0100 Subject: [PATCH 096/778] :arrow_up: Upgrades vscode-icons-team.vscode-icons to 9.6.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 8de054b..f04bc53 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -5,4 +5,4 @@ lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.5.3 usernamehw.errorlens#2.7.2 -vscode-icons-team.vscode-icons#9.5.0 +vscode-icons-team.vscode-icons#9.6.0 From eb0f0a16e406af51b0e4799c78c12f450a7a6a0a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 24 Nov 2019 18:46:00 +0100 Subject: [PATCH 097/778] :arrow_up: Upgrades redhat.vscode-yaml to 0.6.1 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index f04bc53..143e317 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -3,6 +3,6 @@ ESPHome.esphome-vscode#0.2.0 keesschollaart.vscode-home-assistant#1.3.3 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 -redhat.vscode-yaml#0.5.3 +redhat.vscode-yaml#0.6.1 usernamehw.errorlens#2.7.2 vscode-icons-team.vscode-icons#9.6.0 From e50da8009678179a54777ff7285bc2ca521e7d1e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 24 Nov 2019 18:46:16 +0100 Subject: [PATCH 098/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.4.4 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 143e317..bce1bfc 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.6.0 ESPHome.esphome-vscode#0.2.0 -keesschollaart.vscode-home-assistant#1.3.3 +keesschollaart.vscode-home-assistant#1.4.4 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.6.1 From 3328cf41bd54e2241f1f8602d80ce4fda33d9de1 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 24 Nov 2019 18:54:58 +0100 Subject: [PATCH 099/778] :arrow_up: Upgrades openssl to 1.1.1-1ubuntu2.1~18.04.5 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 6191747..ad79b67 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -72,7 +72,7 @@ RUN \ nginx=1.14.0-0ubuntu1.6 \ nmap=7.60-1ubuntu5 \ openssh-client=1:7.6p1-4ubuntu0.3 \ - openssl=1.1.1-1ubuntu2.1~18.04.4 \ + openssl=1.1.1-1ubuntu2.1~18.04.5 \ python3-dev=3.6.7-1~18.04 \ python3=3.6.7-1~18.04 \ wget=1.19.4-1ubuntu2.2 \ From 7cee9ee4e74474a8525ff45df6c996e53237a1aa Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 24 Nov 2019 21:23:34 +0100 Subject: [PATCH 100/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.4.5 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index bce1bfc..eb75555 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.6.0 ESPHome.esphome-vscode#0.2.0 -keesschollaart.vscode-home-assistant#1.4.4 +keesschollaart.vscode-home-assistant#1.4.5 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.6.1 From f1c785507be11e9373ec93d5bca3a63b06ef83af Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Dec 2019 10:50:32 +0100 Subject: [PATCH 101/778] :arrow_up: Updates yamllint to v1.20.0 (#69) Co-authored-by: Renovate Bot --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index dd4dcff..833b1fe 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ homeassistant_cli==0.8.0 -yamllint==1.19.0 +yamllint==1.20.0 From ab456aa73f6e44fac5dc847bc15ff7b970bb26b5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 2 Jan 2020 20:35:41 +0100 Subject: [PATCH 102/778] :fireworks: Updates maintenance/license year to 2020 --- LICENSE.md | 2 +- README.md | 5 ++--- vscode/.README.j2 | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 05c00f7..9344a08 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # MIT License -Copyright (c) 2019 Franck Nijhof +Copyright (c) 2019-2020 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 9b483c9..4ad8a8a 100644 --- a/README.md +++ b/README.md @@ -263,7 +263,7 @@ our [GitHub Repository][repository]. MIT License -Copyright (c) 2019 Franck Nijhof +Copyright (c) 2019-2020 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 @@ -305,8 +305,7 @@ SOFTWARE. [issue]: https://github.com/hassio-addons/addon-vscode/issues [keepchangelog]: http://keepachangelog.com/en/1.0.0/ [license-shield]: https://img.shields.io/github/license/hassio-addons/addon-vscode.svg -[maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg -[patreon-shield]: https://www.frenck.nl/images/patreon.png +[maintenance-shield]: https://img.shields.io/maintenance/yes/2020.svg [patreon]: https://www.patreon.com/frenck [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg [reddit]: https://reddit.com/r/homeassistant diff --git a/vscode/.README.j2 b/vscode/.README.j2 index e4d3f1e..2acd154 100644 --- a/vscode/.README.j2 +++ b/vscode/.README.j2 @@ -73,8 +73,7 @@ If you are more interested in stable releases of our add-ons: [docs]: {{ repo }}/blob/{{ version }}/README.md [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg [forum]: https://community.home-assistant.io/?u=frenck -[maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg -[patreon-shield]: https://www.frenck.nl/images/patreon.png +[maintenance-shield]: https://img.shields.io/maintenance/yes/2020.svg [patreon]: https://www.patreon.com/frenck [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg [release-shield]: https://img.shields.io/badge/version-{{ version }}-blue.svg From 5a4d8b91b5c12cf22fa6ad3e077250a4df1a2abe Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 2 Jan 2020 20:36:18 +0100 Subject: [PATCH 103/778] :pencil2: Funding adjustments --- .github/FUNDING.yml | 3 +-- README.md | 9 +++++---- vscode/.README.j2 | 9 +++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 1a4828d..7f95bd4 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,5 +1,4 @@ --- -# github: frenck +github: frenck patreon: frenck -ko_fi: frenck custom: https://frenck.dev/donate/ diff --git a/README.md b/README.md index 4ad8a8a..49042d5 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,9 @@ [![Discord][discord-shield]][discord] [![Community Forum][forum-shield]][forum] -[![Buy me a coffee][buymeacoffee-shield]][buymeacoffee] +[![Sponsor Frenck via GitHub Sponsors][github-sponsors-shield]][github-sponsors] -[![Support my work on Patreon][patreon-shield]][patreon] +[![Support Frenck on Patreon][patreon-shield]][patreon] Visual Studio Code, accessible through the browser. @@ -287,8 +287,6 @@ SOFTWARE. [amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg [armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg [armv7-shield]: https://img.shields.io/badge/armv7-no-red.svg -[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg -[buymeacoffee]: https://www.buymeacoffee.com/frenck [commits-shield]: https://img.shields.io/github/commit-activity/y/hassio-addons/addon-vscode.svg [commits]: https://github.com/hassio-addons/addon-vscode/commits/master [contributors]: https://github.com/hassio-addons/addon-vscode/graphs/contributors @@ -298,6 +296,8 @@ SOFTWARE. [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg [forum]: https://community.home-assistant.io/?u=frenck [frenck]: https://github.com/frenck +[github-sponsors-shield]: https://frenck.dev/wp-content/uploads/2019/12/github_sponsor.png +[github-sponsors]: https://github.com/sponsors/frenck [gitlabci-shield]: https://gitlab.com/hassio-addons/addon-vscode/badges/master/pipeline.svg [gitlabci]: https://gitlab.com/hassio-addons/addon-vscode/pipelines [home-assistant]: https://home-assistant.io @@ -306,6 +306,7 @@ SOFTWARE. [keepchangelog]: http://keepachangelog.com/en/1.0.0/ [license-shield]: https://img.shields.io/github/license/hassio-addons/addon-vscode.svg [maintenance-shield]: https://img.shields.io/maintenance/yes/2020.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 [reddit]: https://reddit.com/r/homeassistant diff --git a/vscode/.README.j2 b/vscode/.README.j2 index 2acd154..8fd6b8a 100644 --- a/vscode/.README.j2 +++ b/vscode/.README.j2 @@ -4,9 +4,9 @@ [![Discord][discord-shield]][discord] [![Community Forum][forum-shield]][forum] -[![Buy me a coffee][buymeacoffee-shield]][buymeacoffee] +[![Sponsor Frenck via GitHub Sponsors][github-sponsors-shield]][github-sponsors] -[![Support my work on Patreon][patreon-shield]][patreon] +[![Support Frenck on Patreon][patreon-shield]][patreon] Visual Studio Code, accessible through the browser. @@ -66,14 +66,15 @@ If you are more interested in stable releases of our add-ons: {% endif %} -[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg -[buymeacoffee]: https://www.buymeacoffee.com/frenck [discord-shield]: https://img.shields.io/discord/478094546522079232.svg [discord]: https://discord.me/hassioaddons [docs]: {{ repo }}/blob/{{ version }}/README.md [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg [forum]: https://community.home-assistant.io/?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/2020.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 [release-shield]: https://img.shields.io/badge/version-{{ version }}-blue.svg From 449739e1e8d6628c649d08f450f35e750789d08e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 2 Jan 2020 20:36:34 +0100 Subject: [PATCH 104/778] :pencil2: Fixes some spelling and grammar --- .github/config.yml | 6 +++--- .github/settings.yml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/config.yml b/.github/config.yml index 71d2f6d..f5828bb 100644 --- a/.github/config.yml +++ b/.github/config.yml @@ -34,14 +34,14 @@ requestInfoUserstoExclude: [] newIssueWelcomeComment: > :wave: Thanks for opening your first issue here! If you're reporting a :bug: bug, please make sure you include steps to reproduce it. - Also, logs, error messages and information about your hardware might be usefull. + Also, logs, error messages and information about your hardware might be useful. # Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome # Comment to be posted to on PRs from first time contributors in your repository newPRWelcomeComment: > - :sparkling_heart: Thanks for opening this pull request! :sparkling_heart: - If your PR gets accepted and merged in, we will invite you to the project :tada: + :sparkling_heart: Thanks for opening this pull request! :sparkling_heart: + If your PR gets accepted and merged in, we will invite you to the project :tada: # Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge diff --git a/.github/settings.yml b/.github/settings.yml index 209fe06..76946d0 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -42,10 +42,10 @@ labels: description: "New features or options." - name: "Type: Support" color: 5319e7 - description: "Marks an issue as an support ticket." + description: "Marks an issue as a support ticket." - name: "Type: Discussion" color: d4c5f9 - description: "Marks an issue as an generic discussion ticket." + description: "Marks an issue as a generic discussion ticket." - name: "Type: Maintenance" color: 2af79e description: "Generic maintenance tasks, e.g., package updates." @@ -53,13 +53,13 @@ labels: # Additional markers - name: "Security" color: ee0701 - description: "Marks an security issues that needs to be resolved asap." + description: "Marks a security issue that needs to be resolved asap." - name: "Idea" color: fef2c0 description: "Marks an idea, which might be excepted and implemented." - name: "Incomplete" color: fef2c0 - description: "Marks an PR or issue that is missing information." + description: "Marks a PR or issue that is missing information." - name: "Pull request" color: fbca04 description: "There is an PR opened for this issue." From 962cdb5c8b54fea46928808b676b41d7ce55382f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 2 Jan 2020 20:37:18 +0100 Subject: [PATCH 105/778] :arrow_up: Upgrades add-on base image to v4.0.3 --- .gitlab-ci.yml | 2 +- vscode/Dockerfile | 2 +- vscode/build.json | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de152a2..3d5efd7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,4 @@ variables: ADDON_ARMV7: "false" ADDON_I386: "false" - ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:4.0.1" + ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:4.0.3" diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ad79b67..33c3b86 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/ubuntu-base:4.0.1 +ARG BUILD_FROM=hassioaddons/ubuntu-base:4.0.3 ############################################################################### # Build container to get custom vscode extensions. ############################################################################### diff --git a/vscode/build.json b/vscode/build.json index eb8c697..2b45890 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { - "build_from": { - "amd64": "hassioaddons/ubuntu-base-amd64:4.0.1" - }, - "args": {} + "build_from": { + "amd64": "hassioaddons/ubuntu-base-amd64:4.0.3" + }, + "args": {} } From 287910d04f2f9defe5f3902bde83143bff95ffc9 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 2 Jan 2020 20:37:56 +0100 Subject: [PATCH 106/778] :arrow_up: Upgrades lua-resty-http to 0.15-0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 33c3b86..7661a2e 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -78,7 +78,7 @@ RUN \ wget=1.19.4-1ubuntu2.2 \ zsh=5.4.2-3ubuntu3.1 \ \ - && luarocks install lua-resty-http 0.13-0 \ + && luarocks install lua-resty-http 0.15-0 \ \ && curl https://bootstrap.pypa.io/get-pip.py | python3 \ \ From 1c5ebc38bcc80a57dcee395dacaa585574b28137 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 2 Jan 2020 20:38:31 +0100 Subject: [PATCH 107/778] :arrow_up: Upgrades Hassio CLI to v3.1.2 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 7661a2e..86fd94a 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -94,7 +94,7 @@ RUN \ && chmod a+x /usr/local/bin/code-server \ \ && curl -L -s -o /usr/bin/hassio \ - "https://github.com/home-assistant/hassio-cli/releases/download/3.1.0/hassio_${BUILD_ARCH}" \ + "https://github.com/home-assistant/hassio-cli/releases/download/3.1.2/hassio_${BUILD_ARCH}" \ && chmod a+x /usr/bin/hassio \ \ && git clone --branch master --single-branch --depth 1 \ From 80b16f9ee93b0fbe92bd3cbf07042ee4cdfd08da Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 2 Jan 2020 20:39:19 +0100 Subject: [PATCH 108/778] :arrow_up: Upgrades emilast.LogFileHighlighter to 2.7.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index eb75555..0e3b604 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#2.6.0 +emilast.LogFileHighlighter#2.7.0 ESPHome.esphome-vscode#0.2.0 keesschollaart.vscode-home-assistant#1.4.5 lukas-tr.materialdesignicons-intellisense#1.5.6 From d3280ddc53bb91ce7657df539ffb1de7d3e9ec72 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 2 Jan 2020 20:40:45 +0100 Subject: [PATCH 109/778] :arrow_up: Upgrades usernamehw.errorlens to 2.8.1 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 0e3b604..23d5fc2 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -4,5 +4,5 @@ keesschollaart.vscode-home-assistant#1.4.5 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.6.1 -usernamehw.errorlens#2.7.2 +usernamehw.errorlens#2.8.1 vscode-icons-team.vscode-icons#9.6.0 From 9c33b776b5872f30c00234d8d223a620c5958a98 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 2 Jan 2020 20:41:01 +0100 Subject: [PATCH 110/778] :arrow_up: Upgrades vscode-icons-team.vscode-icons to 9.7.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 23d5fc2..b257605 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -5,4 +5,4 @@ lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.6.1 usernamehw.errorlens#2.8.1 -vscode-icons-team.vscode-icons#9.6.0 +vscode-icons-team.vscode-icons#9.7.0 From b0bee669212503caa082034db4646d07b259b94a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 2 Jan 2020 20:46:24 +0100 Subject: [PATCH 111/778] :arrow_up: Upgrades git to 1:2.17.1-1ubuntu0.5 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 86fd94a..1ba0d94 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -62,7 +62,7 @@ RUN \ ack=2.22-1 \ build-essential=12.4ubuntu1 \ colordiff=1.0.18-1 \ - git=1:2.17.1-1ubuntu0.4 \ + git=1:2.17.1-1ubuntu0.5 \ iputils-ping=3:20161105-1ubuntu3 \ libnginx-mod-http-lua=1.14.0-0ubuntu1.6 \ locales=2.27-3ubuntu1 \ From 4346545f7e40206c50a5c1dcc584da77fd2c6843 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 2 Jan 2020 20:48:24 +0100 Subject: [PATCH 112/778] :books: Adjust add-on installation instructions --- README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 49042d5..558f88f 100644 --- a/README.md +++ b/README.md @@ -43,16 +43,13 @@ instantly, without the need for configuring anything. The installation of this add-on is pretty straightforward and not different in comparison to installing any other Hass.io add-on. -1. [Add our Hass.io add-ons repository][repository] to your Hass.io instance. -1. Install the "Visual Studio Code" add-on. +1. Search for the "Visual Studio Code" add-on in the Hass.io add-on store + and install it. 1. Start the "Visual Studio Code" add-on. 1. Check the logs of the "Visual Studio Code" add-on to see if everything went well. 1. Click the "OPEN WEB UI" button to open Visual Studio Code. -**NOTE**: Do not add this repository to Hass.io, please use: -`https://github.com/hassio-addons/repository`. - ## Configuration **Note**: _Remember to restart the add-on when the configuration is changed._ From 5eb84f026e4d236b034a906d4dbfe78c4698ef20 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 15 Jan 2020 17:00:24 +0100 Subject: [PATCH 113/778] :arrow_up: Upgrades emilast.LogFileHighlighter to 2.7.1 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index b257605..18a01b2 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#2.7.0 +emilast.LogFileHighlighter#2.7.1 ESPHome.esphome-vscode#0.2.0 keesschollaart.vscode-home-assistant#1.4.5 lukas-tr.materialdesignicons-intellisense#1.5.6 From 02d650ea02c39cff9421b29dc34f0b7dd2a35667 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 15 Jan 2020 17:00:47 +0100 Subject: [PATCH 114/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.5.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 18a01b2..4ceba91 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.7.1 ESPHome.esphome-vscode#0.2.0 -keesschollaart.vscode-home-assistant#1.4.5 +keesschollaart.vscode-home-assistant#1.5.0 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.6.1 From 0a6e5631bab25269c846a5f98f1791e34230b809 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 15 Jan 2020 17:01:00 +0100 Subject: [PATCH 115/778] :arrow_up: Upgrades usernamehw.errorlens to 2.9.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 4ceba91..609cbf7 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -4,5 +4,5 @@ keesschollaart.vscode-home-assistant#1.5.0 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.6.1 -usernamehw.errorlens#2.8.1 +usernamehw.errorlens#2.9.0 vscode-icons-team.vscode-icons#9.7.0 From dd1c040d7aed81d991d4e8a29534520dda774a01 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 15 Jan 2020 17:01:13 +0100 Subject: [PATCH 116/778] :arrow_up: Upgrades nginx to 1.14.0-0ubuntu1.7 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 1ba0d94..8886c6c 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -69,7 +69,7 @@ RUN \ luarocks=2.4.2+dfsg-1 \ mosquitto-clients=1.4.15-2ubuntu0.18.04.3 \ net-tools=1.60+git20161116.90da8a0-1ubuntu1 \ - nginx=1.14.0-0ubuntu1.6 \ + nginx=1.14.0-0ubuntu1.7 \ nmap=7.60-1ubuntu5 \ openssh-client=1:7.6p1-4ubuntu0.3 \ openssl=1.1.1-1ubuntu2.1~18.04.5 \ From 77a3d5025fa9ed4cc2117f4dcf6f4bacd40e0d17 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 15 Jan 2020 17:05:11 +0100 Subject: [PATCH 117/778] :arrow_up: Upgrades libnginx-mod-http-lua to 1.14.0-0ubuntu1.7 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 8886c6c..2a93157 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -64,7 +64,7 @@ RUN \ colordiff=1.0.18-1 \ git=1:2.17.1-1ubuntu0.5 \ iputils-ping=3:20161105-1ubuntu3 \ - libnginx-mod-http-lua=1.14.0-0ubuntu1.6 \ + libnginx-mod-http-lua=1.14.0-0ubuntu1.7 \ locales=2.27-3ubuntu1 \ luarocks=2.4.2+dfsg-1 \ mosquitto-clients=1.4.15-2ubuntu0.18.04.3 \ From 3eef1ca6791d1f83cbc92d1c4f73482a35aabb43 Mon Sep 17 00:00:00 2001 From: Paul Sinclair <24625998+sinclairpaul@users.noreply.github.com> Date: Sun, 26 Jan 2020 16:15:27 -0500 Subject: [PATCH 118/778] =?UTF-8?q?=F0=9F=94=A8Disable=20update=20notifica?= =?UTF-8?q?tion=20(#75)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🔨Add hash for previous config * 🔨Set update.mode to none by default --- vscode/rootfs/etc/cont-init.d/code-server.sh | 1 + vscode/rootfs/root/.code-server/settings.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index ead0838..b663c4e 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -11,6 +11,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( d4745002643a0168f65bc5b465a9baff59af0fb4783b50553e1a4e8b3f1a569fc4905df19b7743f7f313a5809a5128d997fc4b5e0a0e5db0a01f47b3b7bec39d 6ed36f832778926fa614fc12eec97b8f813bbb1a04f709769c9e5f54bc8e3cfc05a110155921a3b2ae47fc8389d24fa2bd385e4ce5a6c94850813791a6ac1c82 944d9ba57968666353df7e9dc78ec5d94b9b052e1abf863b51bc1f372d9f35cb2d93259f153e9ab3b3dd1b520bfcd7bddb54803bcfd9eb65975ae8fb5553663c + 4ef960e3d6e795adda51d5cbeb18d309fee87ba5cd177292a21b5a70a71a4726ae7053c3793cddc6d63d3b4dacc180ad3ea12d005fc8d63a1bc4cb29f9a17f18 ) # Ensure persistent data folder exists. diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index 7d36e8b..b3e5d95 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -50,5 +50,6 @@ "esphome.validator": "dashboard", "esphome.dashboardUri": "15ef4d2f-esphome.local.hass.io:6052", "workbench.iconTheme": "vscode-icons", - "vsicons.dontShowNewVersionMessage": true + "vsicons.dontShowNewVersionMessage": true, + "update.mode": "none" } From b6636bb58e224370511f90c4800b1eb4a22308c7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 27 Jan 2020 09:43:32 +0100 Subject: [PATCH 119/778] :arrow_up: Upgrades code-server to 2.1698 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 2a93157..a8111f7 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -85,7 +85,7 @@ RUN \ && locale-gen en_US.UTF-8 \ \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/cdr/code-server/releases/download/2.1692-vsc1.39.2/code-server2.1692-vsc1.39.2-linux-x86_64.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/2.1698/code-server2.1698-vsc1.41.1-linux-x86_64.tar.gz" \ && tar zxvf \ /tmp/code.tar.gz \ --strip 1 -C /tmp \ From 941327288455cba679ec3c5bac5810213ce2396e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 16:11:32 +0100 Subject: [PATCH 120/778] :arrow_up: Upgrades add-on base image to v5.0.0 --- .gitlab-ci.yml | 2 +- vscode/Dockerfile | 2 +- vscode/build.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d5efd7..d1531fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,4 +13,4 @@ variables: ADDON_ARMV7: "false" ADDON_I386: "false" - ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:4.0.3" + ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:5.0.0" diff --git a/vscode/Dockerfile b/vscode/Dockerfile index a8111f7..50d506a 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/ubuntu-base:4.0.3 +ARG BUILD_FROM=hassioaddons/ubuntu-base:5.0.0 ############################################################################### # Build container to get custom vscode extensions. ############################################################################### diff --git a/vscode/build.json b/vscode/build.json index 2b45890..d8fc74d 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { "build_from": { - "amd64": "hassioaddons/ubuntu-base-amd64:4.0.3" + "amd64": "hassioaddons/ubuntu-base-amd64:5.0.0" }, "args": {} } From c4b002b68f2c3012ce0806ec522f9132b0b45ba3 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 16:11:50 +0100 Subject: [PATCH 121/778] :books: Update add-on documentation to use new YAML configuration format --- README.md | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 558f88f..8235def 100644 --- a/README.md +++ b/README.md @@ -56,20 +56,16 @@ comparison to installing any other Hass.io add-on. Example add-on configuration: -```json -{ - "log_level": "info", - "ssl": false, - "certfile": "fullchain.pem", - "keyfile": "privkey.pem", - "packages": [ - "mariadb-client" - ], - "init_commands": [ - "ls -la" - ], - "disable_telemetry": false -} +```yaml +log_level: info +ssl: false +certfile: fullchain.pem +keyfile: privkey.pem +packages: + - mariadb-client +init_commands: + - ls -la +disable_telemetry: false ``` **Note**: _This is just an example, don't copy and paste it! Create your own!_ From 51d0f8f96d9ab2d4581d34cf466272d7c0357370 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 16:15:28 +0100 Subject: [PATCH 122/778] :hammer: Re-branding --- .github/settings.yml | 4 +-- README.md | 26 +++++++++----------- vscode/.README.j2 | 8 +++--- vscode/Dockerfile | 2 +- vscode/config.json | 2 +- vscode/rootfs/etc/cont-init.d/code-server.sh | 2 +- vscode/rootfs/etc/cont-init.d/nginx.sh | 2 +- vscode/rootfs/etc/cont-init.d/user.sh | 2 +- vscode/rootfs/etc/nginx/lua/ha-auth.lua | 6 ++--- vscode/rootfs/etc/nginx/nginx.conf | 2 +- vscode/rootfs/etc/services.d/code/finish | 2 +- vscode/rootfs/etc/services.d/code/run | 2 +- vscode/rootfs/etc/services.d/nginx/finish | 2 +- vscode/rootfs/etc/services.d/nginx/run | 2 +- 14 files changed, 31 insertions(+), 33 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index 76946d0..4834f2f 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -1,8 +1,8 @@ --- repository: - description: "Visual Studio Code - Community Hass.io Add-on for Home Assistant" + description: "Visual Studio Code - Home Assistant Community Add-ons" homepage: https://addons.community - topics: vscode, ide, code-server, hassio-addons, hassio, hass, home-assistant, homeassistant + topics: vscode, ide, code-server, addon, addons, home-assistant, homeassistant private: false has_issues: true has_projects: false diff --git a/README.md b/README.md index 8235def..f2c33c7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Community Hass.io Add-ons: Visual Studio Code +# Home Assistant Community Add-on: Visual Studio Code [![GitHub Release][releases-shield]][releases] ![Project Stage][project-stage-shield] @@ -41,9 +41,9 @@ instantly, without the need for configuring anything. ## Installation The installation of this add-on is pretty straightforward and not different in -comparison to installing any other Hass.io add-on. +comparison to installing any other Home Assistant add-on. -1. Search for the "Visual Studio Code" add-on in the Hass.io add-on store +1. Search for the "Visual Studio Code" add-on in the Supervisor add-on store and install it. 1. Start the "Visual Studio Code" add-on. 1. Check the logs of the "Visual Studio Code" add-on to see if everything went @@ -93,19 +93,19 @@ you are troubleshooting. Enables/Disables SSL (HTTPS). Set it `true` to enable it, `false` otherwise. **Note**: _The SSL settings only apply to direct access and has no effect -on the Hass.io Ingress service._ +on the Ingress service._ ### Option: `certfile` The certificate file to use for SSL. -**Note**: _The file MUST be stored in `/ssl/`, which is default for Hass.io_ +**Note**: _The file MUST be stored in `/ssl/`, which is the default_ ### Option: `keyfile` The private key file to use for SSL. -**Note**: _The file MUST be stored in `/ssl/`, which is default for Hass.io_ +**Note**: _The file MUST be stored in `/ssl/`, which is the default_ ### Option: `packages` @@ -156,10 +156,8 @@ an adjustment to your ESPHome add-on in order to function. ESPHome does not support authentication yet. The ESPHome add-on configuration would look like this: - ```json - { - "leave_front_door_open": true - } + ```yaml + leave_front_door_open: true ``` 1. Save the add-on configuration. @@ -219,7 +217,7 @@ Got questions? You have several options to get them answered: -- The [Community Hass.io Add-ons Discord chat server][discord] for add-on +- The [Home Assistant Community Add-ons Discord chat server][discord] for add-on support and feature requests. - The [Home Assistant Discord chat server][discord-ha] for general Home Assistant discussions and questions. @@ -245,11 +243,11 @@ The original setup of this repository is by [Franck Nijhof][frenck]. For a full list of all authors and contributors, check [the contributor's page][contributors]. -## We have got some Hass.io add-ons for you +## We have got some Home Assistant add-ons for you -Want some more functionality to your Hass.io Home Assistant instance? +Want some more functionality to your Home Assistant instance? -We have created multiple add-ons for Hass.io. For a full list, check out +We have created multiple add-ons for Home Assistant. For a full list, check out our [GitHub Repository][repository]. ## License diff --git a/vscode/.README.j2 b/vscode/.README.j2 index 8fd6b8a..71239d8 100644 --- a/vscode/.README.j2 +++ b/vscode/.README.j2 @@ -1,4 +1,4 @@ -# Community Hass.io Add-ons: Visual Studio Code +# Home Assistant Community Add-on: Visual Studio Code [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield] @@ -30,8 +30,8 @@ instantly, without the need for configuring anything. {% if channel == "edge" %} ## WARNING! THIS IS AN EDGE VERSION! -This Hass.io Add-ons repository contains edge builds of add-ons. Edge builds -add-ons are based upon the latest development version. +This Home Assistant Add-ons repository contains edge builds of add-ons. +Edge builds add-ons are based upon the latest development version. - They may not work at all. - They might stop working at any time. @@ -51,7 +51,7 @@ If you are more interested in stable releases of our add-ons: {% if channel == "beta" %} ## WARNING! THIS IS A BETA VERSION! -This Hass.io Add-ons repository contains beta releases of add-ons. +This Home Assistant Add-ons repository contains beta releases of add-ons. - They might stop working at any time. - They could have a negative impact on your system. diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 50d506a..8d434b7 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -160,4 +160,4 @@ LABEL \ org.label-schema.usage="https://github.com/hassio-addons/addon-vscode/tree/master/README.md" \ org.label-schema.vcs-ref=${BUILD_REF} \ org.label-schema.vcs-url="https://github.com/hassio-addons/addon-vscode" \ - org.label-schema.vendor="Community Hass.io Add-ons" + org.label-schema.vendor="Home Assistant Community Add-ons" diff --git a/vscode/config.json b/vscode/config.json index 4f7b67f..ada616b 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -23,7 +23,7 @@ "80/tcp": null }, "ports_description": { - "80/tcp": "VSCode (Not required for Hass.io Ingress)" + "80/tcp": "VSCode (Not required for Ingress)" }, "map": [ "config:rw", diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index b663c4e..14035f7 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -1,6 +1,6 @@ #!/usr/bin/with-contenv bashio # ============================================================================== -# Community Hass.io Add-ons: Visual Studio Code +# Home Assistant Community Add-on: Visual Studio Code # Sets up code-server. # ============================================================================== diff --git a/vscode/rootfs/etc/cont-init.d/nginx.sh b/vscode/rootfs/etc/cont-init.d/nginx.sh index c33ab00..4afccc2 100644 --- a/vscode/rootfs/etc/cont-init.d/nginx.sh +++ b/vscode/rootfs/etc/cont-init.d/nginx.sh @@ -1,6 +1,6 @@ #!/usr/bin/with-contenv bashio # ============================================================================== -# Community Hass.io Add-ons: Visual Studio Code +# Home Assistant Community Add-on: Visual Studio Code # Configures NGINX for use with code-server # ============================================================================== declare port diff --git a/vscode/rootfs/etc/cont-init.d/user.sh b/vscode/rootfs/etc/cont-init.d/user.sh index 5faf30c..aca6c2e 100644 --- a/vscode/rootfs/etc/cont-init.d/user.sh +++ b/vscode/rootfs/etc/cont-init.d/user.sh @@ -1,6 +1,6 @@ #!/usr/bin/with-contenv bashio # ============================================================================== -# Community Hass.io Add-ons: Visual Studio Code +# Home Assistant Community Add-on: Visual Studio Code # Persists user settings and installs custom user packages. # ============================================================================== readonly GIT_USER_PATH=/data/git diff --git a/vscode/rootfs/etc/nginx/lua/ha-auth.lua b/vscode/rootfs/etc/nginx/lua/ha-auth.lua index 998b509..7aa9d3e 100644 --- a/vscode/rootfs/etc/nginx/lua/ha-auth.lua +++ b/vscode/rootfs/etc/nginx/lua/ha-auth.lua @@ -29,7 +29,7 @@ function authenticate() return true end - --- HTTP request against Hassio API + --- HTTP request against the Supervisor API local httpc = http.new() local res, err = httpc:request_uri("http://supervisor.local.hass.io/auth", { method = "POST", @@ -44,13 +44,13 @@ function authenticate() --- Error during API request if err then - ngx.log(ngx.WARN, "Error during Hassio user authentication.", err) + ngx.log(ngx.WARN, "Error during Home Assistant user authentication.", err) return false end --- No result? Something went wrong... if not res then - ngx.log(ngx.WARN, "Error during Hassio user authentication.") + ngx.log(ngx.WARN, "Error during Home Assistant user authentication.") return false end diff --git a/vscode/rootfs/etc/nginx/nginx.conf b/vscode/rootfs/etc/nginx/nginx.conf index 0b7a81e..5d5980a 100644 --- a/vscode/rootfs/etc/nginx/nginx.conf +++ b/vscode/rootfs/etc/nginx/nginx.conf @@ -13,7 +13,7 @@ worker_processes 1; # Enables the use of JIT for regular expressions to speed-up their processing. pcre_jit on; -# Write error log to Hass.io add-on log. +# Write error log to the add-on log. error_log /proc/1/fd/1 error; # Load allowed environment vars diff --git a/vscode/rootfs/etc/services.d/code/finish b/vscode/rootfs/etc/services.d/code/finish index 5e98225..655c1fc 100644 --- a/vscode/rootfs/etc/services.d/code/finish +++ b/vscode/rootfs/etc/services.d/code/finish @@ -1,6 +1,6 @@ #!/usr/bin/execlineb -S0 # ============================================================================== -# Community Hass.io Add-ons: Visual Studio Code +# Home Assistant Community Add-on: Visual Studio Code # Take down the S6 supervision tree when the code server fails # ============================================================================== if { s6-test ${1} -ne 0 } diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index 66a7165..e2d649a 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -1,6 +1,6 @@ #!/usr/bin/with-contenv bashio # ============================================================================== -# Community Hass.io Add-ons: Visual Studio Code +# Home Assistant Community Add-on: Visual Studio Code # Runs the code server # ============================================================================== declare -a options diff --git a/vscode/rootfs/etc/services.d/nginx/finish b/vscode/rootfs/etc/services.d/nginx/finish index 5378801..8fa1a7f 100644 --- a/vscode/rootfs/etc/services.d/nginx/finish +++ b/vscode/rootfs/etc/services.d/nginx/finish @@ -1,6 +1,6 @@ #!/usr/bin/execlineb -S0 # ============================================================================== -# Community Hass.io Add-ons: Visual Studio Code +# Home Assistant Community Add-on: Visual Studio Code # Take down the S6 supervision tree when Nginx fails # ============================================================================== if { s6-test ${1} -ne 0 } diff --git a/vscode/rootfs/etc/services.d/nginx/run b/vscode/rootfs/etc/services.d/nginx/run index 2b393a9..388dce5 100644 --- a/vscode/rootfs/etc/services.d/nginx/run +++ b/vscode/rootfs/etc/services.d/nginx/run @@ -1,6 +1,6 @@ #!/usr/bin/with-contenv bashio # ============================================================================== -# Community Hass.io Add-ons: Visual Studio Code +# Home Assistant Community Add-on: Visual Studio Code # Runs the Nginx daemon # ============================================================================== From 2d6d5be963ec5cfee97d68da5fab2367fb18b12a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 16:16:08 +0100 Subject: [PATCH 123/778] :hammer: Update add-on config with new password & list features --- vscode/config.json | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/vscode/config.json b/vscode/config.json index ada616b..a8ab7c9 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -10,9 +10,7 @@ "panel_icon": "mdi:visual-studio-code", "startup": "services", "homeassistant": "0.92.0b2", - "arch": [ - "amd64" - ], + "arch": ["amd64"], "boot": "auto", "hassio_api": true, "auth_api": true, @@ -25,13 +23,7 @@ "ports_description": { "80/tcp": "VSCode (Not required for Ingress)" }, - "map": [ - "config:rw", - "ssl:rw", - "addons:rw", - "share:rw", - "backup:rw" - ], + "map": ["config:rw", "ssl:rw", "addons:rw", "share:rw", "backup:rw"], "options": { "ssl": true, "certfile": "fullchain.pem", @@ -41,7 +33,7 @@ "disable_telemetry": false }, "schema": { - "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?", + "log_level": "list(trace|debug|info|notice|warning|error|fatal)?", "ssl": "bool", "certfile": "str", "keyfile": "str", From 3c50dd9548864e78f6390f7697cf1331336d91b2 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 16:16:33 +0100 Subject: [PATCH 124/778] :hammer: Updates for upstream Supervisor changes --- vscode/rootfs/etc/cont-init.d/nginx.sh | 6 +++--- vscode/rootfs/etc/nginx/includes/resolver.conf | 2 +- vscode/rootfs/etc/nginx/lua/ha-auth.lua | 2 +- vscode/rootfs/etc/nginx/nginx.conf | 10 +++++----- vscode/rootfs/etc/services.d/code/run | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/vscode/rootfs/etc/cont-init.d/nginx.sh b/vscode/rootfs/etc/cont-init.d/nginx.sh index 4afccc2..bf82a58 100644 --- a/vscode/rootfs/etc/cont-init.d/nginx.sh +++ b/vscode/rootfs/etc/cont-init.d/nginx.sh @@ -5,7 +5,7 @@ # ============================================================================== declare port declare certfile -declare hassio_dns +declare dns_host declare ingress_interface declare ingress_port declare keyfile @@ -32,5 +32,5 @@ ingress_interface=$(bashio::addon.ip_address) sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf -hassio_dns=$(bashio::dns.host) -sed -i "s/%%hassio_dns%%/${hassio_dns}/g" /etc/nginx/includes/resolver.conf +dns_host=$(bashio::dns.host) +sed -i "s/%%dns_host%%/${dns_host}/g" /etc/nginx/includes/resolver.conf diff --git a/vscode/rootfs/etc/nginx/includes/resolver.conf b/vscode/rootfs/etc/nginx/includes/resolver.conf index 65c431d..d864899 100644 --- a/vscode/rootfs/etc/nginx/includes/resolver.conf +++ b/vscode/rootfs/etc/nginx/includes/resolver.conf @@ -1 +1 @@ -resolver %%hassio_dns%%; +resolver %%dns_host%%; diff --git a/vscode/rootfs/etc/nginx/lua/ha-auth.lua b/vscode/rootfs/etc/nginx/lua/ha-auth.lua index 7aa9d3e..a2c633c 100644 --- a/vscode/rootfs/etc/nginx/lua/ha-auth.lua +++ b/vscode/rootfs/etc/nginx/lua/ha-auth.lua @@ -36,7 +36,7 @@ function authenticate() body = ngx.encode_args({["username"]=username, ["password"]=password}), headers = { ["Content-Type"] = "application/x-www-form-urlencoded", - ["X-HASSIO-KEY"] = os.getenv("HASSIO_TOKEN"), + ["X-Supervisor-Token"] = os.getenv("SUPERVISOR_TOKEN"), }, keepalive_timeout = 60, keepalive_pool = 10 diff --git a/vscode/rootfs/etc/nginx/nginx.conf b/vscode/rootfs/etc/nginx/nginx.conf index 5d5980a..c251be5 100644 --- a/vscode/rootfs/etc/nginx/nginx.conf +++ b/vscode/rootfs/etc/nginx/nginx.conf @@ -17,7 +17,7 @@ pcre_jit on; error_log /proc/1/fd/1 error; # Load allowed environment vars -env HASSIO_TOKEN; +env SUPERVISOR_TOKEN; env DISABLE_HA_AUTHENTICATION; # Load dynamic modules. @@ -31,11 +31,11 @@ events { http { include /etc/nginx/includes/mime.types; - log_format hassio '[$time_local] $status ' - '$http_x_forwarded_for($remote_addr) ' - '$request ($http_user_agent)'; + log_format homeassistant '[$time_local] $status ' + '$http_x_forwarded_for($remote_addr) ' + '$request ($http_user_agent)'; - access_log /proc/1/fd/1 hassio; + access_log /proc/1/fd/1 homeassistant; client_max_body_size 4G; default_type application/octet-stream; gzip on; diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index e2d649a..269ef06 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -20,8 +20,8 @@ fi options+=(--auth none) # Export env variables for the Home Assistant extension -export HASS_SERVER="http://hassio/homeassistant" -export HASS_TOKEN="${HASSIO_TOKEN:-}" +export HASS_SERVER="http://supervisor/core" +export HASS_TOKEN="${SUPERVISOR_TOKEN:-}" # Run the code server exec code-server "${options[@]}" /config From c9bad80acfa0f46b04defedaeeccf68fd1de68cd Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 16:24:54 +0100 Subject: [PATCH 125/778] :books: Update add-on documentation to use new YAML configuration format --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index f2c33c7..4b86751 100644 --- a/README.md +++ b/README.md @@ -58,9 +58,6 @@ Example add-on configuration: ```yaml log_level: info -ssl: false -certfile: fullchain.pem -keyfile: privkey.pem packages: - mariadb-client init_commands: From 8f859dddc1d09b88f0f846db2cf86d9dbca86a3a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 16:30:55 +0100 Subject: [PATCH 126/778] :fire: Remove direct access support --- README.md | 29 +----- vscode/config.json | 18 +--- vscode/rootfs/etc/cont-init.d/nginx.sh | 36 ------- vscode/rootfs/etc/nginx/includes/mime.types | 96 ------------------- .../etc/nginx/includes/proxy_params.conf | 15 --- .../rootfs/etc/nginx/includes/resolver.conf | 1 - .../etc/nginx/includes/server_params.conf | 6 -- .../rootfs/etc/nginx/includes/ssl_params.conf | 9 -- .../rootfs/etc/nginx/includes/upstream.conf | 3 - vscode/rootfs/etc/nginx/lua/ha-auth.lua | 83 ---------------- vscode/rootfs/etc/nginx/modules/ndk_http.conf | 1 - .../etc/nginx/modules/ngx_http_lua.conf | 1 - vscode/rootfs/etc/nginx/nginx.conf | 58 ----------- .../etc/nginx/servers/direct-ssl.disabled | 16 ---- .../rootfs/etc/nginx/servers/direct.disabled | 11 --- vscode/rootfs/etc/nginx/servers/ingress.conf | 13 --- vscode/rootfs/etc/services.d/code/run | 4 +- vscode/rootfs/etc/services.d/nginx/finish | 9 -- vscode/rootfs/etc/services.d/nginx/run | 17 ---- 19 files changed, 4 insertions(+), 422 deletions(-) delete mode 100644 vscode/rootfs/etc/cont-init.d/nginx.sh delete mode 100644 vscode/rootfs/etc/nginx/includes/mime.types delete mode 100644 vscode/rootfs/etc/nginx/includes/proxy_params.conf delete mode 100644 vscode/rootfs/etc/nginx/includes/resolver.conf delete mode 100644 vscode/rootfs/etc/nginx/includes/server_params.conf delete mode 100644 vscode/rootfs/etc/nginx/includes/ssl_params.conf delete mode 100644 vscode/rootfs/etc/nginx/includes/upstream.conf delete mode 100644 vscode/rootfs/etc/nginx/lua/ha-auth.lua delete mode 100644 vscode/rootfs/etc/nginx/modules/ndk_http.conf delete mode 100644 vscode/rootfs/etc/nginx/modules/ngx_http_lua.conf delete mode 100644 vscode/rootfs/etc/nginx/nginx.conf delete mode 100644 vscode/rootfs/etc/nginx/servers/direct-ssl.disabled delete mode 100644 vscode/rootfs/etc/nginx/servers/direct.disabled delete mode 100644 vscode/rootfs/etc/nginx/servers/ingress.conf delete mode 100644 vscode/rootfs/etc/services.d/nginx/finish delete mode 100644 vscode/rootfs/etc/services.d/nginx/run diff --git a/README.md b/README.md index 4b86751..ee9abeb 100644 --- a/README.md +++ b/README.md @@ -85,25 +85,6 @@ more severe level, e.g., `debug` also shows `info` messages. By default, the `log_level` is set to `info`, which is the recommended setting unless you are troubleshooting. -### Option: `ssl` - -Enables/Disables SSL (HTTPS). Set it `true` to enable it, `false` otherwise. - -**Note**: _The SSL settings only apply to direct access and has no effect -on the Ingress service._ - -### Option: `certfile` - -The certificate file to use for SSL. - -**Note**: _The file MUST be stored in `/ssl/`, which is the default_ - -### Option: `keyfile` - -The private key file to use for SSL. - -**Note**: _The file MUST be stored in `/ssl/`, which is the default_ - ### Option: `packages` Allows you to specify additional [Ubuntu packages][ubuntu-packages] to be @@ -120,15 +101,7 @@ single time this add-on starts. ### Option: `disable_telemetry` -Disables annonymous usage telemetry data from being sent to code-server. - -### Option: `leave_front_door_open` - -Adding this option to the add-on configuration allows you to disable -authentication on the VSCode by setting it to `true`. - -**Note**: _We STRONGLY suggest, not to use this, even if this add-on is -only exposed to your internal network. USE AT YOUR OWN RISK!_ +Disables anonymous usage telemetry data from being sent to code-server. ## Resetting your VSCode settings to the add-on defaults diff --git a/vscode/config.json b/vscode/config.json index a8ab7c9..b10d926 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -4,42 +4,26 @@ "slug": "vscode", "description": "Fully featured VSCode experience, to edit your HA config in the browser, including auto-completion!", "url": "https://github.com/hassio-addons/addon-vscode", - "webui": "[PROTO:ssl]://[HOST]:[PORT:80]", "ingress": true, "ingress_port": 1337, "panel_icon": "mdi:visual-studio-code", "startup": "services", - "homeassistant": "0.92.0b2", "arch": ["amd64"], "boot": "auto", "hassio_api": true, - "auth_api": true, "hassio_role": "manager", "homeassistant_api": true, "auto_uart": true, - "ports": { - "80/tcp": null - }, - "ports_description": { - "80/tcp": "VSCode (Not required for Ingress)" - }, "map": ["config:rw", "ssl:rw", "addons:rw", "share:rw", "backup:rw"], "options": { - "ssl": true, - "certfile": "fullchain.pem", - "keyfile": "privkey.pem", "packages": [], "init_commands": [], "disable_telemetry": false }, "schema": { "log_level": "list(trace|debug|info|notice|warning|error|fatal)?", - "ssl": "bool", - "certfile": "str", - "keyfile": "str", "packages": ["str"], "init_commands": ["str"], - "disable_telemetry": "bool?", - "leave_front_door_open": "bool?" + "disable_telemetry": "bool?" } } diff --git a/vscode/rootfs/etc/cont-init.d/nginx.sh b/vscode/rootfs/etc/cont-init.d/nginx.sh deleted file mode 100644 index bf82a58..0000000 --- a/vscode/rootfs/etc/cont-init.d/nginx.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Home Assistant Community Add-on: Visual Studio Code -# Configures NGINX for use with code-server -# ============================================================================== -declare port -declare certfile -declare dns_host -declare ingress_interface -declare ingress_port -declare keyfile - -port=$(bashio::addon.port 80) -if bashio::var.has_value "${port}"; then - bashio::config.require.ssl - - if bashio::config.true 'ssl'; then - certfile=$(bashio::config 'certfile') - keyfile=$(bashio::config 'keyfile') - - mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf - sed -i "s#%%certfile%%#${certfile}#g" /etc/nginx/servers/direct.conf - sed -i "s#%%keyfile%%#${keyfile}#g" /etc/nginx/servers/direct.conf - - else - mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf - fi -fi - -ingress_port=$(bashio::addon.ingress_port) -ingress_interface=$(bashio::addon.ip_address) -sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf -sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf - -dns_host=$(bashio::dns.host) -sed -i "s/%%dns_host%%/${dns_host}/g" /etc/nginx/includes/resolver.conf diff --git a/vscode/rootfs/etc/nginx/includes/mime.types b/vscode/rootfs/etc/nginx/includes/mime.types deleted file mode 100644 index 7c7cdef..0000000 --- a/vscode/rootfs/etc/nginx/includes/mime.types +++ /dev/null @@ -1,96 +0,0 @@ -types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - application/javascript js; - application/atom+xml atom; - application/rss+xml rss; - - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; - - image/png png; - image/svg+xml svg svgz; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/webp webp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - - font/woff woff; - font/woff2 woff2; - - application/java-archive jar war ear; - application/json json; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.apple.mpegurl m3u8; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/vnd.ms-excel xls; - application/vnd.ms-fontobject eot; - application/vnd.ms-powerpoint ppt; - application/vnd.oasis.opendocument.graphics odg; - application/vnd.oasis.opendocument.presentation odp; - application/vnd.oasis.opendocument.spreadsheet ods; - application/vnd.oasis.opendocument.text odt; - application/vnd.openxmlformats-officedocument.presentationml.presentation - pptx; - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet - xlsx; - application/vnd.openxmlformats-officedocument.wordprocessingml.document - docx; - application/vnd.wap.wmlc wmlc; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/xspf+xml xspf; - application/zip zip; - - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream iso img; - application/octet-stream msi msp msm; - - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; - - video/3gpp 3gpp 3gp; - video/mp2t ts; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; -} diff --git a/vscode/rootfs/etc/nginx/includes/proxy_params.conf b/vscode/rootfs/etc/nginx/includes/proxy_params.conf deleted file mode 100644 index ec26601..0000000 --- a/vscode/rootfs/etc/nginx/includes/proxy_params.conf +++ /dev/null @@ -1,15 +0,0 @@ -proxy_http_version 1.1; -proxy_ignore_client_abort off; -proxy_read_timeout 86400s; -proxy_redirect off; -proxy_send_timeout 86400s; -proxy_max_temp_file_size 0; - -proxy_set_header Accept-Encoding "gzip"; -proxy_set_header Connection $connection_upgrade; -proxy_set_header Host $http_host; -proxy_set_header Upgrade $http_upgrade; -proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -proxy_set_header X-Forwarded-Proto $scheme; -proxy_set_header X-NginX-Proxy true; -proxy_set_header X-Real-IP $remote_addr; diff --git a/vscode/rootfs/etc/nginx/includes/resolver.conf b/vscode/rootfs/etc/nginx/includes/resolver.conf deleted file mode 100644 index d864899..0000000 --- a/vscode/rootfs/etc/nginx/includes/resolver.conf +++ /dev/null @@ -1 +0,0 @@ -resolver %%dns_host%%; diff --git a/vscode/rootfs/etc/nginx/includes/server_params.conf b/vscode/rootfs/etc/nginx/includes/server_params.conf deleted file mode 100644 index 09c0654..0000000 --- a/vscode/rootfs/etc/nginx/includes/server_params.conf +++ /dev/null @@ -1,6 +0,0 @@ -root /dev/null; -server_name $hostname; - -add_header X-Content-Type-Options nosniff; -add_header X-XSS-Protection "1; mode=block"; -add_header X-Robots-Tag none; diff --git a/vscode/rootfs/etc/nginx/includes/ssl_params.conf b/vscode/rootfs/etc/nginx/includes/ssl_params.conf deleted file mode 100644 index 6f15005..0000000 --- a/vscode/rootfs/etc/nginx/includes/ssl_params.conf +++ /dev/null @@ -1,9 +0,0 @@ -ssl_protocols TLSv1.2; -ssl_prefer_server_ciphers on; -ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA; -ssl_ecdh_curve secp384r1; -ssl_session_timeout 10m; -ssl_session_cache shared:SSL:10m; -ssl_session_tickets off; -ssl_stapling on; -ssl_stapling_verify on; diff --git a/vscode/rootfs/etc/nginx/includes/upstream.conf b/vscode/rootfs/etc/nginx/includes/upstream.conf deleted file mode 100644 index 8c9b878..0000000 --- a/vscode/rootfs/etc/nginx/includes/upstream.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream backend { - server 127.0.0.1:8443; -} diff --git a/vscode/rootfs/etc/nginx/lua/ha-auth.lua b/vscode/rootfs/etc/nginx/lua/ha-auth.lua deleted file mode 100644 index a2c633c..0000000 --- a/vscode/rootfs/etc/nginx/lua/ha-auth.lua +++ /dev/null @@ -1,83 +0,0 @@ -local http = require "resty.http" -local auths = ngx.shared.auths - -function authenticate() - - --- Test Authentication header is set and with a value - local header = ngx.req.get_headers()['Authorization'] - if header == nil or header:find(" ") == nil then - return false - end - - local divider = header:find(' ') - if header:sub(0, divider-1) ~= 'Basic' then - return false - end - - local auth = ngx.decode_base64(header:sub(divider+1)) - if auth == nil or auth:find(':') == nil then - return false - end - - divider = auth:find(':') - local username = auth:sub(0, divider-1) - local password = auth:sub(divider+1) - - --- Check if authentication is cached - if auths:get(username) == password then - ngx.log(ngx.DEBUG, "Authenticated user against Home Assistant (cache).") - return true - end - - --- HTTP request against the Supervisor API - local httpc = http.new() - local res, err = httpc:request_uri("http://supervisor.local.hass.io/auth", { - method = "POST", - body = ngx.encode_args({["username"]=username, ["password"]=password}), - headers = { - ["Content-Type"] = "application/x-www-form-urlencoded", - ["X-Supervisor-Token"] = os.getenv("SUPERVISOR_TOKEN"), - }, - keepalive_timeout = 60, - keepalive_pool = 10 - }) - - --- Error during API request - if err then - ngx.log(ngx.WARN, "Error during Home Assistant user authentication.", err) - return false - end - - --- No result? Something went wrong... - if not res then - ngx.log(ngx.WARN, "Error during Home Assistant user authentication.") - return false - end - - --- Valid response, the username/password is valid - if res.status == 200 then - ngx.log(ngx.INFO, "Authenticated user against Home Assistant.") - auths:set(username, password, 60) - return true - end - - --- Whatever the response is, it is invalid - ngx.log(ngx.WARN, "Authentication against Home Assistant failed!") - return false -end - --- Only authenticate if its not disabled -if not os.getenv('DISABLE_HA_AUTHENTICATION') then - - --- Try to authenticate against HA - local authenticated = authenticate() - - --- If authentication failed, throw a basic auth - if not authenticated then - ngx.header.content_type = 'text/plain' - ngx.header.www_authenticate = 'Basic realm="Home Assistant"' - ngx.status = ngx.HTTP_UNAUTHORIZED - ngx.say('401 Access Denied') - ngx.exit(ngx.HTTP_UNAUTHORIZED) - end -end diff --git a/vscode/rootfs/etc/nginx/modules/ndk_http.conf b/vscode/rootfs/etc/nginx/modules/ndk_http.conf deleted file mode 100644 index 2663122..0000000 --- a/vscode/rootfs/etc/nginx/modules/ndk_http.conf +++ /dev/null @@ -1 +0,0 @@ -load_module "/usr/lib/nginx/modules/ndk_http_module.so"; diff --git a/vscode/rootfs/etc/nginx/modules/ngx_http_lua.conf b/vscode/rootfs/etc/nginx/modules/ngx_http_lua.conf deleted file mode 100644 index f885ed9..0000000 --- a/vscode/rootfs/etc/nginx/modules/ngx_http_lua.conf +++ /dev/null @@ -1 +0,0 @@ -load_module "/usr/lib/nginx/modules/ngx_http_lua_module.so"; diff --git a/vscode/rootfs/etc/nginx/nginx.conf b/vscode/rootfs/etc/nginx/nginx.conf deleted file mode 100644 index c251be5..0000000 --- a/vscode/rootfs/etc/nginx/nginx.conf +++ /dev/null @@ -1,58 +0,0 @@ -# Run nginx in foreground. -daemon off; - -# This is run inside Docker. -user root; - -# Pid storage location. -pid /var/run/nginx.pid; - -# Set number of worker processes. -worker_processes 1; - -# Enables the use of JIT for regular expressions to speed-up their processing. -pcre_jit on; - -# Write error log to the add-on log. -error_log /proc/1/fd/1 error; - -# Load allowed environment vars -env SUPERVISOR_TOKEN; -env DISABLE_HA_AUTHENTICATION; - -# Load dynamic modules. -include /etc/nginx/modules/*.conf; - -# Max num of simultaneous connections by a worker process. -events { - worker_connections 512; -} - -http { - include /etc/nginx/includes/mime.types; - - log_format homeassistant '[$time_local] $status ' - '$http_x_forwarded_for($remote_addr) ' - '$request ($http_user_agent)'; - - access_log /proc/1/fd/1 homeassistant; - client_max_body_size 4G; - default_type application/octet-stream; - gzip on; - keepalive_timeout 65; - lua_shared_dict auths 16k; - sendfile on; - server_tokens off; - tcp_nodelay on; - tcp_nopush on; - - map $http_upgrade $connection_upgrade { - default upgrade; - '' close; - } - - include /etc/nginx/includes/resolver.conf; - include /etc/nginx/includes/upstream.conf; - - include /etc/nginx/servers/*.conf; -} diff --git a/vscode/rootfs/etc/nginx/servers/direct-ssl.disabled b/vscode/rootfs/etc/nginx/servers/direct-ssl.disabled deleted file mode 100644 index 5587fbe..0000000 --- a/vscode/rootfs/etc/nginx/servers/direct-ssl.disabled +++ /dev/null @@ -1,16 +0,0 @@ -server { - listen 80 default_server ssl http2; - - include /etc/nginx/includes/server_params.conf; - include /etc/nginx/includes/ssl_params.conf; - include /etc/nginx/includes/proxy_params.conf; - - ssl on; - ssl_certificate /ssl/%%certfile%%; - ssl_certificate_key /ssl/%%keyfile%%; - - location / { - access_by_lua_file /etc/nginx/lua/ha-auth.lua; - proxy_pass http://backend; - } -} diff --git a/vscode/rootfs/etc/nginx/servers/direct.disabled b/vscode/rootfs/etc/nginx/servers/direct.disabled deleted file mode 100644 index 0065acb..0000000 --- a/vscode/rootfs/etc/nginx/servers/direct.disabled +++ /dev/null @@ -1,11 +0,0 @@ -server { - listen 80 default_server; - - include /etc/nginx/includes/server_params.conf; - include /etc/nginx/includes/proxy_params.conf; - - location / { - access_by_lua_file /etc/nginx/lua/ha-auth.lua; - proxy_pass http://backend; - } -} diff --git a/vscode/rootfs/etc/nginx/servers/ingress.conf b/vscode/rootfs/etc/nginx/servers/ingress.conf deleted file mode 100644 index 225f316..0000000 --- a/vscode/rootfs/etc/nginx/servers/ingress.conf +++ /dev/null @@ -1,13 +0,0 @@ -server { - listen %%interface%%:1337 default_server; - - include /etc/nginx/includes/server_params.conf; - include /etc/nginx/includes/proxy_params.conf; - - location / { - allow 172.30.32.2; - deny all; - - proxy_pass http://backend; - } -} diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index 269ef06..54507e9 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -7,10 +7,10 @@ declare -a options bashio::log.info 'Starting the code server...' -options+=(--port 8443) +options+=(--port 1337) options+=(--user-data-dir "/data/vscode") options+=(--extensions-dir "/data/vscode/extensions") -options+=(--host 127.0.0.1) +options+=(--host 0.0.0.0) if bashio::config.true 'disable_telemetry'; then options+=(--disable-telemetry) diff --git a/vscode/rootfs/etc/services.d/nginx/finish b/vscode/rootfs/etc/services.d/nginx/finish deleted file mode 100644 index 8fa1a7f..0000000 --- a/vscode/rootfs/etc/services.d/nginx/finish +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/execlineb -S0 -# ============================================================================== -# Home Assistant Community Add-on: Visual Studio Code -# Take down the S6 supervision tree when Nginx fails -# ============================================================================== -if { s6-test ${1} -ne 0 } -if { s6-test ${1} -ne 256 } - -s6-svscanctl -t /var/run/s6/services diff --git a/vscode/rootfs/etc/services.d/nginx/run b/vscode/rootfs/etc/services.d/nginx/run deleted file mode 100644 index 388dce5..0000000 --- a/vscode/rootfs/etc/services.d/nginx/run +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Home Assistant Community Add-on: Visual Studio Code -# Runs the Nginx daemon -# ============================================================================== - -# Wait for code-server to become available -bashio::net.wait_for 8443 - -bashio::log.info "Starting NGinx..." - -# Disable HA Authentication if front door is open -if bashio::config.true 'leave_front_door_open'; then - export DISABLE_HA_AUTHENTICATION=true -fi - -exec nginx From 02b0e0b069042c44e9946d3af76f8e57e9a488d4 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 16:33:41 +0100 Subject: [PATCH 127/778] :arrow_up: Updates the Home Assistant CLI to v4.0.1 --- vscode/Dockerfile | 6 +++--- vscode/rootfs/etc/motd | 17 ++++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 8d434b7..89c8b50 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -93,9 +93,9 @@ RUN \ && mv /tmp/code-server /usr/local/bin/code-server \ && chmod a+x /usr/local/bin/code-server \ \ - && curl -L -s -o /usr/bin/hassio \ - "https://github.com/home-assistant/hassio-cli/releases/download/3.1.2/hassio_${BUILD_ARCH}" \ - && chmod a+x /usr/bin/hassio \ + && curl -L -s -o /usr/bin/ha \ + "https://github.com/home-assistant/cli/releases/download/4.0.1/ha_${BUILD_ARCH}" \ + && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ "git://github.com/robbyrussell/oh-my-zsh.git" ~/.oh-my-zsh \ diff --git a/vscode/rootfs/etc/motd b/vscode/rootfs/etc/motd index b64ad92..df098a9 100755 --- a/vscode/rootfs/etc/motd +++ b/vscode/rootfs/etc/motd @@ -1,12 +1,11 @@ - _ _ _ - | | | | (_) - | |__| | __ _ ___ ___ _ ___ - | __ |/ _` / __/ __| | |/ _ \ - | | | | (_| \__ \__ \_| | (_) | - |_| |_|\__,_|___/___(_)_|\___/ + _ _ _ _ _ +| | | | /\ (_) | | | | +| |__| | ___ _ __ ___ ___ / \ ___ ___ _ ___| |_ __ _ _ __ | |_ +| __ |/ _ \| '_ ` _ \ / _ \ / /\ \ / __/ __| / __| __/ _` | '_ \| __| +| | | | (_) | | | | | | __/ / ____ \\__ \__ \ \__ \ || (_| | | | | |_ +|_| |_|\___/|_| |_| |_|\___| /_/ \_\___/___/_|___/\__\__,_|_| |_|\__| -Our Cli: -$ hassio help - +Our command line: +$ ha help From 2ace5bc30cde9a80b4c441e65f59a9594e8c6704 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 16:34:01 +0100 Subject: [PATCH 128/778] :pencil2: Fixes some typos --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ee9abeb..bcbf118 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,7 @@ The add-on has support for ESPHome (and its vscode extension), built-in! It has been installed and pre-configured for you, however, it might need an adjustment to your ESPHome add-on in order to function. -1. Go to the ESPHome add-on configuration in your Hass.io panel. +1. Go to the ESPHome add-on configuration in your Supervisor panel. 1. Add the `leave_front_door_open` option, since the vscode extension of ESPHome does not support authentication yet. The ESPHome add-on configuration would look like this: From b8990874094c6c17e13f2a93ef0dca8cdf5a7bde Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 16:35:10 +0100 Subject: [PATCH 129/778] :fire: Remove unused dependencies --- vscode/Dockerfile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 89c8b50..f97b801 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -64,12 +64,9 @@ RUN \ colordiff=1.0.18-1 \ git=1:2.17.1-1ubuntu0.5 \ iputils-ping=3:20161105-1ubuntu3 \ - libnginx-mod-http-lua=1.14.0-0ubuntu1.7 \ locales=2.27-3ubuntu1 \ - luarocks=2.4.2+dfsg-1 \ mosquitto-clients=1.4.15-2ubuntu0.18.04.3 \ net-tools=1.60+git20161116.90da8a0-1ubuntu1 \ - nginx=1.14.0-0ubuntu1.7 \ nmap=7.60-1ubuntu5 \ openssh-client=1:7.6p1-4ubuntu0.3 \ openssl=1.1.1-1ubuntu2.1~18.04.5 \ @@ -78,8 +75,6 @@ RUN \ wget=1.19.4-1ubuntu2.2 \ zsh=5.4.2-3ubuntu3.1 \ \ - && luarocks install lua-resty-http 0.15-0 \ - \ && curl https://bootstrap.pypa.io/get-pip.py | python3 \ \ && locale-gen en_US.UTF-8 \ @@ -126,12 +121,8 @@ RUN \ \ && rm -fr \ /tmp/* \ - /etc/nginx \ /var/{cache,log}/* \ - /var/lib/apt/lists/* \ - \ - && mkdir -p /var/log/nginx \ - && touch /var/log/nginx/error.log + /var/lib/apt/lists/* # Copy root filesystem COPY rootfs / From d83805ad21adb4726c478d59058cb96876aaa019 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 20:45:32 +0100 Subject: [PATCH 130/778] :ambulance: Fix broken semver link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bcbf118..c7cee43 100644 --- a/README.md +++ b/README.md @@ -274,5 +274,5 @@ SOFTWARE. [releases-shield]: https://img.shields.io/github/release/hassio-addons/addon-vscode.svg [releases]: https://github.com/hassio-addons/addon-vscode/releases [repository]: https://github.com/hassio-addons/repository -[semver]: http://semver.org/spec/v2.0.0.htm +[semver]: http://semver.org/spec/v2.0.0 [ubuntu-packages]: https://packages.ubuntu.com From 4e10fb9df35bcaf71267f9782d093a622167c775 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 20:46:58 +0100 Subject: [PATCH 131/778] :hammer: Install extensions from Marketplace, removes a stage layer --- vscode/Dockerfile | 65 +++++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 41 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index f97b801..c0bf789 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,44 +1,4 @@ ARG BUILD_FROM=hassioaddons/ubuntu-base:5.0.0 -############################################################################### -# Build container to get custom vscode extensions. -############################################################################### -# hadolint ignore=DL3006 -FROM ${BUILD_FROM} as vscode - -# Copy in extensions list -COPY vscode.extensions /root/vscode.extensions - -# Install the actual VSCode to download configs and extensions -# hadolint ignore=DL3015 -RUN \ - apt-get update \ - \ - && apt-get install -y --no-install-recommends \ - libx11-xcb1=2:1.6.4-3ubuntu0.2 \ - libasound2=1.1.3-5ubuntu0.2 \ - \ - && curl \ - -o vscode-amd64.deb \ - -L https://vscode-update.azurewebsites.net/latest/linux-deb-x64/stable \ - \ - && dpkg -i vscode-amd64.deb || true \ - && apt-get install -y -f \ - && rm -f vscode-amd64.deb \ - \ - && code -v --user-data-dir /root/.config/Code - -RUN \ - while read -r ext; do \ - echo "Installing vscode extension: ${ext}"; \ - code \ - --user-data-dir /root/.config/Code \ - --install-extension "${ext%#*}"; \ - done < /root/vscode.extensions \ - && ls -la /root/.vscode/extensions - -############################################################################### -# Build the actual add-on. -############################################################################### # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -53,6 +13,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Copy Python requirements file COPY requirements.txt /tmp/requirements.txt +# Copy in extensions list +COPY vscode.extensions /root/vscode.extensions + # Setup base system ARG BUILD_ARCH RUN \ @@ -60,6 +23,7 @@ RUN \ \ && apt-get install -y --no-install-recommends \ ack=2.22-1 \ + bsdtar=3.2.2-3.1ubuntu0.5 \ build-essential=12.4ubuntu1 \ colordiff=1.0.18-1 \ git=1:2.17.1-1ubuntu0.5 \ @@ -109,9 +73,28 @@ RUN \ \ && pip3 install --no-cache-dir -r /tmp/requirements.txt \ \ + && mkdir -p /root/.code-server/extensions \ + && while read -r ext; do \ + extention="${ext%%#*}" \ + vendor="${extention%%.*}"; \ + slug="${extention#*.}"; \ + version="${ext##*#}"; \ + \ + echo "Installing vscode extension: ${slug} by ${vendor} @ ${version} "; \ + \ + mkdir -p "/root/.code-server/extensions/${extention}-${version}"; \ + echo "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${vendor}/vsextensions/${slug}/${version}/vspackage"; \ + curl -JL --retry 5 -H "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36" \ + "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${vendor}/vsextensions/${slug}/${version}/vspackage" \ + | bsdtar --strip-components=1 -xf - \ + -C "/root/.code-server/extensions/${extention}-${version}" extension; \ + sleep 5; \ + done < /root/vscode.extensions \ + && ls -la /root/.code-server/extensions/ \ + \ && apt-get purge -y --auto-remove \ + bsdtar \ build-essential \ - luarocks \ python3-dev \ \ && find /usr/local/lib/python3.6/ -type d -name tests -depth -exec rm -rf {} \; \ From dae5fa6bf3710a2250861a18b726d75f491fd56e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 20:49:34 +0100 Subject: [PATCH 132/778] :sparkles: Adds aarch64 support --- README.md | 9 +++++---- vscode/Dockerfile | 9 ++++----- vscode/config.json | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index c7cee43..3d82720 100644 --- a/README.md +++ b/README.md @@ -148,9 +148,10 @@ will come up with a better solution for this soon. ## Known issues and limitations -- This add-on currently only supports AMD64 machines, although we hope - we are able to support ARM devices in the future, it is most likely that - most devices will lack the resources to run this add-on (e.g., Raspberry Pi). +- This add-on currently only supports AMD64 and aarch64/ARM64 machines. + Although we support ARM devices, please be aware, that this add-on is quite + heavy to run, and requires quite a bit of RAM. We do not recommended to run + it on devices with less than 4Gb of memory. - If you get a blank screen (and it worked before), it could be that you changed your workspace. Reinstalling the add-on will not help since it keeps the data in your browser. To remove it (in Chrome) open up developer tools (F12), @@ -244,7 +245,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -[aarch64-shield]: https://img.shields.io/badge/aarch64-no-red.svg +[aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg [amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg [armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg [armv7-shield]: https://img.shields.io/badge/armv7-no-red.svg diff --git a/vscode/Dockerfile b/vscode/Dockerfile index c0bf789..6ed9f42 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -17,7 +17,7 @@ COPY requirements.txt /tmp/requirements.txt COPY vscode.extensions /root/vscode.extensions # Setup base system -ARG BUILD_ARCH +ARG BUILD_ARCH=amd64 RUN \ apt-get update \ \ @@ -43,8 +43,10 @@ RUN \ \ && locale-gen en_US.UTF-8 \ \ + && if [[ "${BUILD_ARCH}" = "aarch64" ]]; then ARCH="arm64"; fi \ + && if [[ "${BUILD_ARCH}" = "amd64" ]]; then ARCH="x86_64"; fi \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/cdr/code-server/releases/download/2.1698/code-server2.1698-vsc1.41.1-linux-x86_64.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/2.1698/code-server2.1698-vsc1.41.1-linux-${ARCH}.tar.gz" \ && tar zxvf \ /tmp/code.tar.gz \ --strip 1 -C /tmp \ @@ -110,9 +112,6 @@ RUN \ # Copy root filesystem COPY rootfs / -# Get the custom extensions -COPY --from=vscode /root/.vscode/extensions /root/.code-server/extensions - # Build arguments ARG BUILD_DATE ARG BUILD_REF diff --git a/vscode/config.json b/vscode/config.json index b10d926..e1c563a 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -8,7 +8,7 @@ "ingress_port": 1337, "panel_icon": "mdi:visual-studio-code", "startup": "services", - "arch": ["amd64"], + "arch": ["aarch64", "amd64"], "boot": "auto", "hassio_api": true, "hassio_role": "manager", From f99b94349dcfdb9d5317105ec64b32f56652e760 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 20:52:25 +0100 Subject: [PATCH 133/778] :rocket: Add aarch64 CI/build --- .gitlab-ci.yml | 2 +- vscode/build.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d1531fc..13a9ee8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,9 +8,9 @@ variables: ADDON_LEGACY_TAGS: "true" - ADDON_AARCH64: "false" ADDON_ARMHF: "false" ADDON_ARMV7: "false" ADDON_I386: "false" + ADDON_AARCH64_BASE: "hassioaddons/ubuntu-base-aarch64:5.0.0" ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:5.0.0" diff --git a/vscode/build.json b/vscode/build.json index d8fc74d..6f41c60 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,5 +1,6 @@ { "build_from": { + "aarch64": "hassioaddons/ubuntu-base-aarch64:5.0.0", "amd64": "hassioaddons/ubuntu-base-amd64:5.0.0" }, "args": {} From f0e7d5cb83ac3bf94f6d3696f8c8c718af7e1c18 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 21:40:30 +0100 Subject: [PATCH 134/778] :hammer: Mark delivered extensions as builtin --- vscode/rootfs/etc/cont-init.d/code-server.sh | 11 +++++++++-- vscode/rootfs/etc/services.d/code/run | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index 14035f7..af5a3f7 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -20,8 +20,15 @@ if ! bashio::fs.directory_exists '/data/vscode'; then || bashio::exit.nok "Could not create persistent storage folder." fi -# Copy in the extensions we deliver. -cp -R /root/.code-server/extensions/* /data/vscode/extensions +# Clean up copies of extensions we deliver from the persistent storage +while read -r ext; do + extension="${ext%%#*}" + echo "${extension,,}" + rm -f -r /data/vscode/extensions/${extension,,}* +done < /root/vscode.extensions + +# Ensure user extensions folder exists +mkdir -p /data/vscode/extensions # Sets up default user settings on first start. if ! bashio::fs.file_exists '/data/vscode/User/settings.json'; then diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index 54507e9..e64b296 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -9,6 +9,7 @@ bashio::log.info 'Starting the code server...' options+=(--port 1337) options+=(--user-data-dir "/data/vscode") +options+=(--extra-builtin-extensions-dir "/root/.code-server/extensions/") options+=(--extensions-dir "/data/vscode/extensions") options+=(--host 0.0.0.0) From 3e6b96e0c3039b740e50b065ad1f634477fe8374 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 21:41:06 +0100 Subject: [PATCH 135/778] :hammer: Improve download if extensions during build --- vscode/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 6ed9f42..6dbe607 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -84,11 +84,12 @@ RUN \ \ echo "Installing vscode extension: ${slug} by ${vendor} @ ${version} "; \ \ - mkdir -p "/root/.code-server/extensions/${extention}-${version}"; \ echo "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${vendor}/vsextensions/${slug}/${version}/vspackage"; \ - curl -JL --retry 5 -H "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36" \ - "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${vendor}/vsextensions/${slug}/${version}/vspackage" \ - | bsdtar --strip-components=1 -xf - \ + curl -JL --retry 5 -o "/tmp/${extention}-${version}.vsix" \ + -H "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36" \ + "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${vendor}/vsextensions/${slug}/${version}/vspackage"; \ + mkdir -p "/root/.code-server/extensions/${extention}-${version}"; \ + bsdtar --strip-components=1 -xf "/tmp/${extention}-${version}.vsix" \ -C "/root/.code-server/extensions/${extention}-${version}" extension; \ sleep 5; \ done < /root/vscode.extensions \ From 4f8e5122e73a29da226d9832da1f937ddeefb1aa Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 Feb 2020 22:19:33 +0100 Subject: [PATCH 136/778] :shirt: Fixes linter warnings --- vscode/rootfs/etc/cont-init.d/code-server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index af5a3f7..2d6501d 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -24,7 +24,7 @@ fi while read -r ext; do extension="${ext%%#*}" echo "${extension,,}" - rm -f -r /data/vscode/extensions/${extension,,}* + rm -f -r "/data/vscode/extensions/${extension,,}*" done < /root/vscode.extensions # Ensure user extensions folder exists From 87e9e3695af5a7f0d63af4cbff5b00c999c3eb21 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 16 Feb 2020 09:37:14 +0100 Subject: [PATCH 137/778] :sparkles: Add hassio fallback command for backward compatibility --- vscode/rootfs/usr/bin/hassio | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 vscode/rootfs/usr/bin/hassio diff --git a/vscode/rootfs/usr/bin/hassio b/vscode/rootfs/usr/bin/hassio new file mode 100755 index 0000000..e38eb86 --- /dev/null +++ b/vscode/rootfs/usr/bin/hassio @@ -0,0 +1,3 @@ +#!/usr/bin/env bashio +bashio::log.yellow "The 'hassio' command is deprecated, please use 'ha' instead!" +ha "$@" From e7bb759397a80452dea40220dd09ee52a47765cb Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 16 Feb 2020 10:57:04 +0100 Subject: [PATCH 138/778] :sparkles: Add hook up with the MQTT service --- vscode/config.json | 3 ++- vscode/rootfs/etc/cont-init.d/mosquitto.sh | 29 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 vscode/rootfs/etc/cont-init.d/mosquitto.sh diff --git a/vscode/config.json b/vscode/config.json index e1c563a..2d120df 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -10,11 +10,12 @@ "startup": "services", "arch": ["aarch64", "amd64"], "boot": "auto", + "auto_uart": true, "hassio_api": true, "hassio_role": "manager", "homeassistant_api": true, - "auto_uart": true, "map": ["config:rw", "ssl:rw", "addons:rw", "share:rw", "backup:rw"], + "services": ["mqtt:want"], "options": { "packages": [], "init_commands": [], diff --git a/vscode/rootfs/etc/cont-init.d/mosquitto.sh b/vscode/rootfs/etc/cont-init.d/mosquitto.sh new file mode 100644 index 0000000..79be1ee --- /dev/null +++ b/vscode/rootfs/etc/cont-init.d/mosquitto.sh @@ -0,0 +1,29 @@ +#!/usr/bin/with-contenv bashio +# ============================================================================== +# Home Assistant Community Add-on: Visual Studio Code +# Pre-configures the Mosquitto clients, if the service is available +# ============================================================================== +declare host +declare password +declare port +declare username + +host=$(bashio::services "mqtt" "host") +if bashio::var.has_value "${host}"; then + password=$(bashio::services "mqtt" "password") + port=$(bashio::services "mqtt" "port") + username=$(bashio::services "mqtt" "username") + + mkdir -p /root/.config + { + echo "-h ${host}" + echo "--pw ${password}" + echo "--port ${port}" + echo "--username ${username}" + } > /root/.config/mosquitto_sub + + ln -s /root/.config/mosquitto_sub /root/.config/mosquitto_pub + ln -s /root/.config/mosquitto_sub /root/.config/mosquitto_rr +else + bashio::log.info "The above error can be ignored if you don't have Mosquitto installed" +fi From 43a10f5f35a3078cab8bc9d568cac47ab46a3962 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 16 Feb 2020 10:58:07 +0100 Subject: [PATCH 139/778] :sparkles: Add hook up with the MySQL service --- vscode/Dockerfile | 1 + vscode/config.json | 2 +- vscode/rootfs/etc/cont-init.d/mysql.sh | 27 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 vscode/rootfs/etc/cont-init.d/mysql.sh diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 6dbe607..a51162a 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -29,6 +29,7 @@ RUN \ git=1:2.17.1-1ubuntu0.5 \ iputils-ping=3:20161105-1ubuntu3 \ locales=2.27-3ubuntu1 \ + mariadb-client=1:10.1.44-0ubuntu0.18.04.1 \ mosquitto-clients=1.4.15-2ubuntu0.18.04.3 \ net-tools=1.60+git20161116.90da8a0-1ubuntu1 \ nmap=7.60-1ubuntu5 \ diff --git a/vscode/config.json b/vscode/config.json index 2d120df..36eaac7 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -15,7 +15,7 @@ "hassio_role": "manager", "homeassistant_api": true, "map": ["config:rw", "ssl:rw", "addons:rw", "share:rw", "backup:rw"], - "services": ["mqtt:want"], + "services": ["mysql:want", "mqtt:want"], "options": { "packages": [], "init_commands": [], diff --git a/vscode/rootfs/etc/cont-init.d/mysql.sh b/vscode/rootfs/etc/cont-init.d/mysql.sh new file mode 100644 index 0000000..e91f107 --- /dev/null +++ b/vscode/rootfs/etc/cont-init.d/mysql.sh @@ -0,0 +1,27 @@ +#!/usr/bin/with-contenv bashio +# ============================================================================== +# Home Assistant Community Add-on: Visual Studio Code +# Pre-configures the MySQL clients, if the service is available +# ============================================================================== +declare host +declare password +declare port +declare username + +host=$(bashio::services "mysql" "host") +if bashio::var.has_value "${host}"; then + password=$(bashio::services "mysql" "password") + port=$(bashio::services "mysql" "port") + username=$(bashio::services "mysql" "username") + + mkdir -p /root/.config + { + echo "[client]" + echo "host=${host}" + echo "password=\"${password}\"" + echo "port=${port}" + echo "user=\"${username}\"" + } > /etc/mysql/conf.d/service.cnf +else + bashio::log.info "The above error can be ignored if you don't have MariaDB installed" +fi From 04e64acae4d65aa12e8d2da72d2bc47b83bf456a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 16 Feb 2020 11:05:35 +0100 Subject: [PATCH 140/778] :shirt: Remove log spam about extensions during add-on start --- vscode/rootfs/etc/cont-init.d/code-server.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index 2d6501d..1675ee6 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -23,7 +23,6 @@ fi # Clean up copies of extensions we deliver from the persistent storage while read -r ext; do extension="${ext%%#*}" - echo "${extension,,}" rm -f -r "/data/vscode/extensions/${extension,,}*" done < /root/vscode.extensions From 85b0a6b0264dbfdeb093343a9d75b5992669d8f3 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 16 Feb 2020 11:27:10 +0100 Subject: [PATCH 141/778] :ambulance: Fix old extension cleanup --- vscode/rootfs/etc/cont-init.d/code-server.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index 1675ee6..d177b59 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -23,7 +23,8 @@ fi # Clean up copies of extensions we deliver from the persistent storage while read -r ext; do extension="${ext%%#*}" - rm -f -r "/data/vscode/extensions/${extension,,}*" + # shellcheck disable=SC2086 + rm -f -r /data/vscode/extensions/${extension,,}* done < /root/vscode.extensions # Ensure user extensions folder exists From 4c33266fa3f83114b283133b7e1801ca3383b621 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 16 Feb 2020 18:56:28 +0100 Subject: [PATCH 142/778] :pencil2: Corrects forum URL links --- .github/support.yml | 2 +- README.md | 2 +- vscode/.README.j2 | 2 +- vscode/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/support.yml b/.github/support.yml index 27e688f..ded3142 100644 --- a/.github/support.yml +++ b/.github/support.yml @@ -12,7 +12,7 @@ supportComment: > support channels to get help with the project. Head over to the - [Home Assistant community forum](https://community.home-assistant.io/?u=frenck) + [Home Assistant community forum](https://community.home-assistant.io/t/home-assistant-community-add-on-visual-studio-code/107863?u=frenck) or join our [Discord](https://discord.me/hassioaddons) chat. # Close issues marked as support requests diff --git a/README.md b/README.md index 3d82720..7b15fe5 100644 --- a/README.md +++ b/README.md @@ -256,7 +256,7 @@ SOFTWARE. [discord-shield]: https://img.shields.io/discord/478094546522079232.svg [discord]: https://discord.me/hassioaddons [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg -[forum]: https://community.home-assistant.io/?u=frenck +[forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-visual-studio-code/107863?u=frenck [frenck]: https://github.com/frenck [github-sponsors-shield]: https://frenck.dev/wp-content/uploads/2019/12/github_sponsor.png [github-sponsors]: https://github.com/sponsors/frenck diff --git a/vscode/.README.j2 b/vscode/.README.j2 index 71239d8..680f101 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: [discord]: https://discord.me/hassioaddons [docs]: {{ repo }}/blob/{{ version }}/README.md [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg -[forum]: https://community.home-assistant.io/?u=frenck +[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/2020.svg diff --git a/vscode/Dockerfile b/vscode/Dockerfile index a51162a..9ac55fe 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -131,7 +131,7 @@ LABEL \ org.label-schema.build-date=${BUILD_DATE} \ org.label-schema.name="Visual Studio Code" \ org.label-schema.schema-version="1.0" \ - org.label-schema.url="https://community.home-assistant.io/?u=frenck" \ + org.label-schema.url="https://community.home-assistant.io/t/home-assistant-community-add-on-visual-studio-code/107863?u=frenck" \ org.label-schema.usage="https://github.com/hassio-addons/addon-vscode/tree/master/README.md" \ org.label-schema.vcs-ref=${BUILD_REF} \ org.label-schema.vcs-url="https://github.com/hassio-addons/addon-vscode" \ From 4c2b3d3bb85085cf46d0449ec4b7dfee648f0505 Mon Sep 17 00:00:00 2001 From: Niklas <7442307+niklaswa@users.noreply.github.com> Date: Mon, 17 Feb 2020 13:36:33 +0100 Subject: [PATCH 143/778] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Correct=20typo=20i?= =?UTF-8?q?n=20README=20(#80)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b15fe5..cbbe23a 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ an adjustment to your ESPHome add-on in order to function. ``` 1. Save the add-on configuration. -1. Enable direct access to the ESPHome add-on, but enabling the network port. +1. Enable direct access to the ESPHome add-on, by enabling the network port. This option can be found on the ESPHome add-on settings page, in the "Network" section. In the "Host" field (that is now showing disabled), enter `6052` and hit save. From 400b4a73ad731e1dd55ec93a47851ae32b4b963e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 18 Feb 2020 15:45:48 +0100 Subject: [PATCH 144/778] :fire: Remove telemetry setting, disable by default --- vscode/config.json | 6 ++---- vscode/rootfs/etc/services.d/code/run | 4 ---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/vscode/config.json b/vscode/config.json index 36eaac7..3cbf7a4 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -18,13 +18,11 @@ "services": ["mysql:want", "mqtt:want"], "options": { "packages": [], - "init_commands": [], - "disable_telemetry": false + "init_commands": [] }, "schema": { "log_level": "list(trace|debug|info|notice|warning|error|fatal)?", "packages": ["str"], - "init_commands": ["str"], - "disable_telemetry": "bool?" + "init_commands": ["str"] } } diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index e64b296..fe17707 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -13,10 +13,6 @@ options+=(--extra-builtin-extensions-dir "/root/.code-server/extensions/") options+=(--extensions-dir "/data/vscode/extensions") options+=(--host 0.0.0.0) -if bashio::config.true 'disable_telemetry'; then - options+=(--disable-telemetry) -fi - # Disable code authentication, we use HA authentication options+=(--auth none) From dd7f711f468ee05092045229eb2b6f6e29d04f6d Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 18 Feb 2020 15:46:15 +0100 Subject: [PATCH 145/778] :sparkles: Adds Home Assistant CLI auto completion --- vscode/rootfs/root/.zshrc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vscode/rootfs/root/.zshrc b/vscode/rootfs/root/.zshrc index 3366aec..fcd5075 100755 --- a/vscode/rootfs/root/.zshrc +++ b/vscode/rootfs/root/.zshrc @@ -94,8 +94,11 @@ source $ZSH/oh-my-zsh.sh # alias ohmyzsh="mate ~/.oh-my-zsh" alias reset-settings="cp /root/.code-server/settings.json /data/vscode/User/settings.json && echo 'Setting restored!'" -# Home Assistant CLI +# Home Assistant Core CLI eval "$(_HASS_CLI_COMPLETE=source_zsh hass-cli)" +# Home Assistant CLI +source <(ha completion --zsh) + # Show motd on start cat /etc/motd From 1d0419c29f800f691a533ed1ac542d428405002d Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 18 Feb 2020 15:46:45 +0100 Subject: [PATCH 146/778] :fire: Remove vscode icons extension, for memory & cpu issues --- vscode/vscode.extensions | 1 - 1 file changed, 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 609cbf7..0fa1da0 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -5,4 +5,3 @@ lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.6.1 usernamehw.errorlens#2.9.0 -vscode-icons-team.vscode-icons#9.7.0 From 78d7995c88512539d3e8752be26ebffba37bb1a0 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 18 Feb 2020 15:47:38 +0100 Subject: [PATCH 147/778] :hammer: Tune configuration for lower memory & CPU --- vscode/rootfs/etc/cont-init.d/code-server.sh | 1 + vscode/rootfs/root/.code-server/settings.json | 137 +++++++++++------- 2 files changed, 85 insertions(+), 53 deletions(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index d177b59..935fe1d 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -12,6 +12,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( 6ed36f832778926fa614fc12eec97b8f813bbb1a04f709769c9e5f54bc8e3cfc05a110155921a3b2ae47fc8389d24fa2bd385e4ce5a6c94850813791a6ac1c82 944d9ba57968666353df7e9dc78ec5d94b9b052e1abf863b51bc1f372d9f35cb2d93259f153e9ab3b3dd1b520bfcd7bddb54803bcfd9eb65975ae8fb5553663c 4ef960e3d6e795adda51d5cbeb18d309fee87ba5cd177292a21b5a70a71a4726ae7053c3793cddc6d63d3b4dacc180ad3ea12d005fc8d63a1bc4cb29f9a17f18 + c5b8acf06ef6d9a2435e9ddb92cb9fce7cfbfe4a2206b0e0c3c4ed514cc926f8d3c662e694a995d102b5ba939056f93201c220558e06e1cd0872bfb1995ba148 ) # Ensure persistent data folder exists. diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index b3e5d95..fec59bd 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -1,55 +1,86 @@ { - "editor.renderWhitespace": "boundary", - "files.associations": { - "*.dash": "yaml", - "**/esphome/*.yaml": "yaml", - "*.yaml": "home-assistant" - }, - "files.watcherExclude": { - ".nfs**": true, - ".Trash-0/**": true, - "**/__pycache__/**": true, - "**/._*": true, - "**/.git/objects/**": true, - "**/.git/subtree-cache/**": true, - "**/*.db-shm": true, - "**/*.db-wal": true, - "**/*.db": true, - "**/*.log": true, - "**/deps/**": true, - "**/OZW_Log.txt": true, - "**/pyozw.sqlite": true - }, - "search.exclude": { - "**/__pycache__/**": true, - "**/deps/**": true, - ".Trash-0/**": true - }, - "terminal.integrated.copyOnSelection": true, - "yaml.customTags": [ - "!env_var scalar", - "!include_dir_list scalar", - "!include_dir_merge_list scalar", - "!include_dir_merge_named scalar", - "!include_dir_named scalar", - "!include scalar", - "!secret scalar" - ], - "yaml.format.enable": true, - "[yaml]": { - "editor.autoIndent": true, - "editor.insertSpaces": true, - "editor.tabSize": 2, - "editor.quickSuggestions": { - "other": true, - "comments": false, - "strings": true - } - }, - "terminal.integrated.shell.linux": "/usr/bin/zsh", - "esphome.validator": "dashboard", - "esphome.dashboardUri": "15ef4d2f-esphome.local.hass.io:6052", - "workbench.iconTheme": "vscode-icons", - "vsicons.dontShowNewVersionMessage": true, - "update.mode": "none" + "files.associations": { + "*.dash": "yaml", + "**/esphome/*.yaml": "yaml", + "*.yaml": "home-assistant" + }, + "files.watcherExclude": { + ".nfs**": true, + ".Trash-0/**": true, + "**/__pycache__/**": true, + "**/._*": true, + "**/.cloud": true, + "**/.git/objects/**": true, + "**/.git/subtree-cache/**": true, + "**/.HA_VERSION": true, + "**/.storage": true, + "**/*.db-shm": true, + "**/*.db-wal": true, + "**/*.db": true, + "**/*.log": true, + "**/deps/**": true, + "**/OZW_Log.txt": true, + "**/pyozw.sqlite": true + }, + "search.exclude": { + ".Trash-0/**": true, + "**/__pycache__/**": true, + "**/._*": true, + "**/.cloud": true, + "**/.git/objects/**": true, + "**/.git/subtree-cache/**": true, + "**/.git": true, + "**/.HA_VERSION": true, + "**/.storage": true, + "**/*.db-shm": true, + "**/*.db-wal": true, + "**/*.db": true, + "**/*.log": true, + "**/deps/**": true, + "**/OZW_Log.txt": true, + "**/pyozw.sqlite": true + }, + "files.exclude": { + ".Trash-0/**": true, + "**/__pycache__": true, + "**/.cloud": true, + "**/.DS_Store": true, + "**/.git": true, + "**/.HA_VERSION": true, + "**/.storage": true, + "**/*.db-shm": true, + "**/*.db-wal": true, + "**/*.db": true, + "**/deps/**": true + }, + "yaml.customTags": [ + "!env_var scalar", + "!include_dir_list scalar", + "!include_dir_merge_list scalar", + "!include_dir_merge_named scalar", + "!include_dir_named scalar", + "!include scalar", + "!secret scalar" + ], + "[yaml]": { + "editor.autoIndent": true, + "editor.insertSpaces": true, + "editor.tabSize": 2, + "editor.quickSuggestions": { + "other": true, + "comments": false, + "strings": true + } + }, + "editor.renderWhitespace": "boundary", + "esphome.dashboardUri": "15ef4d2f-esphome.local.hass.io:6052", + "esphome.validator": "dashboard", + "telemetry.enableTelemetry": false, + "terminal.integrated.copyOnSelection": true, + "terminal.integrated.shell.linux": "/usr/bin/zsh", + "update.mode": "none", + "vsicons.dontShowNewVersionMessage": true, + "vsicons.projectDetection.disableDetect": true, + "workbench.iconTheme": null, + "yaml.format.enable": true } From dced171872ea63fe7111a63555b53875deb21973 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 18 Feb 2020 18:54:35 +0100 Subject: [PATCH 148/778] :hammer: Reset icon set to vscode default --- vscode/rootfs/root/.code-server/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index fec59bd..d837c98 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -81,6 +81,6 @@ "update.mode": "none", "vsicons.dontShowNewVersionMessage": true, "vsicons.projectDetection.disableDetect": true, - "workbench.iconTheme": null, + "workbench.iconTheme": "vs-seti", "yaml.format.enable": true } From 7d6f06ef34a6642d54ba033ecb03d86d76064bb7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 21 Feb 2020 18:18:49 +0100 Subject: [PATCH 149/778] :arrow_up: Upgrades add-on base image to v5.0.1 --- .gitlab-ci.yml | 4 ++-- vscode/Dockerfile | 2 +- vscode/build.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13a9ee8..7eaca80 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,5 +12,5 @@ variables: ADDON_ARMV7: "false" ADDON_I386: "false" - ADDON_AARCH64_BASE: "hassioaddons/ubuntu-base-aarch64:5.0.0" - ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:5.0.0" + ADDON_AARCH64_BASE: "hassioaddons/ubuntu-base-aarch64:5.0.1" + ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:5.0.1" diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 9ac55fe..8fcdca6 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/ubuntu-base:5.0.0 +ARG BUILD_FROM=hassioaddons/ubuntu-base:5.0.1 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.json b/vscode/build.json index 6f41c60..6b948e3 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,7 +1,7 @@ { "build_from": { - "aarch64": "hassioaddons/ubuntu-base-aarch64:5.0.0", - "amd64": "hassioaddons/ubuntu-base-amd64:5.0.0" + "aarch64": "hassioaddons/ubuntu-base-aarch64:5.0.1", + "amd64": "hassioaddons/ubuntu-base-amd64:5.0.1" }, "args": {} } From 3309ec1baf746289828575fe60613bfce80b99c6 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 21 Feb 2020 18:19:21 +0100 Subject: [PATCH 150/778] :hammer: Use new Bashio service availablity checks --- vscode/rootfs/etc/cont-init.d/mosquitto.sh | 6 ++---- vscode/rootfs/etc/cont-init.d/mysql.sh | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/vscode/rootfs/etc/cont-init.d/mosquitto.sh b/vscode/rootfs/etc/cont-init.d/mosquitto.sh index 79be1ee..c853368 100644 --- a/vscode/rootfs/etc/cont-init.d/mosquitto.sh +++ b/vscode/rootfs/etc/cont-init.d/mosquitto.sh @@ -8,8 +8,8 @@ declare password declare port declare username -host=$(bashio::services "mqtt" "host") -if bashio::var.has_value "${host}"; then +if bashio::services.available "mqtt"; then + host=$(bashio::services "mqtt" "host") password=$(bashio::services "mqtt" "password") port=$(bashio::services "mqtt" "port") username=$(bashio::services "mqtt" "username") @@ -24,6 +24,4 @@ if bashio::var.has_value "${host}"; then ln -s /root/.config/mosquitto_sub /root/.config/mosquitto_pub ln -s /root/.config/mosquitto_sub /root/.config/mosquitto_rr -else - bashio::log.info "The above error can be ignored if you don't have Mosquitto installed" fi diff --git a/vscode/rootfs/etc/cont-init.d/mysql.sh b/vscode/rootfs/etc/cont-init.d/mysql.sh index e91f107..f70ba0b 100644 --- a/vscode/rootfs/etc/cont-init.d/mysql.sh +++ b/vscode/rootfs/etc/cont-init.d/mysql.sh @@ -8,8 +8,8 @@ declare password declare port declare username -host=$(bashio::services "mysql" "host") -if bashio::var.has_value "${host}"; then +if bashio::services.available "mysql"; then + host=$(bashio::services "mysql" "host") password=$(bashio::services "mysql" "password") port=$(bashio::services "mysql" "port") username=$(bashio::services "mysql" "username") @@ -22,6 +22,4 @@ if bashio::var.has_value "${host}"; then echo "port=${port}" echo "user=\"${username}\"" } > /etc/mysql/conf.d/service.cnf -else - bashio::log.info "The above error can be ignored if you don't have MariaDB installed" fi From 51b27c49ed49743608366d9219824f20ccd3568e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 9 Mar 2020 15:45:14 +0100 Subject: [PATCH 151/778] :arrow_up: Upgrades bsdtar to 3.2.2-3.1ubuntu0.6 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 8fcdca6..95729ec 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -23,7 +23,7 @@ RUN \ \ && apt-get install -y --no-install-recommends \ ack=2.22-1 \ - bsdtar=3.2.2-3.1ubuntu0.5 \ + bsdtar=3.2.2-3.1ubuntu0.6 \ build-essential=12.4ubuntu1 \ colordiff=1.0.18-1 \ git=1:2.17.1-1ubuntu0.5 \ From ffbd9bd59ca11e819e925c450bb4380d18fd7dad Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 9 Mar 2020 15:45:34 +0100 Subject: [PATCH 152/778] :arrow_up: Upgrades Home Assistant CLI to 4.1.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 95729ec..71ddf34 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -56,7 +56,7 @@ RUN \ && chmod a+x /usr/local/bin/code-server \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.0.1/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.1.0/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From d8ce7213fe5dea6848a07485b3508d7079dedbc9 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 9 Mar 2020 15:45:58 +0100 Subject: [PATCH 153/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.6.1 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 0fa1da0..7ff00dd 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.7.1 ESPHome.esphome-vscode#0.2.0 -keesschollaart.vscode-home-assistant#1.5.0 +keesschollaart.vscode-home-assistant#1.6.1 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.6.1 From 4831b977e816db697dfe918eee1e050901e45ee9 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 9 Mar 2020 15:46:20 +0100 Subject: [PATCH 154/778] :arrow_up: Upgrades redhat.vscode-yaml to 0.7.2 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 7ff00dd..118f7ba 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -3,5 +3,5 @@ ESPHome.esphome-vscode#0.2.0 keesschollaart.vscode-home-assistant#1.6.1 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 -redhat.vscode-yaml#0.6.1 +redhat.vscode-yaml#0.7.2 usernamehw.errorlens#2.9.0 From 4efefcb80abfe86d070fdd428527b11a81e55b41 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 9 Mar 2020 15:46:37 +0100 Subject: [PATCH 155/778] :arrow_up: Upgrades usernamehw.errorlens to 3.0.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 118f7ba..8a3d7d0 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -4,4 +4,4 @@ keesschollaart.vscode-home-assistant#1.6.1 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.7.2 -usernamehw.errorlens#2.9.0 +usernamehw.errorlens#3.0.0 From a6b569e2e49682547d3f175c7f8287359ac1ce78 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2020 11:48:47 +0100 Subject: [PATCH 156/778] :arrow_up: Updates yamllint to v1.21.0 (#84) Co-authored-by: Renovate Bot --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 833b1fe..f05a9c6 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ homeassistant_cli==0.8.0 -yamllint==1.20.0 +yamllint==1.21.0 From 537095ad0f9abf42f54fd43c54c50df84d309a2a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Apr 2020 16:23:34 +0200 Subject: [PATCH 157/778] :arrow_up: Updates yamllint to v1.22.0 (#92) Co-authored-by: Renovate Bot --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index f05a9c6..9656e58 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ homeassistant_cli==0.8.0 -yamllint==1.21.0 +yamllint==1.22.0 From 3f624861046cc2667c4ca1c415deb89d3178116e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Apr 2020 09:03:24 +0200 Subject: [PATCH 158/778] :arrow_up: Updates homeassistant_cli to v0.9.0 (#93) Co-authored-by: Renovate Bot --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 9656e58..e37e329 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -homeassistant_cli==0.8.0 +homeassistant_cli==0.9.0 yamllint==1.22.0 From 31bac23a39696198f2419b6ed04064a34b17e788 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 14 Apr 2020 15:21:50 +0200 Subject: [PATCH 159/778] :arrow_up: Upgrades base image to v5.1.0 --- .gitlab-ci.yml | 6 ++---- vscode/Dockerfile | 2 +- vscode/build.json | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7eaca80..bdbec74 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,11 +6,9 @@ variables: ADDON_SLUG: "vscode" ADDON_TARGET: "vscode" - ADDON_LEGACY_TAGS: "true" - ADDON_ARMHF: "false" ADDON_ARMV7: "false" ADDON_I386: "false" - ADDON_AARCH64_BASE: "hassioaddons/ubuntu-base-aarch64:5.0.1" - ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:5.0.1" + ADDON_AARCH64_BASE: "hassioaddons/ubuntu-base-aarch64:5.1.0" + ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:5.1.0" diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 71ddf34..cd5677d 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/ubuntu-base:5.0.1 +ARG BUILD_FROM=hassioaddons/ubuntu-base:5.1.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.json b/vscode/build.json index 6b948e3..72629b3 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,7 +1,7 @@ { "build_from": { - "aarch64": "hassioaddons/ubuntu-base-aarch64:5.0.1", - "amd64": "hassioaddons/ubuntu-base-amd64:5.0.1" + "aarch64": "hassioaddons/ubuntu-base-aarch64:5.1.0", + "amd64": "hassioaddons/ubuntu-base-amd64:5.1.0" }, "args": {} } From 360401890203330f892e38d0a73ee91b04478b67 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 14 Apr 2020 15:22:20 +0200 Subject: [PATCH 160/778] :hammer: Disable Docker init --- vscode/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/config.json b/vscode/config.json index 3cbf7a4..fed774b 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -8,6 +8,7 @@ "ingress_port": 1337, "panel_icon": "mdi:visual-studio-code", "startup": "services", + "init": false, "arch": ["aarch64", "amd64"], "boot": "auto", "auto_uart": true, From 094c32995f449a467e1cfc3c873b02a18525e872 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 14 Apr 2020 17:40:05 +0200 Subject: [PATCH 161/778] :ambulance: Make build fail when extensions fail --- vscode/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index cd5677d..4a5a592 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -92,7 +92,8 @@ RUN \ mkdir -p "/root/.code-server/extensions/${extention}-${version}"; \ bsdtar --strip-components=1 -xf "/tmp/${extention}-${version}.vsix" \ -C "/root/.code-server/extensions/${extention}-${version}" extension; \ - sleep 5; \ + [ $? -ne 0 ] && exit 1; \ + sleep 60; \ done < /root/vscode.extensions \ && ls -la /root/.code-server/extensions/ \ \ From b9b018f36fb800bceac9b69788e4afa9f4608cfd Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 14 Apr 2020 18:22:41 +0200 Subject: [PATCH 162/778] :shirt: Fix/disable lint warning --- vscode/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 4a5a592..5cbc1a7 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -17,6 +17,7 @@ COPY requirements.txt /tmp/requirements.txt COPY vscode.extensions /root/vscode.extensions # Setup base system +# hadolint ignore=SC2181 ARG BUILD_ARCH=amd64 RUN \ apt-get update \ From 6955f7916bbc991cc0916f4ba270b762eb300ff9 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 14 Apr 2020 18:22:58 +0200 Subject: [PATCH 163/778] :shirt: Fix/disable lint warning --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 5cbc1a7..2f258fc 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -17,8 +17,8 @@ COPY requirements.txt /tmp/requirements.txt COPY vscode.extensions /root/vscode.extensions # Setup base system -# hadolint ignore=SC2181 ARG BUILD_ARCH=amd64 +# hadolint ignore=SC2181 RUN \ apt-get update \ \ From da49410529eeaaa5c09953e3c77d7a7857852a36 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 14 Apr 2020 19:17:00 +0200 Subject: [PATCH 164/778] :hammer: Download extensions sooner, fail fast --- vscode/Dockerfile | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 2f258fc..98d8d8e 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -56,27 +56,6 @@ RUN \ && mv /tmp/code-server /usr/local/bin/code-server \ && chmod a+x /usr/local/bin/code-server \ \ - && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.1.0/ha_${BUILD_ARCH}" \ - && chmod a+x /usr/bin/ha \ - \ - && git clone --branch master --single-branch --depth 1 \ - "git://github.com/robbyrussell/oh-my-zsh.git" ~/.oh-my-zsh \ - \ - && git clone --branch master --single-branch --depth 1 \ - "git://github.com/zsh-users/zsh-autosuggestions" \ - ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions \ - && git clone --branch master --single-branch --depth 1 \ - "git://github.com/zsh-users/zsh-syntax-highlighting.git" \ - ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting \ - \ - && sed -i -e "s#bin/bash#bin/zsh#" /etc/passwd \ - \ - && update-alternatives \ - --install /usr/bin/python python /usr/bin/python3 10 \ - \ - && pip3 install --no-cache-dir -r /tmp/requirements.txt \ - \ && mkdir -p /root/.code-server/extensions \ && while read -r ext; do \ extention="${ext%%#*}" \ @@ -98,6 +77,27 @@ RUN \ done < /root/vscode.extensions \ && ls -la /root/.code-server/extensions/ \ \ + && curl -L -s -o /usr/bin/ha \ + "https://github.com/home-assistant/cli/releases/download/4.1.0/ha_${BUILD_ARCH}" \ + && chmod a+x /usr/bin/ha \ + \ + && git clone --branch master --single-branch --depth 1 \ + "git://github.com/robbyrussell/oh-my-zsh.git" ~/.oh-my-zsh \ + \ + && git clone --branch master --single-branch --depth 1 \ + "git://github.com/zsh-users/zsh-autosuggestions" \ + ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions \ + && git clone --branch master --single-branch --depth 1 \ + "git://github.com/zsh-users/zsh-syntax-highlighting.git" \ + ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting \ + \ + && sed -i -e "s#bin/bash#bin/zsh#" /etc/passwd \ + \ + && update-alternatives \ + --install /usr/bin/python python /usr/bin/python3 10 \ + \ + && pip3 install --no-cache-dir -r /tmp/requirements.txt \ + \ && apt-get purge -y --auto-remove \ bsdtar \ build-essential \ From 1f5fa21c96b39d5c19daecee81f8cf12cb0d6817 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 14 Apr 2020 19:22:55 +0200 Subject: [PATCH 165/778] :arrow_up: Upgrades code-server to 3.1.0 --- vscode/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 98d8d8e..89ff552 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -48,13 +48,13 @@ RUN \ && if [[ "${BUILD_ARCH}" = "aarch64" ]]; then ARCH="arm64"; fi \ && if [[ "${BUILD_ARCH}" = "amd64" ]]; then ARCH="x86_64"; fi \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/cdr/code-server/releases/download/2.1698/code-server2.1698-vsc1.41.1-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/3.1.0/code-server-3.1.0-linux-${ARCH}.tar.gz" \ + && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ - --strip 1 -C /tmp \ + --strip 1 -C /usr/local/lib/code-server \ \ - && mv /tmp/code-server /usr/local/bin/code-server \ - && chmod a+x /usr/local/bin/code-server \ + && ln -s /usr/local/lib/code-server/code-server /usr/local/bin/code-server \ \ && mkdir -p /root/.code-server/extensions \ && while read -r ext; do \ From e631b757fee53bb5d29da7eb2f419968137d0f32 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Apr 2020 12:21:20 +0200 Subject: [PATCH 166/778] :arrow_up: Updates yamllint to v1.22.1 (#94) Co-authored-by: Renovate Bot --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index e37e329..8cfa7ca 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ homeassistant_cli==0.9.0 -yamllint==1.22.0 +yamllint==1.22.1 From 8db28ba79b484491bfbdebac49cb88dbb0825e26 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 15 Apr 2020 15:09:38 +0200 Subject: [PATCH 167/778] :arrow_up: Upgrades Home Assistant CLI to 4.3.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 89ff552..f2dffc3 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -78,7 +78,7 @@ RUN \ && ls -la /root/.code-server/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.1.0/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.3.0/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From c007f10d4249582bbc56cb6e649e6301108d04e6 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 15 Apr 2020 15:11:03 +0200 Subject: [PATCH 168/778] :arrow_up: Upgrades emilast.LogFileHighlighter to 2.8.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 8a3d7d0..58afd4f 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#2.7.1 +emilast.LogFileHighlighter#2.8.0 ESPHome.esphome-vscode#0.2.0 keesschollaart.vscode-home-assistant#1.6.1 lukas-tr.materialdesignicons-intellisense#1.5.6 From f6db2bcd99798e25de43ca752b25cecca5f2ac84 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 15 Apr 2020 15:11:24 +0200 Subject: [PATCH 169/778] :arrow_up: Upgrades usernamehw.errorlens to 3.1.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 58afd4f..1c93bd3 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -4,4 +4,4 @@ keesschollaart.vscode-home-assistant#1.6.1 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.7.2 -usernamehw.errorlens#3.0.0 +usernamehw.errorlens#3.1.0 From f895f14f580f00eb05fe88c449a9f0c954e0e03c Mon Sep 17 00:00:00 2001 From: Jorim Tielemans Date: Wed, 15 Apr 2020 16:02:47 +0200 Subject: [PATCH 170/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20git=20t?= =?UTF-8?q?o=201:2.17.1-1ubuntu0.6=20(#95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index f2dffc3..f9a7da6 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -27,7 +27,7 @@ RUN \ bsdtar=3.2.2-3.1ubuntu0.6 \ build-essential=12.4ubuntu1 \ colordiff=1.0.18-1 \ - git=1:2.17.1-1ubuntu0.5 \ + git=1:2.17.1-1ubuntu0.6 \ iputils-ping=3:20161105-1ubuntu3 \ locales=2.27-3ubuntu1 \ mariadb-client=1:10.1.44-0ubuntu0.18.04.1 \ From 8f96ed6f4454fe365863bd8a236b88fabbe214a3 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 15 Apr 2020 17:30:42 +0200 Subject: [PATCH 171/778] :arrow_up: Upgrades code-server to 3.1.1 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index f9a7da6..a0047e7 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -48,7 +48,7 @@ RUN \ && if [[ "${BUILD_ARCH}" = "aarch64" ]]; then ARCH="arm64"; fi \ && if [[ "${BUILD_ARCH}" = "amd64" ]]; then ARCH="x86_64"; fi \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/cdr/code-server/releases/download/3.1.0/code-server-3.1.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/3.1.1/code-server-3.1.1-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 03963ff63e931e1a58857dfea2a30ec9345cbf41 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 15 Apr 2020 22:07:43 +0200 Subject: [PATCH 172/778] :hammer: Disable build in SSH --- vscode/rootfs/etc/services.d/code/run | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index fe17707..5bd54fa 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -12,6 +12,7 @@ options+=(--user-data-dir "/data/vscode") options+=(--extra-builtin-extensions-dir "/root/.code-server/extensions/") options+=(--extensions-dir "/data/vscode/extensions") options+=(--host 0.0.0.0) +options+=(--disable-ssh) # Disable code authentication, we use HA authentication options+=(--auth none) From 639ebeb87cb91ca1e74f7062f401559214e14716 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 15 Apr 2020 22:08:09 +0200 Subject: [PATCH 173/778] :hammer: Disable updates --- vscode/rootfs/etc/services.d/code/run | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index 5bd54fa..9cbc9ed 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -13,6 +13,7 @@ options+=(--extra-builtin-extensions-dir "/root/.code-server/extensions/") options+=(--extensions-dir "/data/vscode/extensions") options+=(--host 0.0.0.0) options+=(--disable-ssh) +options+=(--disable-updates) # Disable code authentication, we use HA authentication options+=(--auth none) From 3bfbc45ddeb4f2473330f5585b66020d7b4fa91b Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 15 Apr 2020 22:08:34 +0200 Subject: [PATCH 174/778] :hammer: Disable telemetry --- vscode/rootfs/etc/services.d/code/run | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index 9cbc9ed..c8fa3ae 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -14,6 +14,7 @@ options+=(--extensions-dir "/data/vscode/extensions") options+=(--host 0.0.0.0) options+=(--disable-ssh) options+=(--disable-updates) +options+=(--disable-telemetry) # Disable code authentication, we use HA authentication options+=(--auth none) From 2a3e37ee83f13a7788fca54ec401f60a33744540 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 Apr 2020 13:40:00 +0200 Subject: [PATCH 175/778] :arrow_up: Updates yamllint to v1.23.0 (#97) Co-authored-by: Renovate Bot --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 8cfa7ca..3d10e67 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ homeassistant_cli==0.9.0 -yamllint==1.22.1 +yamllint==1.23.0 From 84826abecc3a4834933c16c3f1f31151ee571f28 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 Apr 2020 23:34:21 +0200 Subject: [PATCH 176/778] :arrow_up: Updates homeassistant_cli to v0.9.1 (#99) --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 3d10e67..38b85cf 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -homeassistant_cli==0.9.0 +homeassistant_cli==0.9.1 yamllint==1.23.0 From 30d9eabf466fdb13f2d00a052035d2bdba8d12a1 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 3 May 2020 21:05:53 +0200 Subject: [PATCH 177/778] :arrow_up: Upgrades git to 1:2.17.1-1ubuntu0.7 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index a0047e7..cd836a6 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -27,7 +27,7 @@ RUN \ bsdtar=3.2.2-3.1ubuntu0.6 \ build-essential=12.4ubuntu1 \ colordiff=1.0.18-1 \ - git=1:2.17.1-1ubuntu0.6 \ + git=1:2.17.1-1ubuntu0.7 \ iputils-ping=3:20161105-1ubuntu3 \ locales=2.27-3ubuntu1 \ mariadb-client=1:10.1.44-0ubuntu0.18.04.1 \ From 38766d9bd0d657a89dbbf5c45c0f78e6b52c2edc Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 3 May 2020 21:08:12 +0200 Subject: [PATCH 178/778] :arrow_up: Upgrades code-server to 3.2.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index cd836a6..54f0386 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -48,7 +48,7 @@ RUN \ && if [[ "${BUILD_ARCH}" = "aarch64" ]]; then ARCH="arm64"; fi \ && if [[ "${BUILD_ARCH}" = "amd64" ]]; then ARCH="x86_64"; fi \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/cdr/code-server/releases/download/3.1.1/code-server-3.1.1-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/3.2.0/code-server-3.2.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 2c869f90ea1218e47a4cd6cd44d5c0c11daaa0fa Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 16 May 2020 19:16:29 +0200 Subject: [PATCH 179/778] :hammer: Switch add-on from Ubuntu to Debian --- .gitlab-ci.yml | 4 ++-- vscode/Dockerfile | 42 +++++++++++++++++++++--------------------- vscode/build.json | 4 ++-- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bdbec74..48a9f6b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,5 +10,5 @@ variables: ADDON_ARMV7: "false" ADDON_I386: "false" - ADDON_AARCH64_BASE: "hassioaddons/ubuntu-base-aarch64:5.1.0" - ADDON_AMD64_BASE: "hassioaddons/ubuntu-base-amd64:5.1.0" + ADDON_AARCH64_BASE: "hassioaddons/debian-base-aarch64:3.2.0" + ADDON_AMD64_BASE: "hassioaddons/debian-base-amd64:3.2.0" diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 54f0386..bb7dd4e 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/ubuntu-base:5.1.0 +ARG BUILD_FROM=hassioaddons/debian-base:3.2.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -23,23 +23,23 @@ RUN \ apt-get update \ \ && apt-get install -y --no-install-recommends \ - ack=2.22-1 \ - bsdtar=3.2.2-3.1ubuntu0.6 \ - build-essential=12.4ubuntu1 \ + ack=2.24-1 \ + bsdtar=3.3.3-4+deb10u1 \ + build-essential=12.6 \ colordiff=1.0.18-1 \ - git=1:2.17.1-1ubuntu0.7 \ - iputils-ping=3:20161105-1ubuntu3 \ - locales=2.27-3ubuntu1 \ - mariadb-client=1:10.1.44-0ubuntu0.18.04.1 \ - mosquitto-clients=1.4.15-2ubuntu0.18.04.3 \ - net-tools=1.60+git20161116.90da8a0-1ubuntu1 \ - nmap=7.60-1ubuntu5 \ - openssh-client=1:7.6p1-4ubuntu0.3 \ - openssl=1.1.1-1ubuntu2.1~18.04.5 \ - python3-dev=3.6.7-1~18.04 \ - python3=3.6.7-1~18.04 \ - wget=1.19.4-1ubuntu2.2 \ - zsh=5.4.2-3ubuntu3.1 \ + git=1:2.20.1-2+deb10u3 \ + iputils-ping=3:20180629-2+deb10u1 \ + locales=2.28-10 \ + mariadb-client=1:10.3.22-0+deb10u1 \ + mosquitto-clients=1.5.7-1+deb10u1 \ + net-tools=1.60+git20180626.aebd88e-1 \ + nmap=7.70+dfsg1-6 \ + openssh-client=1:7.9p1-10+deb10u2 \ + openssl=1.1.1d-0+deb10u3 \ + python3-dev=3.7.3-1 \ + python3=3.7.3-1 \ + wget=1.20.1-1.1 \ + zsh=5.7.1-1 \ \ && curl https://bootstrap.pypa.io/get-pip.py | python3 \ \ @@ -103,10 +103,10 @@ RUN \ build-essential \ python3-dev \ \ - && find /usr/local/lib/python3.6/ -type d -name tests -depth -exec rm -rf {} \; \ - && find /usr/local/lib/python3.6/ -type d -name test -depth -exec rm -rf {} \; \ - && find /usr/local/lib/python3.6/ -name __pycache__ -depth -exec rm -rf {} \; \ - && find /usr/local/lib/python3.6/ -name "*.pyc" -depth -exec rm -f {} \; \ + && find /usr/local/lib/python3.7/ -type d -name tests -depth -exec rm -rf {} \; \ + && find /usr/local/lib/python3.7/ -type d -name test -depth -exec rm -rf {} \; \ + && find /usr/local/lib/python3.7/ -name __pycache__ -depth -exec rm -rf {} \; \ + && find /usr/local/lib/python3.7/ -name "*.pyc" -depth -exec rm -f {} \; \ \ && rm -fr \ /tmp/* \ diff --git a/vscode/build.json b/vscode/build.json index 72629b3..256ea5b 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,7 +1,7 @@ { "build_from": { - "aarch64": "hassioaddons/ubuntu-base-aarch64:5.1.0", - "amd64": "hassioaddons/ubuntu-base-amd64:5.1.0" + "aarch64": "hassioaddons/debian-base-aarch64:3.2.0", + "amd64": "hassioaddons/debian-base-amd64:3.2.0" }, "args": {} } From 529b5327682dc056f94746eaae6416d9c32fdeec Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 16 May 2020 19:16:43 +0200 Subject: [PATCH 180/778] :hammer: Implement OCI image specification on labels --- vscode/Dockerfile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index bb7dd4e..fa84b36 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -124,17 +124,19 @@ ARG BUILD_VERSION # Labels LABEL \ io.hass.name="Visual Studio Code" \ - io.hass.description="Visual Studio Code, accessible through the browser." \ + io.hass.description="Visual Studio Code, accessible through the browser" \ io.hass.arch="${BUILD_ARCH}" \ io.hass.type="addon" \ io.hass.version=${BUILD_VERSION} \ maintainer="Franck Nijhof " \ - org.label-schema.description="Visual Studio Code, accessible through the browser." \ - org.label-schema.build-date=${BUILD_DATE} \ - org.label-schema.name="Visual Studio Code" \ - org.label-schema.schema-version="1.0" \ - org.label-schema.url="https://community.home-assistant.io/t/home-assistant-community-add-on-visual-studio-code/107863?u=frenck" \ - org.label-schema.usage="https://github.com/hassio-addons/addon-vscode/tree/master/README.md" \ - org.label-schema.vcs-ref=${BUILD_REF} \ - org.label-schema.vcs-url="https://github.com/hassio-addons/addon-vscode" \ - org.label-schema.vendor="Home Assistant Community Add-ons" + org.opencontainers.image.title="Visual Studio Code" \ + org.opencontainers.image.description="Visual Studio Code, accessible through the browser" \ + org.opencontainers.image.vendor="Home Assistant Community Add-ons" \ + org.opencontainers.image.authors="Franck Nijhof " \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.url="https://addons.community" \ + org.opencontainers.image.source="https://github.com/hassio-addons/addon-vscode" \ + org.opencontainers.image.documentation="https://github.com/hassio-addons/addon-vscode/blob/master/README.md" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REF} \ + org.opencontainers.image.version=${BUILD_VERSION} From 8792e1588dea4f9fd69dfe39f51387f4287101c6 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 16 May 2020 19:17:07 +0200 Subject: [PATCH 181/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.6.5 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 1c93bd3..728c1e2 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.8.0 ESPHome.esphome-vscode#0.2.0 -keesschollaart.vscode-home-assistant#1.6.1 +keesschollaart.vscode-home-assistant#1.6.5 lukas-tr.materialdesignicons-intellisense#1.5.6 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.7.2 From 12315fa8bef04b486c2d4dbc2c913925f7fa23b5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 16 May 2020 19:18:16 +0200 Subject: [PATCH 182/778] :arrow_up: Upgrades lukas-tr.materialdesignicons-intellisense to 2.0.2 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 728c1e2..4a1ebda 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.8.0 ESPHome.esphome-vscode#0.2.0 keesschollaart.vscode-home-assistant#1.6.5 -lukas-tr.materialdesignicons-intellisense#1.5.6 +lukas-tr.materialdesignicons-intellisense#2.0.2 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.7.2 usernamehw.errorlens#3.1.0 From caa7329d2fdf654c3583d32947f1b76489abe59c Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 16 May 2020 19:18:38 +0200 Subject: [PATCH 183/778] :arrow_up: Upgrades redhat.vscode-yaml to 0.8.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 4a1ebda..69a0fc4 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -3,5 +3,5 @@ ESPHome.esphome-vscode#0.2.0 keesschollaart.vscode-home-assistant#1.6.5 lukas-tr.materialdesignicons-intellisense#2.0.2 oderwat.indent-rainbow#7.4.0 -redhat.vscode-yaml#0.7.2 +redhat.vscode-yaml#0.8.0 usernamehw.errorlens#3.1.0 From d30cf3763142632aadc6a14967a57e68fa5745ca Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 16 May 2020 19:18:56 +0200 Subject: [PATCH 184/778] :arrow_up: Upgrades usernamehw.errorlens to 3.1.1 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 69a0fc4..6d8d1a4 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -4,4 +4,4 @@ keesschollaart.vscode-home-assistant#1.6.5 lukas-tr.materialdesignicons-intellisense#2.0.2 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.8.0 -usernamehw.errorlens#3.1.0 +usernamehw.errorlens#3.1.1 From e712eed35e037da44b61be409f6d679229dacf8c Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 18 May 2020 11:52:15 +0200 Subject: [PATCH 185/778] :ambulance: Ensure locales are generated --- vscode/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index fa84b36..21f6cf0 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -41,6 +41,8 @@ RUN \ wget=1.20.1-1.1 \ zsh=5.7.1-1 \ \ + && locale-gen en_US.UTF-8 \ + \ && curl https://bootstrap.pypa.io/get-pip.py | python3 \ \ && locale-gen en_US.UTF-8 \ From e126fea8a4fe76d79bdfef9f6f66dc09bdb6ea72 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 18 May 2020 11:52:48 +0200 Subject: [PATCH 186/778] :ambulance: Remove disable-ssh flag from code-server run --- vscode/rootfs/etc/services.d/code/run | 1 - 1 file changed, 1 deletion(-) diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index c8fa3ae..28d21f3 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -12,7 +12,6 @@ options+=(--user-data-dir "/data/vscode") options+=(--extra-builtin-extensions-dir "/root/.code-server/extensions/") options+=(--extensions-dir "/data/vscode/extensions") options+=(--host 0.0.0.0) -options+=(--disable-ssh) options+=(--disable-updates) options+=(--disable-telemetry) From a0e3f0dcd23cbd4ecaf00c39483ab1753b9a6d6c Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 18 May 2020 11:53:04 +0200 Subject: [PATCH 187/778] :arrow_up: Upgrades code-server to 3.3.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 21f6cf0..9e73438 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -50,7 +50,7 @@ RUN \ && if [[ "${BUILD_ARCH}" = "aarch64" ]]; then ARCH="arm64"; fi \ && if [[ "${BUILD_ARCH}" = "amd64" ]]; then ARCH="x86_64"; fi \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/cdr/code-server/releases/download/3.2.0/code-server-3.2.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/3.3.0/code-server-3.3.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 3aebda36b4d879c082110a9b541cfd22261e8898 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 18 May 2020 12:05:57 +0200 Subject: [PATCH 188/778] :ambulance: Fix download location of code-server --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 9e73438..6bb4c0f 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -50,7 +50,7 @@ RUN \ && if [[ "${BUILD_ARCH}" = "aarch64" ]]; then ARCH="arm64"; fi \ && if [[ "${BUILD_ARCH}" = "amd64" ]]; then ARCH="x86_64"; fi \ && curl -J -L -o /tmp/code.tar.gz \ - "https://github.com/cdr/code-server/releases/download/3.3.0/code-server-3.3.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.3.0/code-server-3.3.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 22be2959a03b87e329ff5f298dbe7b0684573269 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 18 May 2020 12:06:21 +0200 Subject: [PATCH 189/778] :ambulance: Fix code-server executable path, changed in v3.3.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 6bb4c0f..bbf8abb 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -56,7 +56,7 @@ RUN \ /tmp/code.tar.gz \ --strip 1 -C /usr/local/lib/code-server \ \ - && ln -s /usr/local/lib/code-server/code-server /usr/local/bin/code-server \ + && ln -s /usr/local/lib/code-server/bin/code-server /usr/local/bin/code-server \ \ && mkdir -p /root/.code-server/extensions \ && while read -r ext; do \ From 243a327d369f836f6e055b2659d5c8b7a4201be9 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 18 May 2020 12:06:47 +0200 Subject: [PATCH 190/778] :ambulance: Remove disable-updates flag, not longer used in v3.3.0 --- vscode/rootfs/etc/services.d/code/run | 1 - 1 file changed, 1 deletion(-) diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index 28d21f3..1189643 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -12,7 +12,6 @@ options+=(--user-data-dir "/data/vscode") options+=(--extra-builtin-extensions-dir "/root/.code-server/extensions/") options+=(--extensions-dir "/data/vscode/extensions") options+=(--host 0.0.0.0) -options+=(--disable-updates) options+=(--disable-telemetry) # Disable code authentication, we use HA authentication From 753cceaa4db3c6506dbc85241dab44067f7365c2 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 18 May 2020 12:19:36 +0200 Subject: [PATCH 191/778] :ambulance: Update architecture name for amd64, changed in v3.3.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index bbf8abb..d561639 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -48,7 +48,7 @@ RUN \ && locale-gen en_US.UTF-8 \ \ && if [[ "${BUILD_ARCH}" = "aarch64" ]]; then ARCH="arm64"; fi \ - && if [[ "${BUILD_ARCH}" = "amd64" ]]; then ARCH="x86_64"; 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/v3.3.0/code-server-3.3.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ From e9797834d25713b498fd93453b8a2c0b67fdad8c Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 19 May 2020 10:12:16 +0200 Subject: [PATCH 192/778] :arrow_up: Upgrades code-server to 3.3.1 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index d561639..bc8bfa0 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -50,7 +50,7 @@ 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/v3.3.0/code-server-3.3.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.3.1/code-server-3.3.1-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 2332389d702292837fcc220e44fe72f5e6a56134 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 19 May 2020 10:17:15 +0200 Subject: [PATCH 193/778] :ambulance: Fix locales handling --- vscode/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index bc8bfa0..edb716a 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -5,6 +5,7 @@ FROM ${BUILD_FROM} # Confiure locale ENV \ LANG=en_US.UTF-8 \ + LANGUAGE=en_US:en \ LC_ALL=en_US.UTF-8 # Set shell @@ -41,12 +42,11 @@ RUN \ wget=1.20.1-1.1 \ zsh=5.7.1-1 \ \ - && locale-gen en_US.UTF-8 \ + && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \ + && locale-gen \ \ && curl https://bootstrap.pypa.io/get-pip.py | python3 \ \ - && locale-gen en_US.UTF-8 \ - \ && if [[ "${BUILD_ARCH}" = "aarch64" ]]; then ARCH="arm64"; fi \ && if [[ "${BUILD_ARCH}" = "amd64" ]]; then ARCH="amd64"; fi \ && curl -J -L -o /tmp/code.tar.gz \ From f2779267d06bd134b0d03f3aba1153156246bdd9 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 19 May 2020 11:03:06 +0200 Subject: [PATCH 194/778] :shirt: Slow down fetching extensions from Marketplace a bit, to prevent rate limiting --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index edb716a..460bc83 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -75,7 +75,7 @@ RUN \ bsdtar --strip-components=1 -xf "/tmp/${extention}-${version}.vsix" \ -C "/root/.code-server/extensions/${extention}-${version}" extension; \ [ $? -ne 0 ] && exit 1; \ - sleep 60; \ + sleep 90; \ done < /root/vscode.extensions \ && ls -la /root/.code-server/extensions/ \ \ From 6665089bd2ae36fb72c66497514ef86b69292cc4 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 19 May 2020 22:00:34 +0200 Subject: [PATCH 195/778] :ambulance: Fix auto indent for YAML --- vscode/rootfs/etc/cont-init.d/code-server.sh | 1 + vscode/rootfs/root/.code-server/settings.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index 935fe1d..d4b6633 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -13,6 +13,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( 944d9ba57968666353df7e9dc78ec5d94b9b052e1abf863b51bc1f372d9f35cb2d93259f153e9ab3b3dd1b520bfcd7bddb54803bcfd9eb65975ae8fb5553663c 4ef960e3d6e795adda51d5cbeb18d309fee87ba5cd177292a21b5a70a71a4726ae7053c3793cddc6d63d3b4dacc180ad3ea12d005fc8d63a1bc4cb29f9a17f18 c5b8acf06ef6d9a2435e9ddb92cb9fce7cfbfe4a2206b0e0c3c4ed514cc926f8d3c662e694a995d102b5ba939056f93201c220558e06e1cd0872bfb1995ba148 + 08d86c84a0d80720b22712e878963e90cbb34b659330dad8a823f3c5c7f0ae043d197a5e3020dd7ab4fda3625e17f794675ec074984951e7107db2488898a8d0 ) # Ensure persistent data folder exists. diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index d837c98..d0c216f 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -63,7 +63,7 @@ "!secret scalar" ], "[yaml]": { - "editor.autoIndent": true, + "editor.autoIndent": "full", "editor.insertSpaces": true, "editor.tabSize": 2, "editor.quickSuggestions": { From 8b29ecc02810114eec8ad8734aebc2d6c97a872f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 29 May 2020 09:47:40 +0200 Subject: [PATCH 196/778] :arrow_up: Upgrades code-server to 3.4.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 460bc83..111e84e 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -50,7 +50,7 @@ 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/v3.3.1/code-server-3.3.1-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.4.0/code-server-3.4.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From a9119c9bc58da7cf8b8e9965276ceb457301a3ca Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 29 May 2020 09:47:54 +0200 Subject: [PATCH 197/778] :pencil2: Split add-on documentation --- README.md | 153 +-------------------------------- vscode/.README.j2 | 3 - vscode/DOCS.md | 214 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 218 insertions(+), 152 deletions(-) create mode 100644 vscode/DOCS.md diff --git a/README.md b/README.md index cbbe23a..c1e39c5 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,8 @@ Visual Studio Code, accessible through the browser. +![Visual Studio Code in the Home Assistant Frontend](images/screenshot.png) + ## About This add-on runs Visual Studio Code, allowing you to edit your Home Assistant @@ -36,151 +38,7 @@ The add-on has the Home Assistant, MDI icons and YAML extensions pre-installed and pre-configured right out of the box. This means that auto-completion works instantly, without the need for configuring anything. -![Visual Studio Code in the Home Assistant Frontend](images/screenshot.png) - -## Installation - -The installation of this add-on is pretty straightforward and not different in -comparison to installing any other Home Assistant add-on. - -1. Search for the "Visual Studio Code" add-on in the Supervisor add-on store - and install it. -1. Start the "Visual Studio Code" add-on. -1. Check the logs of the "Visual Studio Code" add-on to see if everything went - well. -1. Click the "OPEN WEB UI" button to open Visual Studio Code. - -## Configuration - -**Note**: _Remember to restart the add-on when the configuration is changed._ - -Example add-on configuration: - -```yaml -log_level: info -packages: - - mariadb-client -init_commands: - - ls -la -disable_telemetry: false -``` - -**Note**: _This is just an example, don't copy and paste it! Create your own!_ - -### Option: `log_level` - -The `log_level` option controls the level of log output by the addon and can -be changed to be more or less verbose, which might be useful when you are -dealing with an unknown issue. Possible values are: - -- `trace`: Show every detail, like all called internal functions. -- `debug`: Shows detailed debug information. -- `info`: Normal (usually) interesting events. -- `warning`: Exceptional occurrences that are not errors. -- `error`: Runtime errors that do not require immediate action. -- `fatal`: Something went terribly wrong. Add-on becomes unusable. - -Please note that each level automatically includes log messages from a -more severe level, e.g., `debug` also shows `info` messages. By default, -the `log_level` is set to `info`, which is the recommended setting unless -you are troubleshooting. - -### Option: `packages` - -Allows you to specify additional [Ubuntu packages][ubuntu-packages] to be -installed in your shell environment (e.g., Python, PHP, Go). - -**Note**: _Adding many packages will result in a longer start-up -time for the add-on._ - -### Option: `init_commands` - -Customize your VSCode environment even more with the `init_commands` option. -Add one or more shell commands to the list, and they will be executed every -single time this add-on starts. - -### Option: `disable_telemetry` - -Disables anonymous usage telemetry data from being sent to code-server. - -## Resetting your VSCode settings to the add-on defaults - -The add-on updates your settings to be optimized for use with Home Assistant. -As soon as you change a setting, the add-on will stop doing that since it -might be destructive. However, in case you changed some things, but want to -return to the defaults as delivered by this add-on, do the following: - -1. Open the Visual Studio Code editor. -1. Click on `Terminal` in the top menu bar and clik on `New Terminal`. -1. Execute the following command in the terminal window: `reset-settings`. -1. Done! - -## Using with ESPHome - -The add-on has support for ESPHome (and its vscode extension), built-in! -It has been installed and pre-configured for you, however, it might need -an adjustment to your ESPHome add-on in order to function. - -1. Go to the ESPHome add-on configuration in your Supervisor panel. -1. Add the `leave_front_door_open` option, since the vscode extension of - ESPHome does not support authentication yet. The ESPHome add-on - configuration would look like this: - - ```yaml - leave_front_door_open: true - ``` - -1. Save the add-on configuration. -1. Enable direct access to the ESPHome add-on, by enabling the network port. - This option can be found on the ESPHome add-on settings page, in the - "Network" section. In the "Host" field (that is now showing disabled), - enter `6052` and hit save. -1. Restart the ESPHome add-on. - -And you're set! - -No changes to the vscode add-on are needed, since it has been pre-configured. - -**Please note!** This opens up ESPHome for access within your network -without authentication! Currently, this is how ESPHome advises how to -set up your system, but it surely has security risks. We hope ESPHome -will come up with a better solution for this soon. - -## Known issues and limitations - -- This add-on currently only supports AMD64 and aarch64/ARM64 machines. - Although we support ARM devices, please be aware, that this add-on is quite - heavy to run, and requires quite a bit of RAM. We do not recommended to run - it on devices with less than 4Gb of memory. -- If you get a blank screen (and it worked before), it could be that you changed - your workspace. Reinstalling the add-on will not help since it keeps the data - in your browser. To remove it (in Chrome) open up developer tools (F12), - then go to the application tab and click "clear storage". - Now refresh the page and you're back in action. -- "Visual Studio Code is unable to watch for file changes in this large - workspace" (error ENOSPC) - - This issue is caused by your system not having enough file handles, - which causes VSCode to be unable to watch all your files. For HassOS, - currently the only option is to click on the little cog when the - notification appears and tell it to not show again. In case you have - a generic Linux setup (e.g., Ubuntu), follow this guide by Microsoft: - - - -## Changelog & Releases - -This repository keeps a change log using [GitHub's releases][releases] -functionality. The format of the log is based on -[Keep a Changelog][keepchangelog]. - -Releases are based on [Semantic Versioning][semver], and use the format -of ``MAJOR.MINOR.PATCH``. In a nutshell, the version will be incremented -based on the following: - -- ``MAJOR``: Incompatible or major changes. -- ``MINOR``: Backwards-compatible new features and enhancements. -- ``PATCH``: Backwards-compatible bugfixes and package updates. +[:books: Read the full add-on documentation][docs] ## Support @@ -255,6 +113,7 @@ SOFTWARE. [discord-ha]: https://discord.gg/c5DvZ4e [discord-shield]: https://img.shields.io/discord/478094546522079232.svg [discord]: https://discord.me/hassioaddons +[docs]: https://github.com/hassio-addons/addon-vscode/blob/master/vscode/DOCS.md [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg [forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-visual-studio-code/107863?u=frenck [frenck]: https://github.com/frenck @@ -262,10 +121,8 @@ SOFTWARE. [github-sponsors]: https://github.com/sponsors/frenck [gitlabci-shield]: https://gitlab.com/hassio-addons/addon-vscode/badges/master/pipeline.svg [gitlabci]: https://gitlab.com/hassio-addons/addon-vscode/pipelines -[home-assistant]: https://home-assistant.io [i386-shield]: https://img.shields.io/badge/i386-no-red.svg [issue]: https://github.com/hassio-addons/addon-vscode/issues -[keepchangelog]: http://keepachangelog.com/en/1.0.0/ [license-shield]: https://img.shields.io/github/license/hassio-addons/addon-vscode.svg [maintenance-shield]: https://img.shields.io/maintenance/yes/2020.svg [patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png @@ -275,5 +132,3 @@ SOFTWARE. [releases-shield]: https://img.shields.io/github/release/hassio-addons/addon-vscode.svg [releases]: https://github.com/hassio-addons/addon-vscode/releases [repository]: https://github.com/hassio-addons/repository -[semver]: http://semver.org/spec/v2.0.0 -[ubuntu-packages]: https://packages.ubuntu.com diff --git a/vscode/.README.j2 b/vscode/.README.j2 index 680f101..ca3c034 100644 --- a/vscode/.README.j2 +++ b/vscode/.README.j2 @@ -23,8 +23,6 @@ The add-on has the Home Assistant, MDI icons and YAML extensions pre-installed and pre-configured right out of the box. This means that auto-completion works instantly, without the need for configuring anything. -[Click here for the full documentation][docs] - ![Visual Studio Code in the Home Assistant Frontend][screenshot] {% if channel == "edge" %} @@ -68,7 +66,6 @@ If you are more interested in stable releases of our add-ons: {% endif %} [discord-shield]: https://img.shields.io/discord/478094546522079232.svg [discord]: https://discord.me/hassioaddons -[docs]: {{ repo }}/blob/{{ version }}/README.md [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg [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 diff --git a/vscode/DOCS.md b/vscode/DOCS.md new file mode 100644 index 0000000..36e25a2 --- /dev/null +++ b/vscode/DOCS.md @@ -0,0 +1,214 @@ +# Home Assistant Community Add-on: Visual Studio Code + +This add-on runs Visual Studio Code, allowing you to edit your Home Assistant +configuration directly from your web browser and can be embedded straight +into the Home Assistant frontend UI. + +Visual Studio Code runs as a remote server using `code-server`, and is a +fully fledged VSCode experience. + +The add-on has the Home Assistant, MDI icons and YAML extensions pre-installed +and pre-configured right out of the box. This means that auto-completion works +instantly, without the need for configuring anything. + +## Installation + +The installation of this add-on is pretty straightforward and not different in +comparison to installing any other Home Assistant add-on. + +1. Search for the "Visual Studio Code" add-on in the Supervisor add-on store + and install it. +1. Start the "Visual Studio Code" add-on. +1. Check the logs of the "Visual Studio Code" add-on to see if everything went + well. +1. Click the "OPEN WEB UI" button to open Visual Studio Code. + +## Configuration + +**Note**: _Remember to restart the add-on when the configuration is changed._ + +Example add-on configuration: + +```yaml +log_level: info +packages: + - mariadb-client +init_commands: + - ls -la +disable_telemetry: false +``` + +**Note**: _This is just an example, don't copy and paste it! Create your own!_ + +### Option: `log_level` + +The `log_level` option controls the level of log output by the addon and can +be changed to be more or less verbose, which might be useful when you are +dealing with an unknown issue. Possible values are: + +- `trace`: Show every detail, like all called internal functions. +- `debug`: Shows detailed debug information. +- `info`: Normal (usually) interesting events. +- `warning`: Exceptional occurrences that are not errors. +- `error`: Runtime errors that do not require immediate action. +- `fatal`: Something went terribly wrong. Add-on becomes unusable. + +Please note that each level automatically includes log messages from a +more severe level, e.g., `debug` also shows `info` messages. By default, +the `log_level` is set to `info`, which is the recommended setting unless +you are troubleshooting. + +### Option: `packages` + +Allows you to specify additional [Ubuntu packages][ubuntu-packages] to be +installed in your shell environment (e.g., Python, PHP, Go). + +**Note**: _Adding many packages will result in a longer start-up +time for the add-on._ + +### Option: `init_commands` + +Customize your VSCode environment even more with the `init_commands` option. +Add one or more shell commands to the list, and they will be executed every +single time this add-on starts. + +### Option: `disable_telemetry` + +Disables anonymous usage telemetry data from being sent to code-server. + +## Resetting your VSCode settings to the add-on defaults + +The add-on updates your settings to be optimized for use with Home Assistant. +As soon as you change a setting, the add-on will stop doing that since it +might be destructive. However, in case you changed some things, but want to +return to the defaults as delivered by this add-on, do the following: + +1. Open the Visual Studio Code editor. +1. Click on `Terminal` in the top menu bar and clik on `New Terminal`. +1. Execute the following command in the terminal window: `reset-settings`. +1. Done! + +## Using with ESPHome + +The add-on has support for ESPHome (and its vscode extension), built-in! +It has been installed and pre-configured for you, however, it might need +an adjustment to your ESPHome add-on in order to function. + +1. Go to the ESPHome add-on configuration in your Supervisor panel. +1. Add the `leave_front_door_open` option, since the vscode extension of + ESPHome does not support authentication yet. The ESPHome add-on + configuration would look like this: + + ```yaml + leave_front_door_open: true + ``` + +1. Save the add-on configuration. +1. Enable direct access to the ESPHome add-on, by enabling the network port. + This option can be found on the ESPHome add-on settings page, in the + "Network" section. In the "Host" field (that is now showing disabled), + enter `6052` and hit save. +1. Restart the ESPHome add-on. + +And you're set! + +No changes to the vscode add-on are needed, since it has been pre-configured. + +**Please note!** This opens up ESPHome for access within your network +without authentication! Currently, this is how ESPHome advises how to +set up your system, but it surely has security risks. We hope ESPHome +will come up with a better solution for this soon. + +## Known issues and limitations + +- This add-on currently only supports AMD64 and aarch64/ARM64 machines. + Although we support ARM devices, please be aware, that this add-on is quite + heavy to run, and requires quite a bit of RAM. We do not recommended to run + it on devices with less than 4Gb of memory. +- If you get a blank screen (and it worked before), it could be that you changed + your workspace. Reinstalling the add-on will not help since it keeps the data + in your browser. To remove it (in Chrome) open up developer tools (F12), + then go to the application tab and click "clear storage". + Now refresh the page and you're back in action. +- "Visual Studio Code is unable to watch for file changes in this large + workspace" (error ENOSPC) + + This issue is caused by your system not having enough file handles, + which causes VSCode to be unable to watch all your files. For HassOS, + currently the only option is to click on the little cog when the + notification appears and tell it to not show again. In case you have + a generic Linux setup (e.g., Ubuntu), follow this guide by Microsoft: + + + +## Changelog & Releases + +This repository keeps a change log using [GitHub's releases][releases] +functionality. The format of the log is based on +[Keep a Changelog][keepchangelog]. + +Releases are based on [Semantic Versioning][semver], and use the format +of ``MAJOR.MINOR.PATCH``. In a nutshell, the version will be incremented +based on the following: + +- ``MAJOR``: Incompatible or major changes. +- ``MINOR``: Backwards-compatible new features and enhancements. +- ``PATCH``: Backwards-compatible bugfixes and package updates. + +## Support + +Got questions? + +You have several options to get them answered: + +- The [Home Assistant Community Add-ons Discord chat server][discord] for add-on + support and feature requests. +- The [Home Assistant Discord chat server][discord-ha] for general Home + Assistant discussions and questions. +- The Home Assistant [Community Forum][forum]. +- Join the [Reddit subreddit][reddit] in [/r/homeassistant][reddit] + +You could also [open an issue here][issue] GitHub. + +## Authors & contributors + +The original setup of this repository is by [Franck Nijhof][frenck]. + +For a full list of all authors and contributors, +check [the contributor's page][contributors]. + +## License + +MIT License + +Copyright (c) 2019-2020 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 +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +[contributors]: https://github.com/hassio-addons/addon-vscode/graphs/contributors +[discord-ha]: https://discord.gg/c5DvZ4e +[discord]: https://discord.me/hassioaddons +[forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-visual-studio-code/107863?u=frenck +[frenck]: https://github.com/frenck +[issue]: https://github.com/hassio-addons/addon-vscode/issues +[keepchangelog]: http://keepachangelog.com/en/1.0.0/ +[reddit]: https://reddit.com/r/homeassistant +[releases]: https://github.com/hassio-addons/addon-vscode/releases +[semver]: http://semver.org/spec/v2.0.0 +[ubuntu-packages]: https://packages.ubuntu.com From ec99f1c0b7e9f1e99d4c0c2b584fc235fa0c74ab Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 30 May 2020 17:22:29 +0200 Subject: [PATCH 198/778] :ambulance: Increase sleep between extension downloads --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 111e84e..51474c9 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -75,7 +75,7 @@ RUN \ bsdtar --strip-components=1 -xf "/tmp/${extention}-${version}.vsix" \ -C "/root/.code-server/extensions/${extention}-${version}" extension; \ [ $? -ne 0 ] && exit 1; \ - sleep 90; \ + sleep 180; \ done < /root/vscode.extensions \ && ls -la /root/.code-server/extensions/ \ \ From 8e6e2c9751722317eb4f1c9c3eea852cddfb5f11 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 30 May 2020 22:04:42 +0200 Subject: [PATCH 199/778] :ambulance: Fix auto indent for HA files --- vscode/rootfs/root/.code-server/settings.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index d0c216f..f66ef6b 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -72,6 +72,11 @@ "strings": true } }, + "[home-assistant]": { + "editor.autoIndent": "full", + "editor.insertSpaces": true, + "editor.tabSize": 2 + }, "editor.renderWhitespace": "boundary", "esphome.dashboardUri": "15ef4d2f-esphome.local.hass.io:6052", "esphome.validator": "dashboard", From 0a2fc930493f9a669057a774069b35e63876692f Mon Sep 17 00:00:00 2001 From: Luke Waite Date: Wed, 8 Jul 2020 15:11:12 -0400 Subject: [PATCH 200/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20=20Upgrades=20code?= =?UTF-8?q?-server=20to=203.4.1=20(#112)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #107 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 51474c9..afb6818 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -50,7 +50,7 @@ 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/v3.4.0/code-server-3.4.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.4.1/code-server-3.4.1-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From bb3cab4a6ede3e8e1e3be972abd19c9a5f74e22f Mon Sep 17 00:00:00 2001 From: Adam Feldman Date: Wed, 8 Jul 2020 14:11:43 -0500 Subject: [PATCH 201/778] Update README for removal of disable_telemetry config option (#110) --- vscode/DOCS.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/vscode/DOCS.md b/vscode/DOCS.md index 36e25a2..deea682 100644 --- a/vscode/DOCS.md +++ b/vscode/DOCS.md @@ -35,7 +35,6 @@ packages: - mariadb-client init_commands: - ls -la -disable_telemetry: false ``` **Note**: _This is just an example, don't copy and paste it! Create your own!_ @@ -72,10 +71,6 @@ Customize your VSCode environment even more with the `init_commands` option. Add one or more shell commands to the list, and they will be executed every single time this add-on starts. -### Option: `disable_telemetry` - -Disables anonymous usage telemetry data from being sent to code-server. - ## Resetting your VSCode settings to the add-on defaults The add-on updates your settings to be optimized for use with Home Assistant. From 0397f2b59056b5689d741b25333bbb0323cfc2c5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 8 Jul 2020 21:12:53 +0200 Subject: [PATCH 202/778] :arrow_up: Upgrades base image to v3.2.1 --- .gitlab-ci.yml | 4 ++-- vscode/Dockerfile | 2 +- vscode/build.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 48a9f6b..ade628e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,5 +10,5 @@ variables: ADDON_ARMV7: "false" ADDON_I386: "false" - ADDON_AARCH64_BASE: "hassioaddons/debian-base-aarch64:3.2.0" - ADDON_AMD64_BASE: "hassioaddons/debian-base-amd64:3.2.0" + ADDON_AARCH64_BASE: "hassioaddons/debian-base-aarch64:3.2.1" + ADDON_AMD64_BASE: "hassioaddons/debian-base-amd64:3.2.1" diff --git a/vscode/Dockerfile b/vscode/Dockerfile index afb6818..682b3fe 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/debian-base:3.2.0 +ARG BUILD_FROM=hassioaddons/debian-base:3.2.1 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.json b/vscode/build.json index 256ea5b..6ed4d60 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,7 +1,7 @@ { "build_from": { - "aarch64": "hassioaddons/debian-base-aarch64:3.2.0", - "amd64": "hassioaddons/debian-base-amd64:3.2.0" + "aarch64": "hassioaddons/debian-base-aarch64:3.2.1", + "amd64": "hassioaddons/debian-base-amd64:3.2.1" }, "args": {} } From eca4b2be22d449a5a87a1388847c77c0d8269abf Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 8 Jul 2020 21:32:07 +0200 Subject: [PATCH 203/778] :lock: MDI icons version to 4.5.95 --- vscode/rootfs/etc/cont-init.d/code-server.sh | 1 + vscode/rootfs/root/.code-server/settings.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index d4b6633..e6a5f01 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -14,6 +14,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( 4ef960e3d6e795adda51d5cbeb18d309fee87ba5cd177292a21b5a70a71a4726ae7053c3793cddc6d63d3b4dacc180ad3ea12d005fc8d63a1bc4cb29f9a17f18 c5b8acf06ef6d9a2435e9ddb92cb9fce7cfbfe4a2206b0e0c3c4ed514cc926f8d3c662e694a995d102b5ba939056f93201c220558e06e1cd0872bfb1995ba148 08d86c84a0d80720b22712e878963e90cbb34b659330dad8a823f3c5c7f0ae043d197a5e3020dd7ab4fda3625e17f794675ec074984951e7107db2488898a8d0 + 5243d7664d30b5aa0c45fbe1089cccdf85c5ade17cddd97e21b3a29ccb37b20d20bdfecc141ad6e1a7aa5ea8ee61695a79a43140a2d53f9f91687bc61f7e496c ) # Ensure persistent data folder exists. diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index f66ef6b..3e5acae 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -87,5 +87,6 @@ "vsicons.dontShowNewVersionMessage": true, "vsicons.projectDetection.disableDetect": true, "workbench.iconTheme": "vs-seti", - "yaml.format.enable": true + "yaml.format.enable": true, + "materialdesigniconsIntellisense.mdiVersion": "4.5.95" } From 9b3e8f40830aabb6ca5812a9a07ed4efd31746ac Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 8 Jul 2020 21:32:32 +0200 Subject: [PATCH 204/778] :arrow_up: Upgrades ESPHome.esphome-vscode to 0.3.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 6d8d1a4..c36906d 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.8.0 -ESPHome.esphome-vscode#0.2.0 +ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.6.5 lukas-tr.materialdesignicons-intellisense#2.0.2 oderwat.indent-rainbow#7.4.0 From 18f4bed05c54bca310e217440f8d6eaf4e41ac63 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 8 Jul 2020 21:32:43 +0200 Subject: [PATCH 205/778] :arrow_up: Upgrades lukas-tr.materialdesignicons-intellisense to 3.0.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index c36906d..ca2508e 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.8.0 ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.6.5 -lukas-tr.materialdesignicons-intellisense#2.0.2 +lukas-tr.materialdesignicons-intellisense#3.0.0 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.8.0 usernamehw.errorlens#3.1.1 From 5e5d137399fe33af26ccdd81f9838f769fe668c2 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 9 Jul 2020 02:49:37 +0200 Subject: [PATCH 206/778] :fire: Remove Renovatebot --- renovate.json | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 renovate.json diff --git a/renovate.json b/renovate.json deleted file mode 100644 index 58ca74e..0000000 --- a/renovate.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": [ - "config:base" - ], - "commitMessageAction": "Updates", - "commitMessageTopic": "{{depName}}", - "commitMessagePrefix": ":arrow_up:", - "labels": [ - "Type: Maintenance" - ] -} From ab128e7629106a3fafadd0442d097d13be6cffdf Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 9 Jul 2020 02:53:00 +0200 Subject: [PATCH 207/778] :ambulance: Increase sleep between extension downloads --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 682b3fe..52d34e8 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -75,7 +75,7 @@ RUN \ bsdtar --strip-components=1 -xf "/tmp/${extention}-${version}.vsix" \ -C "/root/.code-server/extensions/${extention}-${version}" extension; \ [ $? -ne 0 ] && exit 1; \ - sleep 180; \ + sleep 300; \ done < /root/vscode.extensions \ && ls -la /root/.code-server/extensions/ \ \ From 7545927362d76c8dcefcb603347526ae52f91dcd Mon Sep 17 00:00:00 2001 From: Paul Sinclair <24625998+sinclairpaul@users.noreply.github.com> Date: Thu, 9 Jul 2020 11:48:14 -0400 Subject: [PATCH 208/778] =?UTF-8?q?=F0=9F=9A=91=20=20Fix=20extension=20dow?= =?UTF-8?q?nloads=20(#120)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 52d34e8..5eaf4c9 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -40,6 +40,7 @@ RUN \ python3-dev=3.7.3-1 \ python3=3.7.3-1 \ wget=1.20.1-1.1 \ + uuid-runtime=2.33.1-0.1 \ zsh=5.7.1-1 \ \ && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \ @@ -59,7 +60,8 @@ RUN \ && ln -s /usr/local/lib/code-server/bin/code-server /usr/local/bin/code-server \ \ && mkdir -p /root/.code-server/extensions \ - && while read -r ext; do \ + && uuid=$(uuidgen) \ + && while read -r ext; do \ extention="${ext%%#*}" \ vendor="${extention%%.*}"; \ slug="${extention#*.}"; \ @@ -70,12 +72,13 @@ RUN \ echo "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${vendor}/vsextensions/${slug}/${version}/vspackage"; \ curl -JL --retry 5 -o "/tmp/${extention}-${version}.vsix" \ -H "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36" \ + -H "x-market-user-id: ${uuid}" \ "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${vendor}/vsextensions/${slug}/${version}/vspackage"; \ mkdir -p "/root/.code-server/extensions/${extention}-${version}"; \ bsdtar --strip-components=1 -xf "/tmp/${extention}-${version}.vsix" \ -C "/root/.code-server/extensions/${extention}-${version}" extension; \ [ $? -ne 0 ] && exit 1; \ - sleep 300; \ + sleep 1; \ done < /root/vscode.extensions \ && ls -la /root/.code-server/extensions/ \ \ @@ -104,6 +107,7 @@ RUN \ bsdtar \ build-essential \ python3-dev \ + uuid-runtime \ \ && find /usr/local/lib/python3.7/ -type d -name tests -depth -exec rm -rf {} \; \ && find /usr/local/lib/python3.7/ -type d -name test -depth -exec rm -rf {} \; \ From b5a8c6f1a98db1352a948e9e05137e44a6af003d Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 12 Jul 2020 21:17:28 +0200 Subject: [PATCH 209/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.7.1 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index ca2508e..60cc846 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.8.0 ESPHome.esphome-vscode#0.3.0 -keesschollaart.vscode-home-assistant#1.6.5 +keesschollaart.vscode-home-assistant#1.7.1 lukas-tr.materialdesignicons-intellisense#3.0.0 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.8.0 From 1778b0df7545e3020155f7b7e4cda598dc1b2185 Mon Sep 17 00:00:00 2001 From: Marc Date: Tue, 28 Jul 2020 13:45:49 +0200 Subject: [PATCH 210/778] =?UTF-8?q?=F0=9F=9A=91=20Fix=20MDI=20icon=20to=20?= =?UTF-8?q?new=20name=20(#121)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Icon mdi:visual-studio-code was renamed to mdi:microsoft-visual-studio-code, please change your config, it will be removed in version 0.115. --- vscode/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/config.json b/vscode/config.json index fed774b..0788d39 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -6,7 +6,7 @@ "url": "https://github.com/hassio-addons/addon-vscode", "ingress": true, "ingress_port": 1337, - "panel_icon": "mdi:visual-studio-code", + "panel_icon": "mdi:microsoft-visual-studio-code", "startup": "services", "init": false, "arch": ["aarch64", "amd64"], From 33461a20a359ea6a8bff7fd8800de8aee2b4cd7f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 28 Jul 2020 15:54:13 +0200 Subject: [PATCH 211/778] Revert ":lock: MDI icons version to 4.5.95" This reverts commit eca4b2be22d449a5a87a1388847c77c0d8269abf. --- vscode/rootfs/etc/cont-init.d/code-server.sh | 1 - vscode/rootfs/root/.code-server/settings.json | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index e6a5f01..d4b6633 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -14,7 +14,6 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( 4ef960e3d6e795adda51d5cbeb18d309fee87ba5cd177292a21b5a70a71a4726ae7053c3793cddc6d63d3b4dacc180ad3ea12d005fc8d63a1bc4cb29f9a17f18 c5b8acf06ef6d9a2435e9ddb92cb9fce7cfbfe4a2206b0e0c3c4ed514cc926f8d3c662e694a995d102b5ba939056f93201c220558e06e1cd0872bfb1995ba148 08d86c84a0d80720b22712e878963e90cbb34b659330dad8a823f3c5c7f0ae043d197a5e3020dd7ab4fda3625e17f794675ec074984951e7107db2488898a8d0 - 5243d7664d30b5aa0c45fbe1089cccdf85c5ade17cddd97e21b3a29ccb37b20d20bdfecc141ad6e1a7aa5ea8ee61695a79a43140a2d53f9f91687bc61f7e496c ) # Ensure persistent data folder exists. diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index 3e5acae..f66ef6b 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -87,6 +87,5 @@ "vsicons.dontShowNewVersionMessage": true, "vsicons.projectDetection.disableDetect": true, "workbench.iconTheme": "vs-seti", - "yaml.format.enable": true, - "materialdesigniconsIntellisense.mdiVersion": "4.5.95" + "yaml.format.enable": true } From 5d27ea0fe45402e31e18e427d933233e3565c3df Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 28 Jul 2020 16:10:26 +0200 Subject: [PATCH 212/778] :arrow_up: Upgrades emilast.LogFileHighlighter to 2.9.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 60cc846..ca72a1b 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#2.8.0 +emilast.LogFileHighlighter#2.9.0 ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.7.1 lukas-tr.materialdesignicons-intellisense#3.0.0 From eff1c8db4f4f3a5a7f598ea15add82529fcd5d94 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 28 Jul 2020 16:10:42 +0200 Subject: [PATCH 213/778] :arrow_up: Upgrades redhat.vscode-yaml to 0.9.1 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index ca72a1b..6ea05fc 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -3,5 +3,5 @@ ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.7.1 lukas-tr.materialdesignicons-intellisense#3.0.0 oderwat.indent-rainbow#7.4.0 -redhat.vscode-yaml#0.8.0 +redhat.vscode-yaml#0.9.1 usernamehw.errorlens#3.1.1 From 94e370105d0c179e896c087520dba2481dc12bc5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 28 Jul 2020 16:17:12 +0200 Subject: [PATCH 214/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.8.1 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 6ea05fc..df7067d 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.9.0 ESPHome.esphome-vscode#0.3.0 -keesschollaart.vscode-home-assistant#1.7.1 +keesschollaart.vscode-home-assistant#1.8.1 lukas-tr.materialdesignicons-intellisense#3.0.0 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.9.1 From 56bdf2e2c38bd0e13746605077b99e28f2b9cada Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 4 Sep 2020 10:58:34 +0200 Subject: [PATCH 215/778] :arrow_up: Upgrades add-on base image to v3.2.2 --- .gitlab-ci.yml | 4 ++-- vscode/Dockerfile | 2 +- vscode/build.json | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ade628e..1ce6b55 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,5 +10,5 @@ variables: ADDON_ARMV7: "false" ADDON_I386: "false" - ADDON_AARCH64_BASE: "hassioaddons/debian-base-aarch64:3.2.1" - ADDON_AMD64_BASE: "hassioaddons/debian-base-amd64:3.2.1" + ADDON_AARCH64_BASE: "hassioaddons/debian-base-aarch64:3.2.2" + ADDON_AMD64_BASE: "hassioaddons/debian-base-amd64:3.2.2" diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 5eaf4c9..e106fca 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/debian-base:3.2.1 +ARG BUILD_FROM=hassioaddons/debian-base:3.2.2 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.json b/vscode/build.json index 6ed4d60..f356346 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,7 +1,7 @@ { "build_from": { - "aarch64": "hassioaddons/debian-base-aarch64:3.2.1", - "amd64": "hassioaddons/debian-base-amd64:3.2.1" + "aarch64": "hassioaddons/debian-base-aarch64:3.2.2", + "amd64": "hassioaddons/debian-base-amd64:3.2.2" }, "args": {} -} +} \ No newline at end of file From 3bbbd4f135402cd378672ee1ff7e6026ca0d3152 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 4 Sep 2020 10:58:55 +0200 Subject: [PATCH 216/778] :arrow_up: Upgrades mariadb-client to 1:10.3.23-0+deb10u1 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index e106fca..83e1169 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -31,7 +31,7 @@ RUN \ git=1:2.20.1-2+deb10u3 \ iputils-ping=3:20180629-2+deb10u1 \ locales=2.28-10 \ - mariadb-client=1:10.3.22-0+deb10u1 \ + mariadb-client=1:10.3.23-0+deb10u1 \ mosquitto-clients=1.5.7-1+deb10u1 \ net-tools=1.60+git20180626.aebd88e-1 \ nmap=7.70+dfsg1-6 \ From 9e4b30e2d4ac06d09dd50f93f68b531910e86c04 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 4 Sep 2020 10:59:06 +0200 Subject: [PATCH 217/778] :arrow_up: Upgrades nmap to 7.70+dfsg1-6+deb10u1 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 83e1169..425684b 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -34,7 +34,7 @@ RUN \ mariadb-client=1:10.3.23-0+deb10u1 \ mosquitto-clients=1.5.7-1+deb10u1 \ net-tools=1.60+git20180626.aebd88e-1 \ - nmap=7.70+dfsg1-6 \ + nmap=7.70+dfsg1-6+deb10u1 \ openssh-client=1:7.9p1-10+deb10u2 \ openssl=1.1.1d-0+deb10u3 \ python3-dev=3.7.3-1 \ From 2d97b75f87b79bea9fdec2c5640cfc3df22f59a7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 4 Sep 2020 10:59:23 +0200 Subject: [PATCH 218/778] :arrow_up: Upgrades Home Assistant CLI to v4.4.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 425684b..7a58b7f 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -83,7 +83,7 @@ RUN \ && ls -la /root/.code-server/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.3.0/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.4.0/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From f4ef70d60f2956d251ef1cb827a1730c80f9a480 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 4 Sep 2020 10:59:38 +0200 Subject: [PATCH 219/778] :arrow_up: Upgrades code-server to 3.5.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 7a58b7f..e2ebb3f 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -51,7 +51,7 @@ 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/v3.4.1/code-server-3.4.1-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.5.0/code-server-3.5.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From f9b623555778df9dc8ab595adc9a1ebcf5c53113 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 4 Sep 2020 11:00:57 +0200 Subject: [PATCH 220/778] :arrow_up: Upgrades redhat.vscode-yaml to 0.10.1 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index df7067d..2762638 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -3,5 +3,5 @@ ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.8.1 lukas-tr.materialdesignicons-intellisense#3.0.0 oderwat.indent-rainbow#7.4.0 -redhat.vscode-yaml#0.9.1 +redhat.vscode-yaml#0.10.1 usernamehw.errorlens#3.1.1 From d659758a94b9fc30917e3efd36d98a6edaf2b26b Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 4 Sep 2020 11:01:11 +0200 Subject: [PATCH 221/778] :arrow_up: Upgrades usernamehw.errorlens to 3.2.1 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 2762638..f8cad76 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -4,4 +4,4 @@ keesschollaart.vscode-home-assistant#1.8.1 lukas-tr.materialdesignicons-intellisense#3.0.0 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.10.1 -usernamehw.errorlens#3.1.1 +usernamehw.errorlens#3.2.1 From efadb2404bfed903f995bdf32bd8d38c94c7857d Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 10 Sep 2020 14:58:01 +0200 Subject: [PATCH 222/778] :arrow_up: Upgrades Home Assistant CLI to v4.4.1 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index e2ebb3f..da40a6c 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -83,7 +83,7 @@ RUN \ && ls -la /root/.code-server/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.4.0/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.4.1/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From ff7adcccd654b56d298a391f915fffd68e22cf02 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 12 Sep 2020 16:38:06 +0200 Subject: [PATCH 223/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.9.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index f8cad76..7ee3630 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.9.0 ESPHome.esphome-vscode#0.3.0 -keesschollaart.vscode-home-assistant#1.8.1 +keesschollaart.vscode-home-assistant#1.9.0 lukas-tr.materialdesignicons-intellisense#3.0.0 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.10.1 From 32d1e2590dd038a92e94ea3faf7cd4a7882e6468 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 12 Sep 2020 16:45:09 +0200 Subject: [PATCH 224/778] :sparkles: Add symlink from code to code-server for natrual use --- vscode/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index da40a6c..96c4a3e 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -58,6 +58,7 @@ RUN \ --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) \ From 97c35599adbdc1d43e2b9b9d779baa1c55ebd982 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 14 Sep 2020 13:25:03 +0200 Subject: [PATCH 225/778] :sparkles: Add support for the new media folder --- vscode/config.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/vscode/config.json b/vscode/config.json index 0788d39..7e67640 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -15,7 +15,14 @@ "hassio_api": true, "hassio_role": "manager", "homeassistant_api": true, - "map": ["config:rw", "ssl:rw", "addons:rw", "share:rw", "backup:rw"], + "map": [ + "config:rw", + "ssl:rw", + "addons:rw", + "media:rw", + "share:rw", + "backup:rw" + ], "services": ["mysql:want", "mqtt:want"], "options": { "packages": [], From 35cad4b5fddd610c42b073159f79f20e900c1624 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 15 Sep 2020 10:19:06 +0200 Subject: [PATCH 226/778] :sparkles: Add support for setting the default configuration path --- vscode/DOCS.md | 31 +++++++++++++------- vscode/config.json | 1 + vscode/rootfs/etc/cont-init.d/code-server.sh | 8 +++++ vscode/rootfs/etc/services.d/code/run | 9 +++++- 4 files changed, 37 insertions(+), 12 deletions(-) diff --git a/vscode/DOCS.md b/vscode/DOCS.md index deea682..658c0b5 100644 --- a/vscode/DOCS.md +++ b/vscode/DOCS.md @@ -31,6 +31,7 @@ Example add-on configuration: ```yaml log_level: info +config_path: /share/my_path packages: - mariadb-client init_commands: @@ -49,7 +50,7 @@ dealing with an unknown issue. Possible values are: - `debug`: Shows detailed debug information. - `info`: Normal (usually) interesting events. - `warning`: Exceptional occurrences that are not errors. -- `error`: Runtime errors that do not require immediate action. +- `error`: Runtime errors that do not require immediate action. - `fatal`: Something went terribly wrong. Add-on becomes unusable. Please note that each level automatically includes log messages from a @@ -57,6 +58,14 @@ more severe level, e.g., `debug` also shows `info` messages. By default, the `log_level` is set to `info`, which is the recommended setting unless you are troubleshooting. +### Option: `config_path` + +This option allows you to override the default path the add-on will open +when accessing the web interface. For example, use a different +configuration directory like `/share/myconfig` instead of `/config`. + +When not configured, the addon will automatically use the default: `/config` + ### Option: `packages` Allows you to specify additional [Ubuntu packages][ubuntu-packages] to be @@ -128,13 +137,13 @@ will come up with a better solution for this soon. - "Visual Studio Code is unable to watch for file changes in this large workspace" (error ENOSPC) - This issue is caused by your system not having enough file handles, - which causes VSCode to be unable to watch all your files. For HassOS, - currently the only option is to click on the little cog when the - notification appears and tell it to not show again. In case you have - a generic Linux setup (e.g., Ubuntu), follow this guide by Microsoft: + This issue is caused by your system not having enough file handles, + which causes VSCode to be unable to watch all your files. For HassOS, + currently the only option is to click on the little cog when the + notification appears and tell it to not show again. In case you have + a generic Linux setup (e.g., Ubuntu), follow this guide by Microsoft: - + ## Changelog & Releases @@ -143,12 +152,12 @@ functionality. The format of the log is based on [Keep a Changelog][keepchangelog]. Releases are based on [Semantic Versioning][semver], and use the format -of ``MAJOR.MINOR.PATCH``. In a nutshell, the version will be incremented +of `MAJOR.MINOR.PATCH`. In a nutshell, the version will be incremented based on the following: -- ``MAJOR``: Incompatible or major changes. -- ``MINOR``: Backwards-compatible new features and enhancements. -- ``PATCH``: Backwards-compatible bugfixes and package updates. +- `MAJOR`: Incompatible or major changes. +- `MINOR`: Backwards-compatible new features and enhancements. +- `PATCH`: Backwards-compatible bugfixes and package updates. ## Support diff --git a/vscode/config.json b/vscode/config.json index 7e67640..bb69d4a 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -30,6 +30,7 @@ }, "schema": { "log_level": "list(trace|debug|info|notice|warning|error|fatal)?", + "config_path": "str?", "packages": ["str"], "init_commands": ["str"] } diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index d4b6633..bd71f5e 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -3,6 +3,7 @@ # Home Assistant Community Add-on: Visual Studio Code # Sets up code-server. # ============================================================================== +declare config_path # List of previous config hashes, to allow upgrade "default" configs. readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( @@ -16,6 +17,13 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( 08d86c84a0d80720b22712e878963e90cbb34b659330dad8a823f3c5c7f0ae043d197a5e3020dd7ab4fda3625e17f794675ec074984951e7107db2488898a8d0 ) +if bashio::config.has_value 'config_path'; then + config_path=$(bashio::config 'config_path') + if ! bashio::fs.directory_exists "${config_path}"; then + bashio::exit.nok "Configured config path does not exists" + fi +fi + # Ensure persistent data folder exists. if ! bashio::fs.directory_exists '/data/vscode'; then mkdir -p /data/vscode/extensions \ diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index 1189643..c8419e0 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -4,9 +4,15 @@ # Runs the code server # ============================================================================== declare -a options +declare config_path bashio::log.info 'Starting the code server...' +config_path="/config" +if bashio::config.has_value 'config_path'; then + config_path=$(bashio::config 'config_path') +fi + options+=(--port 1337) options+=(--user-data-dir "/data/vscode") options+=(--extra-builtin-extensions-dir "/root/.code-server/extensions/") @@ -22,4 +28,5 @@ export HASS_SERVER="http://supervisor/core" export HASS_TOKEN="${SUPERVISOR_TOKEN:-}" # Run the code server -exec code-server "${options[@]}" /config +cd "${config_path}" +exec code-server "${options[@]}" "${config_path}" From d6cf7bef88df8252b2b0fb80d871b1fcfaab4512 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 15 Sep 2020 10:22:53 +0200 Subject: [PATCH 227/778] :shirt: Fix shellcheck linter warning --- vscode/rootfs/etc/services.d/code/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index c8419e0..f4b58d4 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -28,5 +28,5 @@ export HASS_SERVER="http://supervisor/core" export HASS_TOKEN="${SUPERVISOR_TOKEN:-}" # Run the code server -cd "${config_path}" +cd "${config_path}" || bashio::exit.nok "Could not change working directory" exec code-server "${options[@]}" "${config_path}" From 5928f66e4fb1dd2abb84805653736841db9a70d0 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 23 Sep 2020 19:19:31 +0200 Subject: [PATCH 228/778] :arrow_up: Upgrades redhat.vscode-yaml to 0.11.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 7ee3630..f3cb6b9 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -3,5 +3,5 @@ ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.9.0 lukas-tr.materialdesignicons-intellisense#3.0.0 oderwat.indent-rainbow#7.4.0 -redhat.vscode-yaml#0.10.1 +redhat.vscode-yaml#0.11.0 usernamehw.errorlens#3.2.1 From 9ee6721a68a5ac1c87c1b8941626e89d0179d173 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 23 Sep 2020 19:21:32 +0200 Subject: [PATCH 229/778] :arrow_up: Upgrades Home Assistant CLI to v4.5.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 96c4a3e..2e9bbf4 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -84,7 +84,7 @@ RUN \ && ls -la /root/.code-server/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.4.1/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.5.0/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From a0626760b9814c9339c555a3c93e9799744c6cd8 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 23 Sep 2020 19:22:05 +0200 Subject: [PATCH 230/778] :sparkles: Add Prettier support for auto formatting YAML --- vscode/rootfs/etc/cont-init.d/code-server.sh | 1 + vscode/rootfs/root/.code-server/settings.json | 9 +++++++-- vscode/vscode.extensions | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index bd71f5e..3a29339 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -15,6 +15,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( 4ef960e3d6e795adda51d5cbeb18d309fee87ba5cd177292a21b5a70a71a4726ae7053c3793cddc6d63d3b4dacc180ad3ea12d005fc8d63a1bc4cb29f9a17f18 c5b8acf06ef6d9a2435e9ddb92cb9fce7cfbfe4a2206b0e0c3c4ed514cc926f8d3c662e694a995d102b5ba939056f93201c220558e06e1cd0872bfb1995ba148 08d86c84a0d80720b22712e878963e90cbb34b659330dad8a823f3c5c7f0ae043d197a5e3020dd7ab4fda3625e17f794675ec074984951e7107db2488898a8d0 + 5243d7664d30b5aa0c45fbe1089cccdf85c5ade17cddd97e21b3a29ccb37b20d20bdfecc141ad6e1a7aa5ea8ee61695a79a43140a2d53f9f91687bc61f7e496c ) if bashio::config.has_value 'config_path'; then diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index f66ef6b..3611169 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -75,7 +75,10 @@ "[home-assistant]": { "editor.autoIndent": "full", "editor.insertSpaces": true, - "editor.tabSize": 2 + "editor.tabSize": 2, + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": true, + "editor.formatOnPaste": true }, "editor.renderWhitespace": "boundary", "esphome.dashboardUri": "15ef4d2f-esphome.local.hass.io:6052", @@ -87,5 +90,7 @@ "vsicons.dontShowNewVersionMessage": true, "vsicons.projectDetection.disableDetect": true, "workbench.iconTheme": "vs-seti", - "yaml.format.enable": true + "yaml.format.enable": true, + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.rulers": [80, 88, 100, 120] } diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index f3cb6b9..ab650eb 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,5 @@ emilast.LogFileHighlighter#2.9.0 +esbenp.prettier-vscode#5.6.0 ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.9.0 lukas-tr.materialdesignicons-intellisense#3.0.0 From c8f92f735a9d604baf4aa25f56d01fed07e71c6e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 29 Sep 2020 15:17:50 +0200 Subject: [PATCH 231/778] :arrow_up: Upgrades yamllint to 1.25.0 --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 38b85cf..38b1b2d 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ homeassistant_cli==0.9.1 -yamllint==1.23.0 +yamllint==1.25.0 From af3aff110fd16126d9cd23f1a4514ca5dde24bab Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 29 Sep 2020 15:18:19 +0200 Subject: [PATCH 232/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.9.1 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index ab650eb..6246c14 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.9.0 esbenp.prettier-vscode#5.6.0 ESPHome.esphome-vscode#0.3.0 -keesschollaart.vscode-home-assistant#1.9.0 +keesschollaart.vscode-home-assistant#1.9.1 lukas-tr.materialdesignicons-intellisense#3.0.0 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.11.0 From a8ea7ef0e43d441d5f99f09246caaa98a92883c1 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 29 Sep 2020 15:18:57 +0200 Subject: [PATCH 233/778] :arrow_up: Upgrades usernamehw.errorlens to 3.2.2 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 6246c14..acac550 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -5,4 +5,4 @@ keesschollaart.vscode-home-assistant#1.9.1 lukas-tr.materialdesignicons-intellisense#3.0.0 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.11.0 -usernamehw.errorlens#3.2.1 +usernamehw.errorlens#3.2.2 From 83934090c3fe2a4e4928a31726775da7c046fc38 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 29 Sep 2020 15:19:59 +0200 Subject: [PATCH 234/778] :arrow_up: Upgrades esbenp.prettier-vscode to 5.7.1 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index acac550..7ad5ca3 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.9.0 -esbenp.prettier-vscode#5.6.0 +esbenp.prettier-vscode#5.7.1 ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.9.1 lukas-tr.materialdesignicons-intellisense#3.0.0 From 4978d5b550d2c64c09c97f66c5bc63fc5b466cbb Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 8 Oct 2020 11:23:08 +0200 Subject: [PATCH 235/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.10.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 7ad5ca3..3b078c7 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.9.0 esbenp.prettier-vscode#5.7.1 ESPHome.esphome-vscode#0.3.0 -keesschollaart.vscode-home-assistant#1.9.1 +keesschollaart.vscode-home-assistant#1.10.0 lukas-tr.materialdesignicons-intellisense#3.0.0 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.11.0 From 140f052209bdaa3444ccc3a7500770f6f3225e93 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 8 Oct 2020 11:24:24 +0200 Subject: [PATCH 236/778] :arrow_up: Upgrades redhat.vscode-yaml to 0.11.1 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 3b078c7..fba651b 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -4,5 +4,5 @@ ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.10.0 lukas-tr.materialdesignicons-intellisense#3.0.0 oderwat.indent-rainbow#7.4.0 -redhat.vscode-yaml#0.11.0 +redhat.vscode-yaml#0.11.1 usernamehw.errorlens#3.2.2 From 9be8689cc92d3b5eeb33c7bc799f1287c0ea1f9f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 8 Oct 2020 11:24:46 +0200 Subject: [PATCH 237/778] :arrow_up: Upgrades usernamehw.errorlens to 3.2.3 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index fba651b..a039746 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -5,4 +5,4 @@ keesschollaart.vscode-home-assistant#1.10.0 lukas-tr.materialdesignicons-intellisense#3.0.0 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.11.1 -usernamehw.errorlens#3.2.2 +usernamehw.errorlens#3.2.3 From 402824299420af0e71d523eecb4d485f011e612e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 8 Oct 2020 11:28:09 +0200 Subject: [PATCH 238/778] :sparkles: Add UUID generator extension --- vscode/vscode.extensions | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index a039746..ac2b6d6 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -3,6 +3,7 @@ esbenp.prettier-vscode#5.7.1 ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.10.0 lukas-tr.materialdesignicons-intellisense#3.0.0 +netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.11.1 usernamehw.errorlens#3.2.3 From 07a3538c827e4f8e5951695d645ee44423eb44e6 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 10 Oct 2020 16:29:25 +0200 Subject: [PATCH 239/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.11.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index ac2b6d6..0779f87 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.9.0 esbenp.prettier-vscode#5.7.1 ESPHome.esphome-vscode#0.3.0 -keesschollaart.vscode-home-assistant#1.10.0 +keesschollaart.vscode-home-assistant#1.11.0 lukas-tr.materialdesignicons-intellisense#3.0.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.4.0 From 37b870fbd1dff00176db652d7a6817a4d863a05e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 12 Oct 2020 11:39:45 +0200 Subject: [PATCH 240/778] :arrow_up: Upgrades code-server to 3.6.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 2e9bbf4..587c520 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -51,7 +51,7 @@ 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/v3.5.0/code-server-3.5.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.6.0/code-server-3.6.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 39618ff5db0327cafbd7e63fd9d49266857f4785 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 25 Oct 2020 13:20:32 +0100 Subject: [PATCH 241/778] :arrow_up: Upgrades base image to v3.2.3 --- .gitlab-ci.yml | 4 ++-- vscode/Dockerfile | 2 +- vscode/build.json | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ce6b55..a955183 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,5 +10,5 @@ variables: ADDON_ARMV7: "false" ADDON_I386: "false" - ADDON_AARCH64_BASE: "hassioaddons/debian-base-aarch64:3.2.2" - ADDON_AMD64_BASE: "hassioaddons/debian-base-amd64:3.2.2" + ADDON_AARCH64_BASE: "hassioaddons/debian-base-aarch64:3.2.3" + ADDON_AMD64_BASE: "hassioaddons/debian-base-amd64:3.2.3" diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 587c520..ebac8ae 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/debian-base:3.2.2 +ARG BUILD_FROM=hassioaddons/debian-base:3.2.3 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.json b/vscode/build.json index f356346..6a975bf 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,7 +1,7 @@ { "build_from": { - "aarch64": "hassioaddons/debian-base-aarch64:3.2.2", - "amd64": "hassioaddons/debian-base-amd64:3.2.2" + "aarch64": "hassioaddons/debian-base-aarch64:3.2.3", + "amd64": "hassioaddons/debian-base-amd64:3.2.3" }, "args": {} -} \ No newline at end of file +} From 1646c1acc041257a09335e292a73683b0baaf9fc Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 25 Oct 2020 13:20:41 +0100 Subject: [PATCH 242/778] :arrow_up: Upgrades code-server to 3.6.1 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ebac8ae..5dbfcd3 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -51,7 +51,7 @@ 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/v3.6.0/code-server-3.6.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.6.1/code-server-3.6.1-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 22ba237ffc128d9c9a994dba4da6ea51917ca3aa Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 29 Oct 2020 10:47:47 +0100 Subject: [PATCH 243/778] :arrow_up: Upgrades Home Assistant CLI to v4.7.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 5dbfcd3..cf184f2 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -84,7 +84,7 @@ RUN \ && ls -la /root/.code-server/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.5.0/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.7.0/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From 9b313801dd3b0f90c66da0751882382bbae8e967 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 3 Nov 2020 10:04:23 +0100 Subject: [PATCH 244/778] :arrow_up: Upgrades code-server to 3.6.2 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index cf184f2..12f614d 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -51,7 +51,7 @@ 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/v3.6.1/code-server-3.6.1-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.6.2/code-server-3.6.2-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 70d8a6e7a11ea65099eeca29ea48fcce50e9a63b Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 23 Nov 2020 19:19:30 +0100 Subject: [PATCH 245/778] :arrow_up: Upgrades code-server to 3.7.2 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 12f614d..b89a88f 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -51,7 +51,7 @@ 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/v3.6.2/code-server-3.6.2-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.7.2/code-server-3.7.2-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 68a2e303faedb053b44d7e2e6b1e0d05391b18ed Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 30 Nov 2020 22:36:27 +0100 Subject: [PATCH 246/778] :arrow_up: Upgrades code-server to 3.7.3 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index b89a88f..13fd0e6 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -51,7 +51,7 @@ 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/v3.7.2/code-server-3.7.2-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.7.3/code-server-3.7.3-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 89877afb271f34858599a5c07a7143034f083f56 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 30 Nov 2020 22:37:03 +0100 Subject: [PATCH 247/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.12.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 0779f87..bba5d65 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.9.0 esbenp.prettier-vscode#5.7.1 ESPHome.esphome-vscode#0.3.0 -keesschollaart.vscode-home-assistant#1.11.0 +keesschollaart.vscode-home-assistant#1.12.0 lukas-tr.materialdesignicons-intellisense#3.0.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.4.0 From 899064c8189f666243f31f50645740f1234b184b Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 30 Nov 2020 22:37:27 +0100 Subject: [PATCH 248/778] :arrow_up: Upgrades emilast.LogFileHighlighter to 2.10.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index bba5d65..a4c0010 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#2.9.0 +emilast.LogFileHighlighter#2.10.0 esbenp.prettier-vscode#5.7.1 ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.12.0 From ff3c5123c37c4a2fb91710277f72a2daf3392ed5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 30 Nov 2020 22:37:50 +0100 Subject: [PATCH 249/778] :arrow_up: Upgrades esbenp.prettier-vscode to 5.8.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index a4c0010..c4ede44 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.10.0 -esbenp.prettier-vscode#5.7.1 +esbenp.prettier-vscode#5.8.0 ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.12.0 lukas-tr.materialdesignicons-intellisense#3.0.0 From d33e0fab2e87ce1f767ef741037d82287ac6536a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 30 Nov 2020 22:38:20 +0100 Subject: [PATCH 250/778] :arrow_up: Upgrades lukas-tr.materialdesignicons-intellisense to 3.1.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index c4ede44..1e01484 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -2,7 +2,7 @@ emilast.LogFileHighlighter#2.10.0 esbenp.prettier-vscode#5.8.0 ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.12.0 -lukas-tr.materialdesignicons-intellisense#3.0.0 +lukas-tr.materialdesignicons-intellisense#3.1.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.11.1 From 4959ef00f6416069a6aab34dd0692bed813a4a96 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 30 Nov 2020 22:39:41 +0100 Subject: [PATCH 251/778] :arrow_up: Upgrades redhat.vscode-yaml to 0.13.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 1e01484..d8cf1a4 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -5,5 +5,5 @@ keesschollaart.vscode-home-assistant#1.12.0 lukas-tr.materialdesignicons-intellisense#3.1.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.4.0 -redhat.vscode-yaml#0.11.1 +redhat.vscode-yaml#0.13.0 usernamehw.errorlens#3.2.3 From 2ff4656e15bd02b7868e87efd4b87df1579d6869 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 30 Nov 2020 22:40:06 +0100 Subject: [PATCH 252/778] :arrow_up: Upgrades usernamehw.errorlens to 3.2.4 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index d8cf1a4..818d241 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -6,4 +6,4 @@ lukas-tr.materialdesignicons-intellisense#3.1.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.4.0 redhat.vscode-yaml#0.13.0 -usernamehw.errorlens#3.2.3 +usernamehw.errorlens#3.2.4 From 6e944e13ab13fb95827f3e9da4dd560d227f01d7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 30 Nov 2020 22:40:22 +0100 Subject: [PATCH 253/778] :arrow_up: Upgrades Home Assistant CLI to v4.9.0 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 13fd0e6..4c46fcd 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -84,7 +84,7 @@ RUN \ && ls -la /root/.code-server/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.7.0/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.9.0/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From be2b07651076461322df40a3fe375255f71c852c Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 2 Dec 2020 08:44:11 +0100 Subject: [PATCH 254/778] :arrow_up: Upgrades code-server to 3.7.4 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 4c46fcd..dc944c1 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -51,7 +51,7 @@ 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/v3.7.3/code-server-3.7.3-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.7.4/code-server-3.7.4-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From f5e35eb40bf99f90ec04a655b4f9b821d73d1ca5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 2 Dec 2020 08:45:17 +0100 Subject: [PATCH 255/778] :hammer: Disable update check --- vscode/rootfs/etc/services.d/code/run | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index f4b58d4..820900b 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -19,6 +19,7 @@ options+=(--extra-builtin-extensions-dir "/root/.code-server/extensions/") options+=(--extensions-dir "/data/vscode/extensions") options+=(--host 0.0.0.0) options+=(--disable-telemetry) +options+=(--disable-update-check) # Disable code authentication, we use HA authentication options+=(--auth none) From 150dc82aa6d7dbbe943e21f07c0fae9a6536b394 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 3 Dec 2020 15:31:10 +0100 Subject: [PATCH 256/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.13.0 --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 818d241..9329fd7 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.10.0 esbenp.prettier-vscode#5.8.0 ESPHome.esphome-vscode#0.3.0 -keesschollaart.vscode-home-assistant#1.12.0 +keesschollaart.vscode-home-assistant#1.13.0 lukas-tr.materialdesignicons-intellisense#3.1.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.4.0 From c7a8788b1de789c427ed32b7fac7523d045cd846 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Jan 2021 01:45:25 +0100 Subject: [PATCH 257/778] Cleanup repository (#156) --- .github/CODEOWNERS | 3 - .github/autolabeler.yml | 2 - .github/config.yml | 50 ----------- .github/invite-contributors.yml | 10 --- .github/lock.yml | 20 ----- .github/move.yml | 20 ----- .github/no-response.yml | 13 --- .github/potential-duplicates.yml | 14 --- .github/settings.yml | 150 ------------------------------- .github/stale.yml | 61 ------------- .github/support.yml | 22 ----- .gitignore | 0 12 files changed, 365 deletions(-) delete mode 100644 .github/autolabeler.yml delete mode 100644 .github/config.yml delete mode 100644 .github/invite-contributors.yml delete mode 100644 .github/lock.yml delete mode 100644 .github/move.yml delete mode 100644 .github/no-response.yml delete mode 100644 .github/potential-duplicates.yml delete mode 100644 .github/settings.yml delete mode 100644 .github/stale.yml delete mode 100644 .github/support.yml delete mode 100644 .gitignore diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3fbad49..771559a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,4 +1 @@ -# Require maintainer's :+1: for changes to the .github/ repo-config files -# mainly due to https://github.com/probot/settings privilege escalation .github/* @frenck -.gitlab-ci.yml @frenck diff --git a/.github/autolabeler.yml b/.github/autolabeler.yml deleted file mode 100644 index 3ce5703..0000000 --- a/.github/autolabeler.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -"Type: Documentation": ["*.md", "*.j2"] diff --git a/.github/config.yml b/.github/config.yml deleted file mode 100644 index f5828bb..0000000 --- a/.github/config.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -# Configuration for request-info - https://github.com/behaviorbot/request-info - -# *OPTIONAL* Comment to reply with -# Can be either a string : -requestInfoReplyComment: - - "We would appreciate it if you could provide us with more info about this issue/pr!" - - "Hmmm... That issue/PR is kinda low on text. Could you please provide some more content?" - -# *OPTIONAL* default titles to check against for lack of descriptiveness -# MUST BE ALL LOWERCASE -requestInfoDefaultTitles: [] - -# *OPTIONAL* Label to be added to Issues and Pull Requests with insufficient information given -requestInfoLabelToAdd: "Incomplete" - -# *OPTIONAL* Require Pull Requests to contain more information than what is provided in the PR template -# Will fail if the pull request's body is equal to the provided template -checkPullRequestTemplate: true - -# *OPTIONAL* Only warn about insufficient information on these events type -# Keys must be lowercase. Valid values are 'issue' and 'pullRequest' -requestInfoOn: - pullRequest: true - issue: true - -# *OPTIONAL* Add a list of people whose Issues/PRs will not be commented on -# keys must be GitHub usernames -requestInfoUserstoExclude: [] - -# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome - -# Comment to be posted to on first time issues -newIssueWelcomeComment: > - :wave: Thanks for opening your first issue here! - If you're reporting a :bug: bug, please make sure you include steps to reproduce it. - Also, logs, error messages and information about your hardware might be useful. - -# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome - -# Comment to be posted to on PRs from first time contributors in your repository -newPRWelcomeComment: > - :sparkling_heart: Thanks for opening this pull request! :sparkling_heart: - If your PR gets accepted and merged in, we will invite you to the project :tada: - -# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge - -# Comment to be posted to on pull requests merged by a first time user -firstPRMergeComment: > - Congrats on merging your first pull request! :tada::tada::tada: diff --git a/.github/invite-contributors.yml b/.github/invite-contributors.yml deleted file mode 100644 index 25eb31a..0000000 --- a/.github/invite-contributors.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# If true, this will add new contributors as outside collaborators -# to the repo their PR was merged in. Team name is ignored if this -# flag is set to true. -isOutside: false - -# Specify team name to add new contributors to a specific team -# within your organization. -# Use team name or team-name-slug -team: Contributors diff --git a/.github/lock.yml b/.github/lock.yml deleted file mode 100644 index 4b1e816..0000000 --- a/.github/lock.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# Configuration for lock-threads - https://github.com/dessant/lock-threads -# Number of days of inactivity before a closed issue or pull request is locked -daysUntilLock: 30 - -# Comment to post before locking. Set to `false` to disable -lockComment: > - This thread has been automatically locked because it has not had recent - activity. Please open a new issue for related bugs and link to relevant - comments in this thread. - -# Issues or pull requests with these labels will not be locked -# exemptLabels: -# - no-locking - -# Limit to only `issues` or `pulls` -# only: issues - -# Add a label when locking. Set to `false` to disable -lockLabel: false diff --git a/.github/move.yml b/.github/move.yml deleted file mode 100644 index 0c2276a..0000000 --- a/.github/move.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -# Delete the command comment when it contains no other content -deleteCommand: true - -# Close the source issue after moving -closeSourceIssue: true - -# Lock the source issue after moving -lockSourceIssue: true - -# Mention issue and comment authors -mentionAuthors: true - -# Preserve mentions in the issue content -keepContentMentions: false - -# Set custom aliases for targets -# aliases: -# r: repo -# or: owner/repo diff --git a/.github/no-response.yml b/.github/no-response.yml deleted file mode 100644 index bb9f0f2..0000000 --- a/.github/no-response.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Configuration for probot-no-response - https://github.com/probot/no-response -# Number of days of inactivity before an Issue is closed for lack of response -daysUntilClose: 14 -# Label requiring a response -responseRequiredLabel: "Status: Awaiting response" -# Comment to post when closing an Issue for lack of response. Set to `false` to disable -closeComment: > - This issue has been automatically closed because there has been no response - to our request for more information from the original author. With only the - information that is currently in the issue, we don't have enough information - to take action. Please reach out if you have or find the answers we need so - that we can investigate further. diff --git a/.github/potential-duplicates.yml b/.github/potential-duplicates.yml deleted file mode 100644 index 00c7c0f..0000000 --- a/.github/potential-duplicates.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -# Label name and color to set, when potential duplicates are detected -issueLabel: "Potential duplicate" -labelColor: e6e6e6 - -# If similarity is higher than this threshold, issue will be marked as duplicate -threshold: 0.70 - -# Comment to post when potential duplicates are detected -referenceComment: > - Potential duplicates found: - {{#issues}} - - [#{{ number }}] {{ title }} ({{ accuracy }}%) - {{/issues}} diff --git a/.github/settings.yml b/.github/settings.yml deleted file mode 100644 index 4834f2f..0000000 --- a/.github/settings.yml +++ /dev/null @@ -1,150 +0,0 @@ ---- -repository: - description: "Visual Studio Code - Home Assistant Community Add-ons" - homepage: https://addons.community - topics: vscode, ide, code-server, addon, addons, home-assistant, homeassistant - private: false - has_issues: true - has_projects: false - has_wiki: false - has_downloads: false - default_branch: master - allow_squash_merge: true - allow_merge_commit: false - allow_rebase_merge: true -labels: - # Priority labels - - name: "Priority: Critical" - color: ee0701 - description: "This should be dealt with ASAP. Not fixing this issue would be a serious error." - - name: "Priority: High" - color: b60205 - description: "After critical issues are fixed, these should be dealt with before any further issues." - - name: "Priority: Medium" - color: 0e8a16 - description: "This issue may be useful, and needs some attention." - - name: "Priority: Low" - color: e4ea8a - description: "Nice addition, maybe... someday..." - - # Type labels - - name: "Type: Bug" - color: ee0701 - description: "Inconsistencies or issues which will cause a problem for users or implementors." - - name: "Type: Documentation" - color: 0052cc - description: "Solely about the documentation of the project." - - name: "Type: Enhancement" - color: 1d76db - description: "Enhancement of the code, not introducing new features." - - name: "Type: Feature" - color: 0e8a16 - description: "New features or options." - - name: "Type: Support" - color: 5319e7 - description: "Marks an issue as a support ticket." - - name: "Type: Discussion" - color: d4c5f9 - description: "Marks an issue as a generic discussion ticket." - - name: "Type: Maintenance" - color: 2af79e - description: "Generic maintenance tasks, e.g., package updates." - - # Additional markers - - name: "Security" - color: ee0701 - description: "Marks a security issue that needs to be resolved asap." - - name: "Idea" - color: fef2c0 - description: "Marks an idea, which might be excepted and implemented." - - name: "Incomplete" - color: fef2c0 - description: "Marks a PR or issue that is missing information." - - name: "Pull request" - color: fbca04 - description: "There is an PR opened for this issue." - - name: "Accepted" - color: c2e0c6 - description: "This issue or PR has been accepted." - - name: "Declined" - color: f9d0c4 - description: "This issue or PR has been declined." - - name: "Potential duplicate" - color: e6e6e6 - description: "This issue has been automatically marked as a potential duplicate." - - # Ongoing Status labels - - name: "Status: Triage" - color: fbca04 - description: "This issue needs to be triaged." - - name: "Status: On hold" - color: cccccc - description: "Issue or PR that has been placed on hold for now." - - name: "Status: In progress" - color: fbca04 - description: "Issue is currently being resolved by a developer." - - name: "Status: Stale" - color: fef2c0 - description: "There has not been activity on this issue or PR for quite some time." - - name: "Status: Awaiting response" - color: fef2c0 - description: "Issue or PR awaits response from the creator." - - name: "Status: Blocked" - color: fef2c0 - description: "Progress on this issue is currently not possible." - - # Closing status labels - - name: "Closed: Known limitation" - color: e6e6e6 - description: "Issue is closed, it is a known limitation." - - name: "Closed: Expected behavior" - color: e6e6e6 - description: "Issues is closed, it is expected behavior." - - name: "Closed: Duplicate" - color: e6e6e6 - description: "Issue is closed, duplicate of an existing issue." - - name: "Closed: Invalid" - color: e6e6e6 - description: "Issue is closed, marked as not a valid issue (e.g., an user error)." - - name: "Closed: Wrong repository" - color: e6e6e6 - description: "Issue is closed, was created in the wrong repository." - - name: "Closed: Won't Fix" - color: e6e6e6 - description: "Issue is closed, it won't be fixed." - - name: "Closed: Done" - color: c2e0c6 - description: "Issue closed, work on this issue has been marked complete." - - # Others - - name: "Beginner Friendly" - color: 0e8a16 - description: "Good first issue for people wanting to contribute to the project." - - name: "Help wanted" - color: 0e8a16 - description: "We need some extra helping hands or expertise in order to resolve this." - - name: "Hacktoberfest" - description: "Issues/PRs are participating in the Hacktoberfest" - color: fbca04 - -branches: - - name: master - protection: - required_pull_request_reviews: - # required_approving_review_count: 1 - dismiss_stale_reviews: true - require_code_owner_reviews: true - dismissal_restrictions: - users: [] - teams: - - Admins - - Masters - required_status_checks: - strict: false - contexts: [] - enforce_admins: false - restrictions: - users: [] - teams: - - Admins - - Masters diff --git a/.github/stale.yml b/.github/stale.yml deleted file mode 100644 index 36938bb..0000000 --- a/.github/stale.yml +++ /dev/null @@ -1,61 +0,0 @@ ---- -# Configuration for probot-stale - https://github.com/probot/stale - -# Number of days of inactivity before an Issue or Pull Request becomes stale -daysUntilStale: 60 - -# Number of days of inactivity before a stale Issue or Pull Request is closed. -# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale. -daysUntilClose: 7 - -# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable -exemptLabels: - - "Status: On hold" - - "Status: In progress" - - "Status: Awaiting response" - - "Status: Blocked" - - "Idea" - - "Security" - -# Set to true to ignore issues in a project (defaults to false) -exemptProjects: false - -# Set to true to ignore issues in a milestone (defaults to false) -exemptMilestones: false - -# Label to use when marking as stale -staleLabel: "Status: Stale" - -# Comment to post when marking as stale. Set to `false` to disable -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. - -# Comment to post when removing the stale label. -# unmarkComment: > -# Your comment here. -unmarkComment: false - -# Comment to post when closing a stale Issue or Pull Request. -# closeComment: > -# Your comment here. -closeComment: false - -# Limit the number of actions per hour, from 1-30. Default is 30 -limitPerRun: 30 - -# Limit to only `issues` or `pulls` -only: issues - -# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls': -# pulls: -# daysUntilStale: 30 -# markComment: > -# This pull request has been automatically marked as stale because it has not had -# recent activity. It will be closed if no further activity occurs. Thank you -# for your contributions. - -# issues: -# exemptLabels: -# - confirmed diff --git a/.github/support.yml b/.github/support.yml deleted file mode 100644 index ded3142..0000000 --- a/.github/support.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Configuration for support-requests - https://github.com/dessant/support-requests - -# Label used to mark issues as support requests -supportLabel: "Type: Support" - -# Comment to post on issues marked as support requests. Add a link -# to a support page, or set to `false` to disable -supportComment: > - :wave: We use the issue tracker exclusively for bug reports and feature requests. - However, this issue appears to be a support request. Please use our - support channels to get help with the project. - - Head over to the - [Home Assistant community forum](https://community.home-assistant.io/t/home-assistant-community-add-on-visual-studio-code/107863?u=frenck) - or join our [Discord](https://discord.me/hassioaddons) chat. - -# Close issues marked as support requests -close: true - -# Lock issues marked as support requests -lock: false diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e69de29..0000000 From f391c46dcacf2a871dcf7baec624cb422375712e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Jan 2021 02:21:21 +0100 Subject: [PATCH 258/778] Upgrade Code of Conduct (#157) --- CODE_OF_CONDUCT.md | 159 +++++++++++++++++++++++++++++++-------------- 1 file changed, 109 insertions(+), 50 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 0ac232b..8b146f4 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,74 +1,133 @@ -# Code of conduct +# Contributor Covenant Code of Conduct -## Our pledge +## Our Pledge -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, gender identity and expression, level of experience, -nationality, personal appearance, race, religion, or sexual identity and -orientation. +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, religion, or sexual identity +and orientation. -## Our standards +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. -Examples of behavior that contributes to creating a positive environment -include: +## Our Standards -- Using welcoming and inclusive language -- Being respectful of differing viewpoints and experiences -- Gracefully accepting constructive criticism -- Focusing on what is best for the community -- Showing empathy towards other community members +Examples of behavior that contributes to a positive environment for our +community include: -Examples of unacceptable behavior by participants include: +- Demonstrating empathy and kindness toward other people +- Being respectful of differing opinions, viewpoints, and experiences +- Giving and gracefully accepting constructive feedback +- Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +- Focusing on what is best not just for us as individuals, but for the + overall community -- The use of sexualized language or imagery and unwelcome sexual attention - or advances -- Trolling, insulting/derogatory comments, and personal or political attacks +Examples of unacceptable behavior include: + +- The use of sexualized language or imagery, and sexual attention or + advances of any kind +- Trolling, insulting or derogatory comments, and personal or political attacks - Public or private harassment -- Publishing others' private information, such as a physical or - electronic address, without explicit permission -- Other conduct which could reasonably be considered inappropriate - in a professional setting +- Publishing others' private information, such as a physical or email + address, without their explicit permission +- Other conduct which could reasonably be considered inappropriate in a + professional setting -## Our responsibilities +## Enforcement Responsibilities -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. -Project maintainers have the right and responsibility to remove, edit, or -reject comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct, or to ban temporarily or -permanently any contributor for other behaviors that they deem inappropriate, -threatening, offensive, or harmful. +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. ## Scope -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -representing a project or community include using an official project e-mail -address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project lead at frenck@addons.community. All -complaints will be reviewed and investigated and will result in a response that -is deemed necessary and appropriate to the circumstances. The project lead is -obligated to maintain confidentiality with regard to the reporter of an incident. -Further details of specific enforcement policies may be posted separately. +reported to the community leaders responsible for enforcement at +frenck@frenck.dev. -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series +of actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or +permanent ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within +the community. ## Attribution This Code of Conduct is adapted from the [Contributor Covenant][homepage], -version 1.4, available at [http://contributor-covenant.org/version/1/4][version] +version 2.0, available at +[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0]. -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ +Community Impact Guidelines were inspired by +[Mozilla's code of conduct enforcement ladder][mozilla coc]. + +For answers to common questions about this code of conduct, see the FAQ at +[https://www.contributor-covenant.org/faq][faq]. Translations are available +at [https://www.contributor-covenant.org/translations][translations]. + +[homepage]: https://www.contributor-covenant.org +[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html +[mozilla coc]: https://github.com/mozilla/diversity +[faq]: https://www.contributor-covenant.org/faq +[translations]: https://www.contributor-covenant.org/translations From 0cbd93b761fd1616aac7d4d92f34bd90766d4534 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Jan 2021 02:21:45 +0100 Subject: [PATCH 259/778] Happy New Year (#158) --- LICENSE.md | 2 +- README.md | 4 ++-- vscode/.README.j2 | 2 +- vscode/DOCS.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 9344a08..e9a1271 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # MIT License -Copyright (c) 2019-2020 Franck Nijhof +Copyright (c) 2019-2021 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 c1e39c5..732501e 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ our [GitHub Repository][repository]. MIT License -Copyright (c) 2019-2020 Franck Nijhof +Copyright (c) 2019-2021 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 @@ -124,7 +124,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/2020.svg +[maintenance-shield]: https://img.shields.io/maintenance/yes/2021.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 ca3c034..6951fbf 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/2020.svg +[maintenance-shield]: https://img.shields.io/maintenance/yes/2021.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 658c0b5..211df58 100644 --- a/vscode/DOCS.md +++ b/vscode/DOCS.md @@ -185,7 +185,7 @@ check [the contributor's page][contributors]. MIT License -Copyright (c) 2019-2020 Franck Nijhof +Copyright (c) 2019-2021 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 From 17a11d815d78249068fd5114ec87ab4570e645c3 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Jan 2021 02:54:36 +0100 Subject: [PATCH 260/778] Add new repository workflow (#159) * Add new repository workflow * Prettified Code! * Address add-on lint errors * Address add-on lint errors Co-authored-by: frenck --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/dependabot.yaml | 13 ++ .github/labels.yml | 85 ++++++++ .github/release-drafter.yml | 57 +++++ .github/workflows/ci.yaml | 182 ++++++++++++++++ .github/workflows/deploy.yaml | 206 ++++++++++++++++++ .github/workflows/labels.yaml | 22 ++ .github/workflows/lock.yaml | 21 ++ .github/workflows/release-drafter.yaml | 18 ++ .github/workflows/stale.yaml | 40 ++++ .gitlab-ci.yml | 14 -- README.md | 10 +- vscode/.README.j2 | 2 +- vscode/Dockerfile | 16 +- vscode/build.json | 3 +- vscode/config.json | 1 - .../rootfs/root/.code-server/workspaces.json | 7 +- vscode/rootfs/root/.zshrc | 1 + 18 files changed, 669 insertions(+), 31 deletions(-) create mode 100644 .github/dependabot.yaml create mode 100644 .github/labels.yml create mode 100644 .github/release-drafter.yml create mode 100644 .github/workflows/ci.yaml create mode 100644 .github/workflows/deploy.yaml create mode 100644 .github/workflows/labels.yaml create mode 100644 .github/workflows/lock.yaml create mode 100644 .github/workflows/release-drafter.yaml create mode 100644 .github/workflows/stale.yaml delete mode 100644 .gitlab-ci.yml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index cbd529a..14f7b5b 100755 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,4 +6,4 @@ > ([Github link][autolink-references] to related issues or pull requests) -[autolink-references]: https://help.github.com/articles/autolinked-references-and-urls/ \ No newline at end of file +[autolink-references]: https://help.github.com/articles/autolinked-references-and-urls/ diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml new file mode 100644 index 0000000..5e06efb --- /dev/null +++ b/.github/dependabot.yaml @@ -0,0 +1,13 @@ +--- +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" diff --git a/.github/labels.yml b/.github/labels.yml new file mode 100644 index 0000000..2d0f68a --- /dev/null +++ b/.github/labels.yml @@ -0,0 +1,85 @@ +--- +- name: "breaking-change" + color: ee0701 + description: "A breaking change for existing users." +- name: "bugfix" + color: ee0701 + description: "Inconsistencies or issues which will cause a problem for users or implementors." +- name: "documentation" + color: 0052cc + description: "Solely about the documentation of the project." +- name: "enhancement" + color: 1d76db + description: "Enhancement of the code, not introducing new features." +- name: "refactor" + color: 1d76db + description: "Improvement of existing code, not introducing new features." +- name: "performance" + color: 1d76db + description: "Improving performance, not introducing new features." +- name: "new-feature" + color: 0e8a16 + description: "New features or options." +- name: "maintenance" + color: 2af79e + description: "Generic maintenance tasks." +- name: "ci" + color: 1d76db + description: "Work that improves the continue integration." +- name: "dependencies" + color: 1d76db + description: "Upgrade or downgrade of project dependencies." + +- name: "in-progress" + color: fbca04 + description: "Issue is currently being resolved by a developer." +- name: "stale" + color: fef2c0 + description: "There has not been activity on this issue or PR for quite some time." +- name: "no-stale" + color: fef2c0 + description: "This issue or PR is exempted from the stable bot." + +- name: "security" + color: ee0701 + description: "Marks a security issue that needs to be resolved asap." +- name: "incomplete" + color: fef2c0 + description: "Marks a PR or issue that is missing information." +- name: "invalid" + color: fef2c0 + description: "Marks a PR or issue that is missing information." + +- name: "beginner-friendly" + color: 0e8a16 + description: "Good first issue for people wanting to contribute to the project." +- name: "help-wanted" + color: 0e8a16 + description: "We need some extra helping hands or expertise in order to resolve this." + +- name: "hacktoberfest" + description: "Issues/PRs are participating in the Hacktoberfest." + color: fbca04 +- name: "hacktoberfest-accepted" + description: "Issues/PRs are participating in the Hacktoberfest." + color: fbca04 + +- name: "priority-critical" + color: ee0701 + description: "This should be dealt with ASAP. Not fixing this issue would be a serious error." +- name: "priority-high" + color: b60205 + description: "After critical issues are fixed, these should be dealt with before any further issues." +- name: "priority-medium" + color: 0e8a16 + description: "This issue may be useful, and needs some attention." +- name: "priority-low" + color: e4ea8a + description: "Nice addition, maybe... someday..." + +- name: "major" + color: b60205 + description: "This PR causes a major version bump in the version number." +- name: "minor" + color: 0e8a16 + description: "This PR causes a minor version bump in the version number." diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml new file mode 100644 index 0000000..cb404ea --- /dev/null +++ b/.github/release-drafter.yml @@ -0,0 +1,57 @@ +--- +name-template: "v$RESOLVED_VERSION" +tag-template: "v$RESOLVED_VERSION" +change-template: "- $TITLE @$AUTHOR (#$NUMBER)" +sort-direction: ascending + +categories: + - title: "🚨 Breaking changes" + labels: + - "breaking-change" + - title: "✨ New features" + labels: + - "new-feature" + - title: "🐛 Bug fixes" + labels: + - "bugfix" + - title: "🚀 Enhancements" + labels: + - "enhancement" + - "refactor" + - "performance" + - title: "🧰 Maintenance" + labels: + - "maintenance" + - "ci" + - title: "📚 Documentation" + labels: + - "documentation" + - title: "⬆️ Dependency updates" + labels: + - "dependencies" + +version-resolver: + major: + labels: + - "major" + - "breaking-change" + minor: + labels: + - "minor" + - "new-feature" + patch: + labels: + - "bugfix" + - "chore" + - "ci" + - "dependencies" + - "documentation" + - "enhancement" + - "performance" + - "refactor" + default: patch + +template: | + ## What’s changed + + $CHANGES diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 0000000..2afaf14 --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,182 @@ +--- +name: CI + +# yamllint disable-line rule:truthy +on: + push: + pull_request: + types: + - opened + - reopened + - synchronize + workflow_dispatch: + +jobs: + information: + name: Gather add-on information + runs-on: ubuntu-latest + outputs: + architectures: ${{ steps.information.outputs.architectures }} + build: ${{ steps.information.outputs.build }} + description: ${{ steps.information.output.description }} + name: ${{ steps.information.outputs.name }} + slug: ${{ steps.information.outputs.slug }} + target: ${{ steps.information.outputs.target }} + steps: + - name: ⤵️ Check out code from GitHub + uses: actions/checkout@v2.3.4 + - name: 🚀 Run add-on information action + id: information + uses: frenck/action-addon-information@v1.0.0 + + lint-addon: + name: Lint Add-on + needs: + - information + runs-on: ubuntu-latest + steps: + - name: ⤵️ Check out code from GitHub + uses: actions/checkout@v2.3.4 + - name: 🚀 Run Add-on Lint + uses: frenck/action-addon-linter@v1.3.0 + with: + community: true + path: "./${{ needs.information.outputs.target }}" + + lint-hadolint: + name: Hadolint + needs: + - information + runs-on: ubuntu-latest + steps: + - name: ⤵️ Check out code from GitHub + uses: actions/checkout@v2.3.4 + - name: 🚀 Run Hadolint + uses: brpaz/hadolint-action@v1.3.1 + with: + dockerfile: "./${{ needs.information.outputs.target }}/Dockerfile" + + lint-json: + name: JSON Lint + runs-on: ubuntu-latest + steps: + - name: ⤵️ Check out code from GitHub + uses: actions/checkout@v2.3.4 + - name: 🚀 Run JQ + run: | + shopt -s globstar + cat **/*.json | jq '.' + + lint-markdown: + name: MarkdownLint + runs-on: ubuntu-latest + steps: + - name: ⤵️ Check out code from GitHub + uses: actions/checkout@v2.3.4 + - name: 🚀 Run mdl + uses: actionshub/markdownlint@2.0.0 + + lint-shellcheck: + name: Shellcheck + runs-on: ubuntu-latest + steps: + - name: ⤵️ Check out code from GitHub + uses: actions/checkout@v2.3.4 + - name: 🚀 Run Shellcheck + uses: ludeeus/action-shellcheck@1.0.0 + env: + SHELLCHECK_OPTS: -s bash + + lint-yamllint: + name: YAMLLint + runs-on: ubuntu-latest + steps: + - name: ⤵️ Check out code from GitHub + uses: actions/checkout@v2.3.4 + - name: 🚀 Run YAMLLint + uses: frenck/action-yamllint@v1.0.2 + + lint-prettier: + name: Prettier + runs-on: ubuntu-latest + steps: + - name: ⤵️ Check out code from GitHub + uses: actions/checkout@v2.3.4 + - name: 🚀 Run Prettier + uses: creyD/prettier_action@v3.3 + with: + prettier_options: --write **/*.{json,js,md,yaml} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + build: + name: Build ${{ matrix.architecture }} + needs: + - information + - lint-addon + - lint-hadolint + - lint-json + - lint-markdown + - lint-prettier + - lint-shellcheck + - lint-yamllint + runs-on: ubuntu-latest + strategy: + matrix: + architecture: ${{ fromJson(needs.information.outputs.architectures) }} + steps: + - name: ⤵️ Check out code from GitHub + uses: actions/checkout@v2.3.4 + - name: 🏗 Set up build cache + id: cache + uses: actions/cache@v2.1.3 + with: + path: /tmp/.docker-cache + key: docker-${{ github.ref }}-${{ matrix.architecture }}-${{ github.sha }} + restore-keys: | + docker-${{ github.ref }}-${{ matrix.architecture }} + - name: 🏗 Set up QEMU + uses: docker/setup-qemu-action@v1.0.1 + - name: 🏗 Set up Docker Buildx + uses: docker/setup-buildx-action@v1.1.1 + - name: ℹ️ Compose build flags + id: flags + run: | + echo "::set-output name=date::$(date +"%Y-%m-%dT%H:%M:%SZ")" + from=$(jq --raw-output ".build_from.${{ matrix.architecture }}" "${{ needs.information.outputs.build }}") + echo "::set-output name=from::${from}" + + if [[ "${{ matrix.architecture}}" = "amd64" ]]; then + echo "::set-output name=platform::linux/amd64" + elif [[ "${{ matrix.architecture }}" = "i386" ]]; then + echo "::set-output name=platform::linux/386" + elif [[ "${{ matrix.architecture }}" = "armhf" ]]; then + echo "::set-output name=platform::linux/arm/v6" + elif [[ "${{ matrix.architecture }}" = "armv7" ]]; then + echo "::set-output name=platform::linux/arm/v7" + elif [[ "${{ matrix.architecture }}" = "aarch64" ]]; then + echo "::set-output name=platform::linux/arm64/v8" + else + echo "::error ::Could not determine platform for architecture ${{ matrix.architecture }}" + exit 1 + fi + - name: 🚀 Build + uses: docker/build-push-action@v2.2.2 + with: + push: false + context: ${{ needs.information.outputs.target }} + file: ${{ needs.information.outputs.target }}/Dockerfile + cache-from: | + type=local,src=/tmp/.docker-cache + ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:edge + cache-to: type=local,mode=max,dest=/tmp/.docker-cache + platforms: ${{ steps.flags.outputs.platform }} + build-args: | + BUILD_ARCH=${{ matrix.architecture }} + BUILD_DATE=${{ steps.flags.outputs.date }} + BUILD_DESCRIPTION=${{ needs.information.outputs.description }} + BUILD_FROM=${{ steps.flags.outputs.from }} + BUILD_NAME=${{ needs.information.outputs.name }} + BUILD_REF=${{ github.sha }} + BUILD_REPOSITORY=${{ github.repository }} + BUILD_VERSION=edge diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml new file mode 100644 index 0000000..44319e3 --- /dev/null +++ b/.github/workflows/deploy.yaml @@ -0,0 +1,206 @@ +--- +name: Deploy + +# yamllint disable-line rule:truthy +on: + release: + types: + - published + workflow_run: + workflows: ["CI"] + branches: [main] + types: + - completed + +jobs: + information: + if: | + github.event_name == 'release' + || ( + github.event_name == 'workflow_run' + && github.event.workflow_run.conclusion == 'success' + ) + name: ℹ️ Gather add-on information + runs-on: ubuntu-latest + outputs: + architectures: ${{ steps.information.outputs.architectures }} + build: ${{ steps.information.outputs.build }} + description: ${{ steps.information.output.description }} + environment: ${{ steps.release.outputs.environment }} + name: ${{ steps.information.outputs.name }} + slug: ${{ steps.information.outputs.slug }} + target: ${{ steps.information.outputs.target }} + version: ${{ steps.release.outputs.version }} + steps: + - name: ⤵️ Check out code from GitHub + uses: actions/checkout@v2.3.4 + - name: 🚀 Run add-on information action + id: information + uses: frenck/action-addon-information@v1.0.0 + - name: ℹ️ Gather version and environment + id: release + run: | + sha="${{ github.sha }}" + environment="edge" + version="${sha:0:7}" + if [[ "${{ github.event_name }}" = "release" ]]; then + version="${{ github.event.release.tag_name }}" + version="${version,,}" + version="${version#v}" + environment="stable" + if [[ "${{ github.event.release.prerelease }}" = "true" ]]; then + environment="beta" + fi + fi + + echo "::set-output name=environment::${environment}" + echo "::set-output name=version::${version}" + + deploy: + name: 👷 Build & Deploy ${{ matrix.architecture }} + needs: information + runs-on: ubuntu-latest + strategy: + matrix: + architecture: ${{ fromJson(needs.information.outputs.architectures) }} + steps: + - name: ⤵️ Check out code from GitHub + uses: actions/checkout@v2.3.4 + - name: 🏗 Set up build cache + id: cache + uses: actions/cache@v2.1.3 + with: + path: /tmp/.docker-cache + key: docker-${{ github.ref }}-${{ matrix.architecture }}-${{ github.sha }} + restore-keys: | + docker-${{ github.ref }}-${{ matrix.architecture }} + - name: 🏗 Set up QEMU + uses: docker/setup-qemu-action@v1.0.1 + - name: 🏗 Set up Docker Buildx + uses: docker/setup-buildx-action@v1.1.1 + - name: ℹ️ Compose build flags + id: flags + run: | + echo "::set-output name=date::$(date +"%Y-%m-%dT%H:%M:%SZ")" + from=$(jq --raw-output ".build_from.${{ matrix.architecture }}" "${{ needs.information.outputs.build }}") + echo "::set-output name=from::${from}" + + if [[ "${{ matrix.architecture}}" = "amd64" ]]; then + echo "::set-output name=platform::linux/amd64" + elif [[ "${{ matrix.architecture }}" = "i386" ]]; then + echo "::set-output name=platform::linux/386" + elif [[ "${{ matrix.architecture }}" = "armhf" ]]; then + echo "::set-output name=platform::linux/arm/v6" + elif [[ "${{ matrix.architecture }}" = "armv7" ]]; then + echo "::set-output name=platform::linux/arm/v7" + elif [[ "${{ matrix.architecture }}" = "aarch64" ]]; then + echo "::set-output name=platform::linux/arm64/v8" + else + echo "::error ::Could not determine platform for architecture ${{ matrix.architecture }}" + exit 1 + fi + - name: 🏗 Login to GitHub Container Registry + uses: docker/login-action@v1.8.0 + with: + registry: ghcr.io + username: ${{ secrets.GHCR_USERNAME }} + password: ${{ secrets.GHCR_PASSWORD }} + - name: 🚀 Build and push + uses: docker/build-push-action@v2.2.2 + with: + push: true + # yamllint disable rule:line-length + tags: | + ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:${{ needs.information.outputs.environment }} + ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:${{ needs.information.outputs.version }} + # yamllint enable rule:line-length + context: ${{ needs.information.outputs.target }} + file: ${{ needs.information.outputs.target }}/Dockerfile + cache-from: | + type=local,src=/tmp/.docker-cache + ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:edge + cache-to: type=local,mode=max,dest=/tmp/.docker-cache + platforms: ${{ steps.flags.outputs.platform }} + build-args: | + BUILD_ARCH=${{ matrix.architecture }} + BUILD_DATE=${{ steps.flags.outputs.date }} + BUILD_DESCRIPTION=${{ needs.information.outputs.description }} + BUILD_FROM=${{ steps.flags.outputs.from }} + BUILD_NAME=${{ needs.information.outputs.name }} + BUILD_REF=${{ github.sha }} + BUILD_REPOSITORY=${{ github.repository }} + BUILD_VERSION=${{ needs.information.outputs.version }} + + publish-edge: + name: 📢 Publish to edge repository + if: needs.information.outputs.environment == 'edge' + needs: + - information + - deploy + environment: + name: ${{ needs.information.outputs.environment }} + runs-on: ubuntu-latest + steps: + - name: 🚀 Dispatch repository updater update signal + uses: peter-evans/repository-dispatch@v1.1.3 + with: + token: ${{ secrets.DISPATCH_TOKEN }} + repository: hassio-addons/repository-edge + event-type: update + client-payload: > + { + "addon": "${{ needs.information.outputs.slug }}", + "name": "${{ needs.information.outputs.name }}", + "repository": "${{ github.repository }}", + "version": "${{ needs.information.outputs.version }}" + } + + publish-beta: + name: 📢 Publish to beta repository + if: | + needs.information.outputs.environment == 'beta' || + needs.information.outputs.environment == 'stable' + needs: + - information + - deploy + environment: + name: ${{ needs.information.outputs.environment }} + runs-on: ubuntu-latest + steps: + - name: 🚀 Dispatch repository updater update signal + uses: peter-evans/repository-dispatch@v1.1.3 + with: + token: ${{ secrets.DISPATCH_TOKEN }} + repository: hassio-addons/repository-beta + event-type: update + client-payload: > + { + "addon": "${{ needs.information.outputs.slug }}", + "name": "${{ needs.information.outputs.name }}", + "repository": "${{ github.repository }}", + "version": "${{ github.event.release.tag_name }}" + } + + publish-stable: + name: 📢 Publish to stable repository + if: needs.information.outputs.environment == 'stable' + needs: + - information + - deploy + environment: + name: ${{ needs.information.outputs.environment }} + runs-on: ubuntu-latest + steps: + - name: 🚀 Dispatch repository updater update signal + uses: peter-evans/repository-dispatch@v1.1.3 + with: + token: ${{ secrets.DISPATCH_TOKEN }} + repository: hassio-addons/repository + event-type: update + client-payload: > + { + "addon": "${{ needs.information.outputs.slug }}", + "name": "${{ needs.information.outputs.name }}", + "repository": "${{ github.repository }}", + "version": "${{ github.event.release.tag_name }}" + } diff --git a/.github/workflows/labels.yaml b/.github/workflows/labels.yaml new file mode 100644 index 0000000..5a6ab37 --- /dev/null +++ b/.github/workflows/labels.yaml @@ -0,0 +1,22 @@ +--- +name: Sync labels + +# yamllint disable-line rule:truthy +on: + push: + branches: + - main + paths: + - .github/labels.yml + +jobs: + labels: + name: ♻️ Sync labels + runs-on: ubuntu-latest + steps: + - name: ⤵️ Check out code from GitHub + uses: actions/checkout@v2.3.4 + - name: 🚀 Run Label Syncer + uses: micnncim/action-label-syncer@v1.2.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/lock.yaml b/.github/workflows/lock.yaml new file mode 100644 index 0000000..ff147a2 --- /dev/null +++ b/.github/workflows/lock.yaml @@ -0,0 +1,21 @@ +--- +name: Lock + +# yamllint disable-line rule:truthy +on: + schedule: + - cron: "0 9 * * *" + workflow_dispatch: + +jobs: + lock: + name: 🔒 Lock closed issues and PRs + runs-on: ubuntu-latest + steps: + - uses: dessant/lock-threads@v2.0.3 + with: + github-token: ${{ github.token }} + issue-lock-inactive-days: "30" + issue-lock-reason: "" + pr-lock-inactive-days: "1" + pr-lock-reason: "" diff --git a/.github/workflows/release-drafter.yaml b/.github/workflows/release-drafter.yaml new file mode 100644 index 0000000..25f9856 --- /dev/null +++ b/.github/workflows/release-drafter.yaml @@ -0,0 +1,18 @@ +--- +name: Release Drafter + +# yamllint disable-line rule:truthy +on: + push: + branches: + - main + +jobs: + update_release_draft: + name: ✏️ Draft release + runs-on: ubuntu-latest + steps: + - name: 🚀 Run Release Drafter + uses: release-drafter/release-drafter@v5.13.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml new file mode 100644 index 0000000..08b39ae --- /dev/null +++ b/.github/workflows/stale.yaml @@ -0,0 +1,40 @@ +--- +name: Stale + +# yamllint disable-line rule:truthy +on: + schedule: + - cron: "0 8 * * *" + workflow_dispatch: + +jobs: + stale: + name: 🧹 Clean up stale issues and PRs + runs-on: ubuntu-latest + steps: + - name: 🚀 Run stale + uses: actions/stale@v3.0.14 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + days-before-stale: 30 + days-before-close: 7 + remove-stale-when-updated: true + stale-issue-label: "stale" + exempt-issue-labels: "no-stale,help-wanted" + stale-issue-message: > + There hasn't been any activity on this issue recently, so we + clean up some of the older and inactive issues. + + Please make sure to update to the latest version and + check if that solves the issue. Let us know if that works for you + by leaving a comment 👍 + + This issue has now been marked as stale and will be closed if no + further activity occurs. Thanks! + stale-pr-label: "stale" + exempt-pr-labels: "no-stale" + stale-pr-message: > + There hasn't been any activity on this pull request recently. This + pull request has been automatically marked as stale because of that + and will be closed if no further activity occurs within 7 days. + Thank you for your contributions. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index a955183..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -include: https://raw.githubusercontent.com/hassio-addons/organization/master/gitlabci/addon.yml - -variables: - ADDON_GITHUB_REPO: "hassio-addons/addon-vscode" - ADDON_SLUG: "vscode" - ADDON_TARGET: "vscode" - - ADDON_ARMHF: "false" - ADDON_ARMV7: "false" - ADDON_I386: "false" - - ADDON_AARCH64_BASE: "hassioaddons/debian-base-aarch64:3.2.3" - ADDON_AMD64_BASE: "hassioaddons/debian-base-amd64:3.2.3" diff --git a/README.md b/README.md index 732501e..0f561ca 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ ![Supports armv7 Architecture][armv7-shield] ![Supports i386 Architecture][i386-shield] -[![GitLab CI][gitlabci-shield]][gitlabci] +[![Github Actions][github-actions-shield]][github-actions] ![Project Maintenance][maintenance-shield] [![GitHub Activity][commits-shield]][commits] @@ -108,19 +108,19 @@ SOFTWARE. [armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg [armv7-shield]: https://img.shields.io/badge/armv7-no-red.svg [commits-shield]: https://img.shields.io/github/commit-activity/y/hassio-addons/addon-vscode.svg -[commits]: https://github.com/hassio-addons/addon-vscode/commits/master +[commits]: https://github.com/hassio-addons/addon-vscode/commits/main [contributors]: https://github.com/hassio-addons/addon-vscode/graphs/contributors [discord-ha]: https://discord.gg/c5DvZ4e [discord-shield]: https://img.shields.io/discord/478094546522079232.svg [discord]: https://discord.me/hassioaddons -[docs]: https://github.com/hassio-addons/addon-vscode/blob/master/vscode/DOCS.md +[docs]: https://github.com/hassio-addons/addon-vscode/blob/main/vscode/DOCS.md [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg [forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-visual-studio-code/107863?u=frenck [frenck]: https://github.com/frenck +[github-actions-shield]: https://github.com/hassio-addons/addon-example/workflows/CI/badge.svg +[github-actions]: https://github.com/hassio-addons/addon-example/actions [github-sponsors-shield]: https://frenck.dev/wp-content/uploads/2019/12/github_sponsor.png [github-sponsors]: https://github.com/sponsors/frenck -[gitlabci-shield]: https://gitlab.com/hassio-addons/addon-vscode/badges/master/pipeline.svg -[gitlabci]: https://gitlab.com/hassio-addons/addon-vscode/pipelines [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 diff --git a/vscode/.README.j2 b/vscode/.README.j2 index 6951fbf..8d5bdf2 100644 --- a/vscode/.README.j2 +++ b/vscode/.README.j2 @@ -76,4 +76,4 @@ If you are more interested in stable releases of our add-ons: [project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg [release-shield]: https://img.shields.io/badge/version-{{ version }}-blue.svg [release]: {{ repo }}/tree/{{ version }} -[screenshot]: {{ repo }}/raw/master/images/screenshot.png +[screenshot]: {{ repo }}/raw/main/images/screenshot.png diff --git a/vscode/Dockerfile b/vscode/Dockerfile index dc944c1..03d9f63 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -124,26 +124,30 @@ RUN \ COPY rootfs / # Build arguments +ARG BUILD_ARCH ARG BUILD_DATE +ARG BUILD_DESCRIPTION +ARG BUILD_NAME ARG BUILD_REF +ARG BUILD_REPOSITORY ARG BUILD_VERSION # Labels LABEL \ - io.hass.name="Visual Studio Code" \ - io.hass.description="Visual Studio Code, accessible through the browser" \ + io.hass.name="${BUILD_NAME}" \ + io.hass.description="${BUILD_DESCRIPTION}" \ io.hass.arch="${BUILD_ARCH}" \ io.hass.type="addon" \ io.hass.version=${BUILD_VERSION} \ maintainer="Franck Nijhof " \ - org.opencontainers.image.title="Visual Studio Code" \ - org.opencontainers.image.description="Visual Studio Code, accessible through the browser" \ + org.opencontainers.image.title="${BUILD_NAME}" \ + org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ org.opencontainers.image.vendor="Home Assistant Community Add-ons" \ org.opencontainers.image.authors="Franck Nijhof " \ org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.url="https://addons.community" \ - org.opencontainers.image.source="https://github.com/hassio-addons/addon-vscode" \ - org.opencontainers.image.documentation="https://github.com/hassio-addons/addon-vscode/blob/master/README.md" \ + org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \ + org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} diff --git a/vscode/build.json b/vscode/build.json index 6a975bf..14e24cb 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -2,6 +2,5 @@ "build_from": { "aarch64": "hassioaddons/debian-base-aarch64:3.2.3", "amd64": "hassioaddons/debian-base-amd64:3.2.3" - }, - "args": {} + } } diff --git a/vscode/config.json b/vscode/config.json index bb69d4a..9e9dd89 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -10,7 +10,6 @@ "startup": "services", "init": false, "arch": ["aarch64", "amd64"], - "boot": "auto", "auto_uart": true, "hassio_api": true, "hassio_role": "manager", diff --git a/vscode/rootfs/root/.code-server/workspaces.json b/vscode/rootfs/root/.code-server/workspaces.json index 32f99f2..219b4fe 100644 --- a/vscode/rootfs/root/.code-server/workspaces.json +++ b/vscode/rootfs/root/.code-server/workspaces.json @@ -1 +1,6 @@ -{"rootWorkspaces":[],"folderURIWorkspaces":[],"emptyWorkspaceInfos":[],"emptyWorkspaces":[]} +{ + "rootWorkspaces": [], + "folderURIWorkspaces": [], + "emptyWorkspaceInfos": [], + "emptyWorkspaces": [] +} diff --git a/vscode/rootfs/root/.zshrc b/vscode/rootfs/root/.zshrc index fcd5075..11ad862 100755 --- a/vscode/rootfs/root/.zshrc +++ b/vscode/rootfs/root/.zshrc @@ -1,3 +1,4 @@ +# shellcheck disable=SC1090,SC2034,SC2086 # If you come from bash you might have to change your $PATH. # export PATH=$HOME/bin:/usr/local/bin:$PATH From 10a21cb796fa627e6d972f5d7b25b84a3e98a1ee Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Jan 2021 14:26:53 +0100 Subject: [PATCH 261/778] :arrow_up: Upgrades mariadb-client to 1:10.3.27-0+deb10u1 (#161) --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 03d9f63..effdfe4 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -31,7 +31,7 @@ RUN \ git=1:2.20.1-2+deb10u3 \ iputils-ping=3:20180629-2+deb10u1 \ locales=2.28-10 \ - mariadb-client=1:10.3.23-0+deb10u1 \ + mariadb-client=1:10.3.27-0+deb10u1 \ mosquitto-clients=1.5.7-1+deb10u1 \ net-tools=1.60+git20180626.aebd88e-1 \ nmap=7.70+dfsg1-6+deb10u1 \ From 858509fcd8c8fa399bb920b61021a725baf517d7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Jan 2021 15:01:13 +0100 Subject: [PATCH 262/778] :arrow_up: Upgrades code-server to 3.8.0 (#162) --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index effdfe4..cf74ed1 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -51,7 +51,7 @@ 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/v3.7.4/code-server-3.7.4-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.8.0/code-server-3.8.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From eb4f3cfec22f2ad19ca7fa81abd466117a1ae9c5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Jan 2021 15:05:05 +0100 Subject: [PATCH 263/778] Add zip/unzip commands (#163) --- vscode/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index cf74ed1..80d77d3 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -39,8 +39,10 @@ RUN \ openssl=1.1.1d-0+deb10u3 \ python3-dev=3.7.3-1 \ python3=3.7.3-1 \ - wget=1.20.1-1.1 \ + unzip=6.0-23+deb10u1 \ uuid-runtime=2.33.1-0.1 \ + wget=1.20.1-1.1 \ + zip=3.0-11+b1 \ zsh=5.7.1-1 \ \ && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \ From dbc039412737666e8ea22ada6c22a752f4fcd3ae Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Jan 2021 15:08:45 +0100 Subject: [PATCH 264/778] :arrow_up: Upgrades oderwat.indent-rainbow to 7.5.0 (#164) --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 9329fd7..cd2ee61 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -4,6 +4,6 @@ ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.13.0 lukas-tr.materialdesignicons-intellisense#3.1.0 netcorext.uuid-generator#0.0.4 -oderwat.indent-rainbow#7.4.0 +oderwat.indent-rainbow#7.5.0 redhat.vscode-yaml#0.13.0 usernamehw.errorlens#3.2.4 From 8e2d02279f17c5e861bd0a66009fcb590da8a406 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Jan 2021 15:10:28 +0100 Subject: [PATCH 265/778] Documentation tweaks (#165) --- vscode/DOCS.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/DOCS.md b/vscode/DOCS.md index 211df58..4479224 100644 --- a/vscode/DOCS.md +++ b/vscode/DOCS.md @@ -125,6 +125,8 @@ will come up with a better solution for this soon. ## Known issues and limitations +- Can this add-on run on a Raspberry Pi? Yes, but only if you run a 64 bits + operating system. Also, see point below. - This add-on currently only supports AMD64 and aarch64/ARM64 machines. Although we support ARM devices, please be aware, that this add-on is quite heavy to run, and requires quite a bit of RAM. We do not recommended to run @@ -148,8 +150,7 @@ will come up with a better solution for this soon. ## Changelog & Releases This repository keeps a change log using [GitHub's releases][releases] -functionality. The format of the log is based on -[Keep a Changelog][keepchangelog]. +functionality. Releases are based on [Semantic Versioning][semver], and use the format of `MAJOR.MINOR.PATCH`. In a nutshell, the version will be incremented @@ -211,7 +212,6 @@ SOFTWARE. [forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-visual-studio-code/107863?u=frenck [frenck]: https://github.com/frenck [issue]: https://github.com/hassio-addons/addon-vscode/issues -[keepchangelog]: http://keepachangelog.com/en/1.0.0/ [reddit]: https://reddit.com/r/homeassistant [releases]: https://github.com/hassio-addons/addon-vscode/releases [semver]: http://semver.org/spec/v2.0.0 From a2f36f68df538b87592c5690334caaf96525fcae Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Jan 2021 15:25:35 +0100 Subject: [PATCH 266/778] :arrow_up: Upgrades redhat.vscode-yaml to 0.14.0 (#166) --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index cd2ee61..8589697 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -5,5 +5,5 @@ keesschollaart.vscode-home-assistant#1.13.0 lukas-tr.materialdesignicons-intellisense#3.1.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 -redhat.vscode-yaml#0.13.0 +redhat.vscode-yaml#0.14.0 usernamehw.errorlens#3.2.4 From ab23d5365f5413c30feb03fb43409cd0f14703ba Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Jan 2021 22:22:11 +0100 Subject: [PATCH 267/778] Fix add-on description extraction (#167) --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2afaf14..a7f0cc2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,7 +18,7 @@ jobs: outputs: architectures: ${{ steps.information.outputs.architectures }} build: ${{ steps.information.outputs.build }} - description: ${{ steps.information.output.description }} + description: ${{ steps.information.outputs.description }} name: ${{ steps.information.outputs.name }} slug: ${{ steps.information.outputs.slug }} target: ${{ steps.information.outputs.target }} diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 44319e3..1190d75 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -25,7 +25,7 @@ jobs: outputs: architectures: ${{ steps.information.outputs.architectures }} build: ${{ steps.information.outputs.build }} - description: ${{ steps.information.output.description }} + description: ${{ steps.information.outputs.description }} environment: ${{ steps.release.outputs.environment }} name: ${{ steps.information.outputs.name }} slug: ${{ steps.information.outputs.slug }} From 09ea67f4b0be484ea71bde83571aec8411c8892b Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Jan 2021 22:22:20 +0100 Subject: [PATCH 268/778] Fix CI badges to show the right status (#168) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0f561ca..002802c 100644 --- a/README.md +++ b/README.md @@ -117,8 +117,8 @@ SOFTWARE. [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg [forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-visual-studio-code/107863?u=frenck [frenck]: https://github.com/frenck -[github-actions-shield]: https://github.com/hassio-addons/addon-example/workflows/CI/badge.svg -[github-actions]: https://github.com/hassio-addons/addon-example/actions +[github-actions-shield]: https://github.com/hassio-addons/addon-vscode/workflows/CI/badge.svg +[github-actions]: https://github.com/hassio-addons/addon-vscode/actions [github-sponsors-shield]: https://frenck.dev/wp-content/uploads/2019/12/github_sponsor.png [github-sponsors]: https://github.com/sponsors/frenck [i386-shield]: https://img.shields.io/badge/i386-no-red.svg From d109b78461045e786a131588db060c16688d5fcf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jan 2021 11:13:32 +0100 Subject: [PATCH 269/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20frenck/acti?= =?UTF-8?q?on-addon-linter=20from=20v1.3.0=20to=20v1.4=20(#170)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [frenck/action-addon-linter](https://github.com/frenck/action-addon-linter) from v1.3.0 to v1.4. - [Release notes](https://github.com/frenck/action-addon-linter/releases) - [Commits](https://github.com/frenck/action-addon-linter/compare/v1.3.0...c82c5e9ca0ce5fc9b15756f1c0e39531b95d11b0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a7f0cc2..22b1bf3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,7 @@ jobs: - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2.3.4 - name: 🚀 Run Add-on Lint - uses: frenck/action-addon-linter@v1.3.0 + uses: frenck/action-addon-linter@v1.4 with: community: true path: "./${{ needs.information.outputs.target }}" From d46d388c06a72c148269e975b371b66359a44db6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jan 2021 18:26:45 +0100 Subject: [PATCH 270/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20actions/sta?= =?UTF-8?q?le=20from=20v3.0.14=20to=20v3.0.15=20(#171)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/stale](https://github.com/actions/stale) from v3.0.14 to v3.0.15. - [Release notes](https://github.com/actions/stale/releases) - [Commits](https://github.com/actions/stale/compare/v3.0.14...86561461b92875de77a8b2d2e75f004c826e8f45) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/stale.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml index 08b39ae..04ee634 100644 --- a/.github/workflows/stale.yaml +++ b/.github/workflows/stale.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 🚀 Run stale - uses: actions/stale@v3.0.14 + uses: actions/stale@v3.0.15 with: repo-token: ${{ secrets.GITHUB_TOKEN }} days-before-stale: 30 From 26adc8a3d0533c62c44fa2ceb36b6a45863c5011 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Feb 2021 11:28:40 +0100 Subject: [PATCH 271/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20yamllint=20?= =?UTF-8?q?from=201.25.0=20to=201.26.0=20(#172)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [yamllint](https://github.com/adrienverge/yamllint) from 1.25.0 to 1.26.0. - [Release notes](https://github.com/adrienverge/yamllint/releases) - [Changelog](https://github.com/adrienverge/yamllint/blob/master/CHANGELOG.rst) - [Commits](https://github.com/adrienverge/yamllint/compare/v1.25.0...v1.26.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 38b1b2d..139f158 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ homeassistant_cli==0.9.1 -yamllint==1.25.0 +yamllint==1.26.0 From 0c4c47d0c923f90ae39611cb4e307fb19082a2d3 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 1 Feb 2021 20:12:46 +0100 Subject: [PATCH 272/778] :arrow_up: Upgrades openssl to 1.1.1d-0+deb10u4 (#173) --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 80d77d3..160eb8a 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -36,7 +36,7 @@ RUN \ net-tools=1.60+git20180626.aebd88e-1 \ nmap=7.70+dfsg1-6+deb10u1 \ openssh-client=1:7.9p1-10+deb10u2 \ - openssl=1.1.1d-0+deb10u3 \ + openssl=1.1.1d-0+deb10u4 \ python3-dev=3.7.3-1 \ python3=3.7.3-1 \ unzip=6.0-23+deb10u1 \ From ad7c152dc7791b0cad83745f73fc306648118b72 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 1 Feb 2021 20:40:39 +0100 Subject: [PATCH 273/778] Upgrade add-on base image to 4.1.2 (#174) --- vscode/Dockerfile | 2 +- vscode/build.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 160eb8a..fe09776 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/debian-base:3.2.3 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.1.2 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.json b/vscode/build.json index 14e24cb..616ce96 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { "build_from": { - "aarch64": "hassioaddons/debian-base-aarch64:3.2.3", - "amd64": "hassioaddons/debian-base-amd64:3.2.3" + "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:4.1.2", + "amd64": "ghcr.io/hassio-addons/debian-base/amd64:4.1.2" } } From 7d560e4662bdaa06c8b9ad8d934d04863ef0d3c3 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 1 Feb 2021 20:43:21 +0100 Subject: [PATCH 274/778] :arrow_up: Upgrades Home Assistant CLI to v4.10.0 (#175) --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index fe09776..d67debc 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -86,7 +86,7 @@ RUN \ && ls -la /root/.code-server/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.9.0/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.10.0/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From 7067e1b78a026cd3fceb852e84769fcfce7b1af0 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 1 Feb 2021 22:31:19 +0100 Subject: [PATCH 275/778] Upgrades keesschollaart.vscode-home-assistant to 1.14.0 (#176) --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 8589697..2eb2bc2 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.10.0 esbenp.prettier-vscode#5.8.0 ESPHome.esphome-vscode#0.3.0 -keesschollaart.vscode-home-assistant#1.13.0 +keesschollaart.vscode-home-assistant#1.14.0 lukas-tr.materialdesignicons-intellisense#3.1.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 From de35b429e5d6f506a441608cd4fddd6edc5c7cc7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Feb 2021 14:18:55 +0100 Subject: [PATCH 276/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20frenck/acti?= =?UTF-8?q?on-yamllint=20from=20v1.0.2=20to=20v1.1=20(#177)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [frenck/action-yamllint](https://github.com/frenck/action-yamllint) from v1.0.2 to v1.1. - [Release notes](https://github.com/frenck/action-yamllint/releases) - [Commits](https://github.com/frenck/action-yamllint/compare/v1.0.2...e21bcc770907b7207a05453ca9f1eb7129c945d1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 22b1bf3..d99235c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -94,7 +94,7 @@ jobs: - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2.3.4 - name: 🚀 Run YAMLLint - uses: frenck/action-yamllint@v1.0.2 + uses: frenck/action-yamllint@v1.1 lint-prettier: name: Prettier From d6ef8a59a68e0ab09391e903a60df52fc48a2338 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Feb 2021 11:45:34 +0100 Subject: [PATCH 277/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20actionshub/?= =?UTF-8?q?markdownlint=20from=202.0.0=20to=202.0.2=20(#179)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actionshub/markdownlint](https://github.com/actionshub/markdownlint) from 2.0.0 to 2.0.2. - [Release notes](https://github.com/actionshub/markdownlint/releases) - [Changelog](https://github.com/actionshub/markdownlint/blob/master/CHANGELOG.md) - [Commits](https://github.com/actionshub/markdownlint/compare/2.0.0...4668c0321d5e398f4776e88e0f87d203dec0fd99) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d99235c..dcc64cd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -74,7 +74,7 @@ jobs: - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2.3.4 - name: 🚀 Run mdl - uses: actionshub/markdownlint@2.0.0 + uses: actionshub/markdownlint@2.0.2 lint-shellcheck: name: Shellcheck From 41e62a8594862e4d5ce83c0b296fe423f666e079 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Feb 2021 13:00:37 +0100 Subject: [PATCH 278/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20actions/cac?= =?UTF-8?q?he=20from=20v2.1.3=20to=20v2.1.4=20(#178)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/cache](https://github.com/actions/cache) from v2.1.3 to v2.1.4. - [Release notes](https://github.com/actions/cache/releases) - [Commits](https://github.com/actions/cache/compare/v2.1.3...26968a09c0ea4f3e233fdddbafd1166051a095f6) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index dcc64cd..c7fcd50 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -129,7 +129,7 @@ jobs: uses: actions/checkout@v2.3.4 - name: 🏗 Set up build cache id: cache - uses: actions/cache@v2.1.3 + uses: actions/cache@v2.1.4 with: path: /tmp/.docker-cache key: docker-${{ github.ref }}-${{ matrix.architecture }}-${{ github.sha }} diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 1190d75..112597d 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -68,7 +68,7 @@ jobs: uses: actions/checkout@v2.3.4 - name: 🏗 Set up build cache id: cache - uses: actions/cache@v2.1.3 + uses: actions/cache@v2.1.4 with: path: /tmp/.docker-cache key: docker-${{ github.ref }}-${{ matrix.architecture }}-${{ github.sha }} From 16b4f0788564dd21d75352fd72e21cf442afc5c6 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 5 Feb 2021 21:28:20 +0100 Subject: [PATCH 279/778] :arrow_up: Upgrades Home Assistant CLI to v4.10.1 (#180) --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index d67debc..2169285 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -86,7 +86,7 @@ RUN \ && ls -la /root/.code-server/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.10.0/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.10.1/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From 4bd20c7e3da63e990f0a2aa63c950891c9cfc4f9 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 6 Feb 2021 15:48:20 +0100 Subject: [PATCH 280/778] :arrow_up: Upgrades unzip to 6.0-23+deb10u2 (#182) --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 2169285..81d1777 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -39,7 +39,7 @@ RUN \ openssl=1.1.1d-0+deb10u4 \ python3-dev=3.7.3-1 \ python3=3.7.3-1 \ - unzip=6.0-23+deb10u1 \ + unzip=6.0-23+deb10u2 \ uuid-runtime=2.33.1-0.1 \ wget=1.20.1-1.1 \ zip=3.0-11+b1 \ From 42aec022cbd8b9e32c09078a799f11b442debad2 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 6 Feb 2021 15:56:59 +0100 Subject: [PATCH 281/778] :arrow_up: Upgrades code-server to 3.8.1 (#181) --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 81d1777..dee9249 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -53,7 +53,7 @@ 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/v3.8.0/code-server-3.8.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.8.1/code-server-3.8.1-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From ee36e266e4e478b2d4f8bbda9d0af3f4a8cbe69f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 6 Feb 2021 15:58:52 +0100 Subject: [PATCH 282/778] :arrow_up: Upgrades keesschollaart.vscode-home-assistant to 1.14.1 (#183) --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 2eb2bc2..43d9813 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.10.0 esbenp.prettier-vscode#5.8.0 ESPHome.esphome-vscode#0.3.0 -keesschollaart.vscode-home-assistant#1.14.0 +keesschollaart.vscode-home-assistant#1.14.1 lukas-tr.materialdesignicons-intellisense#3.1.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 From 75ca093b675c073c8863f9730a618f3fffc44fe6 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 6 Feb 2021 16:16:34 +0100 Subject: [PATCH 283/778] :arrow_up: Upgrades esbenp.prettier-vscode to 5.9.1 (#184) --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 43d9813..d37517c 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.10.0 -esbenp.prettier-vscode#5.8.0 +esbenp.prettier-vscode#5.9.1 ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.14.1 lukas-tr.materialdesignicons-intellisense#3.1.0 From 8900905b99a9dc63b9ad79ec06cc4b98d732537b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Feb 2021 13:00:49 +0100 Subject: [PATCH 284/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20actions/sta?= =?UTF-8?q?le=20from=20v3.0.15=20to=20v3.0.16=20(#185)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/stale](https://github.com/actions/stale) from v3.0.15 to v3.0.16. - [Release notes](https://github.com/actions/stale/releases) - [Commits](https://github.com/actions/stale/compare/v3.0.15...9d6f46564a515a9ea11e7762ab3957ee58ca50da) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/stale.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml index 04ee634..f5d6bdf 100644 --- a/.github/workflows/stale.yaml +++ b/.github/workflows/stale.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 🚀 Run stale - uses: actions/stale@v3.0.15 + uses: actions/stale@v3.0.16 with: repo-token: ${{ secrets.GITHUB_TOKEN }} days-before-stale: 30 From ce707ad22ce19ea5fc96c7b74dd860d52e8d4a43 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 8 Feb 2021 15:38:32 +0100 Subject: [PATCH 285/778] Update add-on configuration for Supervisor 2021.2 (#186) --- .github/workflows/ci.yaml | 2 +- vscode/config.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c7fcd50..892a5f6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,7 @@ jobs: - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2.3.4 - name: 🚀 Run Add-on Lint - uses: frenck/action-addon-linter@v1.4 + uses: frenck/action-addon-linter@v2.0.0 with: community: true path: "./${{ needs.information.outputs.target }}" diff --git a/vscode/config.json b/vscode/config.json index 9e9dd89..2c186b3 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -10,7 +10,7 @@ "startup": "services", "init": false, "arch": ["aarch64", "amd64"], - "auto_uart": true, + "uart": true, "hassio_api": true, "hassio_role": "manager", "homeassistant_api": true, From 8a1f1bbfa1ffc21623a6e37d841beca2efe5c4c5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 13 Feb 2021 13:07:34 +0100 Subject: [PATCH 286/778] Upgrades code-server to 3.9.0 (#187) --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index dee9249..3e7f894 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -53,7 +53,7 @@ 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/v3.8.1/code-server-3.8.1-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.9.0/code-server-3.9.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 0698f75b6dfb6309cfa74141a8a343411d0e2da0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Feb 2021 12:42:07 +0100 Subject: [PATCH 287/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20release-dra?= =?UTF-8?q?fter/release-drafter=20from=20v5.13.0=20to=20v5.14.0=20(#188)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from v5.13.0 to v5.14.0. - [Release notes](https://github.com/release-drafter/release-drafter/releases) - [Commits](https://github.com/release-drafter/release-drafter/compare/v5.13.0...e5ccf147077e46b0225a80bbe314d795d77bb7a2) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release-drafter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-drafter.yaml b/.github/workflows/release-drafter.yaml index 25f9856..e15b52e 100644 --- a/.github/workflows/release-drafter.yaml +++ b/.github/workflows/release-drafter.yaml @@ -13,6 +13,6 @@ jobs: runs-on: ubuntu-latest steps: - name: 🚀 Run Release Drafter - uses: release-drafter/release-drafter@v5.13.0 + uses: release-drafter/release-drafter@v5.14.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From e01f0c7eda16dbc2e0b8e2c9be6057b1bd5f0519 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Feb 2021 09:33:08 +0100 Subject: [PATCH 288/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20docker/buil?= =?UTF-8?q?d-push-action=20from=20v2.2.2=20to=20v2.3.0=20(#189)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from v2.2.2 to v2.3.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v2.2.2...9379083e426e2e84abb80c8c091f5cdeb7d3fd7a) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 892a5f6..66d29b8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -161,7 +161,7 @@ jobs: exit 1 fi - name: 🚀 Build - uses: docker/build-push-action@v2.2.2 + uses: docker/build-push-action@v2.3.0 with: push: false context: ${{ needs.information.outputs.target }} diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 112597d..ed75326 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -106,7 +106,7 @@ jobs: username: ${{ secrets.GHCR_USERNAME }} password: ${{ secrets.GHCR_PASSWORD }} - name: 🚀 Build and push - uses: docker/build-push-action@v2.2.2 + uses: docker/build-push-action@v2.3.0 with: push: true # yamllint disable rule:line-length From 151ca2b175e852696b25aaf8673525114cf93474 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Feb 2021 09:09:38 +0100 Subject: [PATCH 289/778] :arrow_up: Bump actions/stale from v3.0.16 to v3.0.17 (#190) --- .github/workflows/stale.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml index f5d6bdf..cfdc481 100644 --- a/.github/workflows/stale.yaml +++ b/.github/workflows/stale.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 🚀 Run stale - uses: actions/stale@v3.0.16 + uses: actions/stale@v3.0.17 with: repo-token: ${{ secrets.GITHUB_TOKEN }} days-before-stale: 30 From a74e15767928331bae58e05ac98edb66370abb72 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 1 Mar 2021 18:50:52 +0100 Subject: [PATCH 290/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20esbenp.?= =?UTF-8?q?prettier-vscode=20to=205.9.2=20(#191)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index d37517c..c73794b 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.10.0 -esbenp.prettier-vscode#5.9.1 +esbenp.prettier-vscode#5.9.2 ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.14.1 lukas-tr.materialdesignicons-intellisense#3.1.0 From 92d0579121d4de02922cc41e5ee5a02400cc834f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Mar 2021 10:31:29 +0100 Subject: [PATCH 291/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20actions/sta?= =?UTF-8?q?le=20from=20v3.0.17=20to=20v3.0.18=20(#192)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/stale](https://github.com/actions/stale) from v3.0.17 to v3.0.18. - [Release notes](https://github.com/actions/stale/releases) - [Commits](https://github.com/actions/stale/compare/v3.0.17...3b3c3f03cd4d8e2b61e179ef744a0d20efbe90b4) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/stale.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml index cfdc481..e7cfe89 100644 --- a/.github/workflows/stale.yaml +++ b/.github/workflows/stale.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 🚀 Run stale - uses: actions/stale@v3.0.17 + uses: actions/stale@v3.0.18 with: repo-token: ${{ secrets.GITHUB_TOKEN }} days-before-stale: 30 From 41333695bf6bf6f911d9ed908fc0c803b32a8bef Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 8 Mar 2021 19:55:55 +0100 Subject: [PATCH 292/778] :arrow_up: Upgrades add-on base image to v4.1.3 (#193) --- vscode/Dockerfile | 2 +- vscode/build.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 3e7f894..6b1dfaf 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.1.2 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.1.3 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.json b/vscode/build.json index 616ce96..fae0692 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { "build_from": { - "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:4.1.2", - "amd64": "ghcr.io/hassio-addons/debian-base/amd64:4.1.2" + "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:4.1.3", + "amd64": "ghcr.io/hassio-addons/debian-base/amd64:4.1.3" } } From 711e7c4302a39bf935b31de9346508f4924ecc0c Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 8 Mar 2021 19:56:05 +0100 Subject: [PATCH 293/778] :arrow_up: Upgrades emilast.LogFileHighlighter to 2.11.0 (#195) --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index c73794b..ce5aacd 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#2.10.0 +emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#5.9.2 ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.14.1 From 54c98a0adbe3b8788b17f38266e544c1f4415089 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 8 Mar 2021 19:59:12 +0100 Subject: [PATCH 294/778] :arrow_up: Upgrades redhat.vscode-yaml to 0.16.0 (#196) --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index ce5aacd..364f976 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -5,5 +5,5 @@ keesschollaart.vscode-home-assistant#1.14.1 lukas-tr.materialdesignicons-intellisense#3.1.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 -redhat.vscode-yaml#0.14.0 +redhat.vscode-yaml#0.16.0 usernamehw.errorlens#3.2.4 From 276cbe0a7331f031f30921a3be21864b676a7349 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 8 Mar 2021 20:13:52 +0100 Subject: [PATCH 295/778] :arrow_up: Upgrades code-server to 3.9.1 (#194) --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 6b1dfaf..0e30ab8 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -53,7 +53,7 @@ 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/v3.9.0/code-server-3.9.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.9.1/code-server-3.9.1-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From a96ab4214273627b6dd858833485ed0499b2b9f9 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 15 Mar 2021 22:49:49 +0100 Subject: [PATCH 296/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20Home=20?= =?UTF-8?q?Assistant=20CLI=20to=20v4.11.0=20(#198)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 0e30ab8..96cd152 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -86,7 +86,7 @@ RUN \ && ls -la /root/.code-server/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.10.1/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.11.0/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From 56510523e1d1409f53de6ad9de68d290e1f4cb85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Mar 2021 09:16:43 +0100 Subject: [PATCH 297/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20release-dra?= =?UTF-8?q?fter/release-drafter=20from=20v5.14.0=20to=20v5.15.0=20(#201)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [release-drafter/release-drafter](https://github.com/release-drafter/release-drafter) from v5.14.0 to v5.15.0. - [Release notes](https://github.com/release-drafter/release-drafter/releases) - [Commits](https://github.com/release-drafter/release-drafter/compare/v5.14.0...fe52e97d262833ae07d05efaf1a239df3f1b5cd4) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release-drafter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-drafter.yaml b/.github/workflows/release-drafter.yaml index e15b52e..06cc26a 100644 --- a/.github/workflows/release-drafter.yaml +++ b/.github/workflows/release-drafter.yaml @@ -13,6 +13,6 @@ jobs: runs-on: ubuntu-latest steps: - name: 🚀 Run Release Drafter - uses: release-drafter/release-drafter@v5.14.0 + uses: release-drafter/release-drafter@v5.15.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 1e59a88618c4962462df6efa6858e66e1b17a7ed Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 22 Mar 2021 18:39:03 +0100 Subject: [PATCH 298/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20esbenp.?= =?UTF-8?q?prettier-vscode=20to=206.3.1=20(#205)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 364f976..4768704 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.11.0 -esbenp.prettier-vscode#5.9.2 +esbenp.prettier-vscode#6.3.1 ESPHome.esphome-vscode#0.3.0 keesschollaart.vscode-home-assistant#1.14.1 lukas-tr.materialdesignicons-intellisense#3.1.0 From 34536f4b254d938e59e784ad2b409aeabe5a51ca Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 22 Mar 2021 18:50:32 +0100 Subject: [PATCH 299/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20usernam?= =?UTF-8?q?ehw.errorlens=20to=203.2.5=20(#206)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 4768704..d48e0ae 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -6,4 +6,4 @@ lukas-tr.materialdesignicons-intellisense#3.1.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 redhat.vscode-yaml#0.16.0 -usernamehw.errorlens#3.2.4 +usernamehw.errorlens#3.2.5 From a1945dfd8a9f90080e365b2c54d5cba9e011d88f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 22 Mar 2021 18:52:35 +0100 Subject: [PATCH 300/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20Home=20?= =?UTF-8?q?Assistant=20CLI=20to=20v4.11.2=20(#204)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ⬆️ Upgrades Home Assistant CLI to v4.11.1 * ⬆️ Upgrades Home Assistant CLI to v4.11.2 --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 96cd152..9e39982 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -86,7 +86,7 @@ RUN \ && ls -la /root/.code-server/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.11.0/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.11.2/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From 5303aed86ae7567b66d6e6125a13c94c65d8f2cc Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 22 Mar 2021 19:03:41 +0100 Subject: [PATCH 301/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20ESPHome?= =?UTF-8?q?.esphome-vscode=20to=200.13.0=20(#207)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index d48e0ae..0fff9f0 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#6.3.1 -ESPHome.esphome-vscode#0.3.0 +ESPHome.esphome-vscode#0.13.0 keesschollaart.vscode-home-assistant#1.14.1 lukas-tr.materialdesignicons-intellisense#3.1.0 netcorext.uuid-generator#0.0.4 From 3a1695e89750603afe4fece93fb865747433ce16 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Mar 2021 11:45:59 +0100 Subject: [PATCH 302/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20frenck/acti?= =?UTF-8?q?on-addon-linter=20from=20v2.0.0=20to=20v2.1=20(#208)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [frenck/action-addon-linter](https://github.com/frenck/action-addon-linter) from v2.0.0 to v2.1. - [Release notes](https://github.com/frenck/action-addon-linter/releases) - [Commits](https://github.com/frenck/action-addon-linter/compare/v2.0.0...c78e9c97c40f706d88152a577cdf726c83cad5b0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 66d29b8..cf92865 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,7 @@ jobs: - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2.3.4 - name: 🚀 Run Add-on Lint - uses: frenck/action-addon-linter@v2.0.0 + uses: frenck/action-addon-linter@v2.1 with: community: true path: "./${{ needs.information.outputs.target }}" From 09203fde74f78011ae39a03b780983731ba374ff Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 23 Mar 2021 14:04:30 +0100 Subject: [PATCH 303/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.15.0=20(#209)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 0fff9f0..4f1fecb 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#6.3.1 ESPHome.esphome-vscode#0.13.0 -keesschollaart.vscode-home-assistant#1.14.1 +keesschollaart.vscode-home-assistant#1.15.0 lukas-tr.materialdesignicons-intellisense#3.1.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 From a9323fe97084a6890bd10a7e51949c68bf332e6a Mon Sep 17 00:00:00 2001 From: Mike Degatano Date: Tue, 23 Mar 2021 09:10:11 -0400 Subject: [PATCH 304/778] Common directories in /root like SSH add-on (#197) --- vscode/DOCS.md | 4 +++- vscode/rootfs/etc/cont-init.d/user.sh | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/vscode/DOCS.md b/vscode/DOCS.md index 4479224..2fbe7c3 100644 --- a/vscode/DOCS.md +++ b/vscode/DOCS.md @@ -62,7 +62,9 @@ you are troubleshooting. This option allows you to override the default path the add-on will open when accessing the web interface. For example, use a different -configuration directory like `/share/myconfig` instead of `/config`. +configuration directory like `/share/myconfig` instead of `/config`. If set +to `/root` then all the common folders of HA such as `/config`, `/ssl`, +`/share`, etc. will appear as subfolders for each access. When not configured, the addon will automatically use the default: `/config` diff --git a/vscode/rootfs/etc/cont-init.d/user.sh b/vscode/rootfs/etc/cont-init.d/user.sh index aca6c2e..8123e6a 100644 --- a/vscode/rootfs/etc/cont-init.d/user.sh +++ b/vscode/rootfs/etc/cont-init.d/user.sh @@ -3,11 +3,18 @@ # Home Assistant Community Add-on: Visual Studio Code # Persists user settings and installs custom user packages. # ============================================================================== +readonly -a DIRECTORIES=(addons backup config media share ssl) readonly GIT_USER_PATH=/data/git readonly SSH_USER_PATH=/data/.ssh readonly ZSH_HISTORY_FILE=/root/.zsh_history 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}" \ + || bashio::log.warning "Failed linking common directory: ${dir}" +done + # Store SSH settings in add-on data folder if ! bashio::fs.directory_exists "${SSH_USER_PATH}"; then mkdir -p "${SSH_USER_PATH}" \ From 32731bb655eb86f6b160f9be718125372584af5e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 24 Mar 2021 14:35:52 +0100 Subject: [PATCH 305/778] Assign ESPHome files to the ESPHome extension (#211) --- vscode/rootfs/etc/cont-init.d/code-server.sh | 1 + vscode/rootfs/root/.code-server/settings.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index 3a29339..13d0e0d 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -16,6 +16,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( c5b8acf06ef6d9a2435e9ddb92cb9fce7cfbfe4a2206b0e0c3c4ed514cc926f8d3c662e694a995d102b5ba939056f93201c220558e06e1cd0872bfb1995ba148 08d86c84a0d80720b22712e878963e90cbb34b659330dad8a823f3c5c7f0ae043d197a5e3020dd7ab4fda3625e17f794675ec074984951e7107db2488898a8d0 5243d7664d30b5aa0c45fbe1089cccdf85c5ade17cddd97e21b3a29ccb37b20d20bdfecc141ad6e1a7aa5ea8ee61695a79a43140a2d53f9f91687bc61f7e496c + e5106aaaff5f67a693fd49deb7dd52f1cc0f7ba542b33c99c0099bf58f1a33c789d1c5e3803dea2942540c07c734f3ca317c3cc91673aff388cb79ee7112db0b ) if bashio::config.has_value 'config_path'; then diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index 3611169..84d952e 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -1,7 +1,7 @@ { "files.associations": { "*.dash": "yaml", - "**/esphome/*.yaml": "yaml", + "**/esphome/*.yaml": "esphome", "*.yaml": "home-assistant" }, "files.watcherExclude": { From b92f9aa4b830cf4f53a5940c08ba0bd1805745d3 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 24 Mar 2021 15:04:14 +0100 Subject: [PATCH 306/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.16.0=20(#212)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 4f1fecb..c638d70 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#6.3.1 ESPHome.esphome-vscode#0.13.0 -keesschollaart.vscode-home-assistant#1.15.0 +keesschollaart.vscode-home-assistant#1.16.0 lukas-tr.materialdesignicons-intellisense#3.1.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 From ae51d954c56da313fbbc7f64252797bbc6212f6b Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 24 Mar 2021 15:11:35 +0100 Subject: [PATCH 307/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20Home=20?= =?UTF-8?q?Assistant=20CLI=20to=20v4.11.3=20(#213)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 9e39982..5bf6f50 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -86,7 +86,7 @@ RUN \ && ls -la /root/.code-server/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.11.2/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.11.3/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From f00a28d6aa81db377605300d7e84057047ddb206 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 5 Apr 2021 13:03:21 +0200 Subject: [PATCH 308/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=20v4.1.4=20(#220)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- vscode/build.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 5bf6f50..6edc71c 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.1.3 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.1.4 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.json b/vscode/build.json index fae0692..1a6f736 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { "build_from": { - "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:4.1.3", - "amd64": "ghcr.io/hassio-addons/debian-base/amd64:4.1.3" + "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:4.1.4", + "amd64": "ghcr.io/hassio-addons/debian-base/amd64:4.1.4" } } From 0272999ac85e003bff25b6c3a8ad75a09ee9767a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 5 Apr 2021 13:04:44 +0200 Subject: [PATCH 309/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20openssl?= =?UTF-8?q?=20to=201.1.1d-0+deb10u6=20(#221)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 6edc71c..73f49cf 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -36,7 +36,7 @@ RUN \ net-tools=1.60+git20180626.aebd88e-1 \ nmap=7.70+dfsg1-6+deb10u1 \ openssh-client=1:7.9p1-10+deb10u2 \ - openssl=1.1.1d-0+deb10u4 \ + openssl=1.1.1d-0+deb10u6 \ python3-dev=3.7.3-1 \ python3=3.7.3-1 \ unzip=6.0-23+deb10u2 \ From 7b7b8de55f7d9f881c571f2a6fc2e9d4ae32ef05 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 5 Apr 2021 13:08:06 +0200 Subject: [PATCH 310/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20iputils?= =?UTF-8?q?-ping=20to=203:20180629-2+deb10u2=20(#222)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 73f49cf..ecdb64b 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -29,7 +29,7 @@ RUN \ build-essential=12.6 \ colordiff=1.0.18-1 \ git=1:2.20.1-2+deb10u3 \ - iputils-ping=3:20180629-2+deb10u1 \ + iputils-ping=3:20180629-2+deb10u2 \ locales=2.28-10 \ mariadb-client=1:10.3.27-0+deb10u1 \ mosquitto-clients=1.5.7-1+deb10u1 \ From 1dcfa9ac21b1d43bd11b76957ebd1cac8bdf7203 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Apr 2021 13:21:11 +0200 Subject: [PATCH 311/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20ludeeus/act?= =?UTF-8?q?ion-shellcheck=20from=201.0.0=20to=201.1.0=20(#217)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [ludeeus/action-shellcheck](https://github.com/ludeeus/action-shellcheck) from 1.0.0 to 1.1.0. - [Release notes](https://github.com/ludeeus/action-shellcheck/releases) - [Commits](https://github.com/ludeeus/action-shellcheck/compare/1.0.0...94e0aab03ca135d11a35e5bfc14e6746dc56e7e9) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cf92865..af702f2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -83,7 +83,7 @@ jobs: - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2.3.4 - name: 🚀 Run Shellcheck - uses: ludeeus/action-shellcheck@1.0.0 + uses: ludeeus/action-shellcheck@1.1.0 env: SHELLCHECK_OPTS: -s bash From 282c1dba8182dfdfab5d755d99a55b4a29b76ca8 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 5 Apr 2021 14:47:55 +0200 Subject: [PATCH 312/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=203.9.2=20(#223)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ecdb64b..eb462cd 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -53,7 +53,7 @@ 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/v3.9.1/code-server-3.9.1-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.9.2/code-server-3.9.2-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 779374b558c677917284928a72c4e758d349cd68 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 5 Apr 2021 17:54:18 +0200 Subject: [PATCH 313/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20esbenp.?= =?UTF-8?q?prettier-vscode=20to=206.3.2=20(#224)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index c638d70..832d187 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.11.0 -esbenp.prettier-vscode#6.3.1 +esbenp.prettier-vscode#6.3.2 ESPHome.esphome-vscode#0.13.0 keesschollaart.vscode-home-assistant#1.16.0 lukas-tr.materialdesignicons-intellisense#3.1.0 From 6629914ddbe2dfaec4be2c69344572ea61d025a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Apr 2021 13:01:34 +0200 Subject: [PATCH 314/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20docker/buil?= =?UTF-8?q?d-push-action=20from=20v2.3.0=20to=20v2.4.0=20(#226)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from v2.3.0 to v2.4.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v2.3.0...e1b7f96249f2e4c8e4ac1519b9608c0d48944a1f) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index af702f2..fb4cf8f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -161,7 +161,7 @@ jobs: exit 1 fi - name: 🚀 Build - uses: docker/build-push-action@v2.3.0 + uses: docker/build-push-action@v2.4.0 with: push: false context: ${{ needs.information.outputs.target }} diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index ed75326..774a727 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -106,7 +106,7 @@ jobs: username: ${{ secrets.GHCR_USERNAME }} password: ${{ secrets.GHCR_PASSWORD }} - name: 🚀 Build and push - uses: docker/build-push-action@v2.3.0 + uses: docker/build-push-action@v2.4.0 with: push: true # yamllint disable rule:line-length From fa8a8a54e3d65b265ee916a61c4d456ee5738e44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Apr 2021 14:00:21 +0200 Subject: [PATCH 315/778] :arrow_up: Bump yamllint from 1.26.0 to 1.26.1 in /vscode (#228) --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 139f158..e686ae0 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ homeassistant_cli==0.9.1 -yamllint==1.26.0 +yamllint==1.26.1 From fb8b24aaf24331f34069a6b52006c35162832bf4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 11:34:15 +0200 Subject: [PATCH 316/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20docker/setu?= =?UTF-8?q?p-buildx-action=20from=20v1.1.1=20to=20v1.1.2=20(#229)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from v1.1.1 to v1.1.2. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1.1.1...2a4b53665e15ce7d7049afb11ff1f70ff1610609) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fb4cf8f..98bb8e1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -138,7 +138,7 @@ jobs: - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.0.1 - name: 🏗 Set up Docker Buildx - uses: docker/setup-buildx-action@v1.1.1 + uses: docker/setup-buildx-action@v1.1.2 - name: ℹ️ Compose build flags id: flags run: | diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 774a727..7c69dd8 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -77,7 +77,7 @@ jobs: - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.0.1 - name: 🏗 Set up Docker Buildx - uses: docker/setup-buildx-action@v1.1.1 + uses: docker/setup-buildx-action@v1.1.2 - name: ℹ️ Compose build flags id: flags run: | From a7aae154b5b92d40d667d4462720f54b558125f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Apr 2021 13:05:19 +0200 Subject: [PATCH 317/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20docker/setu?= =?UTF-8?q?p-qemu-action=20from=20v1.0.1=20to=20v1.0.2=20(#230)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from v1.0.1 to v1.0.2. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v1.0.1...25f0500ff22e406f7191a2a8ba8cda16901ca018) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 98bb8e1..9c7696a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -136,7 +136,7 @@ jobs: restore-keys: | docker-${{ github.ref }}-${{ matrix.architecture }} - name: 🏗 Set up QEMU - uses: docker/setup-qemu-action@v1.0.1 + uses: docker/setup-qemu-action@v1.0.2 - name: 🏗 Set up Docker Buildx uses: docker/setup-buildx-action@v1.1.2 - name: ℹ️ Compose build flags diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 7c69dd8..fae0231 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -75,7 +75,7 @@ jobs: restore-keys: | docker-${{ github.ref }}-${{ matrix.architecture }} - name: 🏗 Set up QEMU - uses: docker/setup-qemu-action@v1.0.1 + uses: docker/setup-qemu-action@v1.0.2 - name: 🏗 Set up Docker Buildx uses: docker/setup-buildx-action@v1.1.2 - name: ℹ️ Compose build flags From 0c9a477d632ad2c71a45494a20c200984695289d Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 9 Apr 2021 09:33:02 +0200 Subject: [PATCH 318/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=203.9.3=20(#231)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index eb462cd..172c195 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -53,7 +53,7 @@ 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/v3.9.2/code-server-3.9.2-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.9.3/code-server-3.9.3-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 51fddffa22179a5f505268aa4900d248c4ad2477 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 10 Apr 2021 12:05:30 +0200 Subject: [PATCH 319/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20Home=20?= =?UTF-8?q?Assistant=20CLI=20to=20v4.12.0=20(#232)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 172c195..0fdb492 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -86,7 +86,7 @@ RUN \ && ls -la /root/.code-server/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.11.3/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.12.0/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From e7d17960541dd554ae9eb2c3b92a9dc99d223a3e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Apr 2021 16:55:22 +0200 Subject: [PATCH 320/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20actions/cac?= =?UTF-8?q?he=20from=20v2.1.4=20to=20v2.1.5=20(#234)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/cache](https://github.com/actions/cache) from v2.1.4 to v2.1.5. - [Release notes](https://github.com/actions/cache/releases) - [Commits](https://github.com/actions/cache/compare/v2.1.4...1a9e2138d905efd099035b49d8b7a3888c653ca8) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9c7696a..baf4647 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -129,7 +129,7 @@ jobs: uses: actions/checkout@v2.3.4 - name: 🏗 Set up build cache id: cache - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: /tmp/.docker-cache key: docker-${{ github.ref }}-${{ matrix.architecture }}-${{ github.sha }} diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index fae0231..71e1df8 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -68,7 +68,7 @@ jobs: uses: actions/checkout@v2.3.4 - name: 🏗 Set up build cache id: cache - uses: actions/cache@v2.1.4 + uses: actions/cache@v2.1.5 with: path: /tmp/.docker-cache key: docker-${{ github.ref }}-${{ matrix.architecture }}-${{ github.sha }} From af84a5e402b1fc6646d5335aeebd8a9bcf796bda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Apr 2021 11:05:17 +0200 Subject: [PATCH 321/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20brpaz/hadol?= =?UTF-8?q?int-action=20from=20v1.3.1=20to=20v1.4.0=20(#236)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [brpaz/hadolint-action](https://github.com/brpaz/hadolint-action) from v1.3.1 to v1.4.0. - [Release notes](https://github.com/brpaz/hadolint-action/releases) - [Changelog](https://github.com/hadolint/hadolint-action/blob/master/.releaserc) - [Commits](https://github.com/brpaz/hadolint-action/compare/v1.3.1...473e36ba306c199243ffe4f1e652a8b60a8fa296) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index baf4647..4998b47 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -52,7 +52,7 @@ jobs: - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2.3.4 - name: 🚀 Run Hadolint - uses: brpaz/hadolint-action@v1.3.1 + uses: brpaz/hadolint-action@v1.4.0 with: dockerfile: "./${{ needs.information.outputs.target }}/Dockerfile" From fc3a75c872ad9ab0dacf1fa5240176addf6d5621 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 08:21:46 +0200 Subject: [PATCH 322/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20docker/logi?= =?UTF-8?q?n-action=20from=20v1.8.0=20to=20v1.9.0=20(#242)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/login-action](https://github.com/docker/login-action) from v1.8.0 to v1.9.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v1.8.0...28218f9b04b4f3f62068d7b6ce6ca5b26e35336c) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 71e1df8..fcc22af 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -100,7 +100,7 @@ jobs: exit 1 fi - name: 🏗 Login to GitHub Container Registry - uses: docker/login-action@v1.8.0 + uses: docker/login-action@v1.9.0 with: registry: ghcr.io username: ${{ secrets.GHCR_USERNAME }} From 8ed963ebee88660f5ed7e947eaf7986358686b20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 08:21:53 +0200 Subject: [PATCH 323/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20docker/setu?= =?UTF-8?q?p-qemu-action=20from=20v1.0.2=20to=20v1.1.0=20(#240)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from v1.0.2 to v1.1.0. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v1.0.2...c308fdd69d26ed66f4506ebd74b180abe5362145) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4998b47..2cda1fc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -136,7 +136,7 @@ jobs: restore-keys: | docker-${{ github.ref }}-${{ matrix.architecture }} - name: 🏗 Set up QEMU - uses: docker/setup-qemu-action@v1.0.2 + uses: docker/setup-qemu-action@v1.1.0 - name: 🏗 Set up Docker Buildx uses: docker/setup-buildx-action@v1.1.2 - name: ℹ️ Compose build flags diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index fcc22af..f1b1939 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -75,7 +75,7 @@ jobs: restore-keys: | docker-${{ github.ref }}-${{ matrix.architecture }} - name: 🏗 Set up QEMU - uses: docker/setup-qemu-action@v1.0.2 + uses: docker/setup-qemu-action@v1.1.0 - name: 🏗 Set up Docker Buildx uses: docker/setup-buildx-action@v1.1.2 - name: ℹ️ Compose build flags From 46c4930b759b5bf58701e9233408b05378bb447f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 08:21:59 +0200 Subject: [PATCH 324/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20docker/setu?= =?UTF-8?q?p-buildx-action=20from=20v1.1.2=20to=20v1.2.0=20(#241)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from v1.1.2 to v1.2.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1.1.2...012185ccbeb554a7f5f987bea0f1a73519b3cdf5) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2cda1fc..d966049 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -138,7 +138,7 @@ jobs: - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.1.0 - name: 🏗 Set up Docker Buildx - uses: docker/setup-buildx-action@v1.1.2 + uses: docker/setup-buildx-action@v1.2.0 - name: ℹ️ Compose build flags id: flags run: | diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index f1b1939..116bd37 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -77,7 +77,7 @@ jobs: - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.1.0 - name: 🏗 Set up Docker Buildx - uses: docker/setup-buildx-action@v1.1.2 + uses: docker/setup-buildx-action@v1.2.0 - name: ℹ️ Compose build flags id: flags run: | From eddbdbbb07eaa93a533cbd3532fe7958a36e6c4b Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 30 Apr 2021 08:30:02 +0200 Subject: [PATCH 325/778] Address shellcheck lint warning (#243) * Address shellcheck lint warning * I wish there was a standard for this stuff --- vscode/rootfs/root/.zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/rootfs/root/.zshrc b/vscode/rootfs/root/.zshrc index 11ad862..f33bab2 100755 --- a/vscode/rootfs/root/.zshrc +++ b/vscode/rootfs/root/.zshrc @@ -63,6 +63,7 @@ plugins=( zsh-syntax-highlighting ) +# shellcheck disable=SC1091 source $ZSH/oh-my-zsh.sh # User configuration From 55af4f750c46580ea92dcebc540f4b0134e453d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 17:22:06 +0200 Subject: [PATCH 326/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20docker/setu?= =?UTF-8?q?p-buildx-action=20from=20v1.2.0=20to=20v1.3.0=20(#244)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from v1.2.0 to v1.3.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1.2.0...0d135e0c2fc0dba0729c1a47ecfcf5a3c7f8579e) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d966049..f29aca8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -138,7 +138,7 @@ jobs: - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.1.0 - name: 🏗 Set up Docker Buildx - uses: docker/setup-buildx-action@v1.2.0 + uses: docker/setup-buildx-action@v1.3.0 - name: ℹ️ Compose build flags id: flags run: | diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 116bd37..491424f 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -77,7 +77,7 @@ jobs: - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.1.0 - name: 🏗 Set up Docker Buildx - uses: docker/setup-buildx-action@v1.2.0 + uses: docker/setup-buildx-action@v1.3.0 - name: ℹ️ Compose build flags id: flags run: | From 4e491ada0db10206abd418f602c6aeb767b5274a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 4 May 2021 18:19:22 +0200 Subject: [PATCH 327/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=20v4.2.0=20(#245)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- vscode/build.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 0fdb492..578200d 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.1.4 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.2.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.json b/vscode/build.json index 1a6f736..c89c83d 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { "build_from": { - "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:4.1.4", - "amd64": "ghcr.io/hassio-addons/debian-base/amd64:4.1.4" + "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:4.2.0", + "amd64": "ghcr.io/hassio-addons/debian-base/amd64:4.2.0" } } From be84d160308a7744615bc9c4f4f4c0ec07ccbea7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 4 May 2021 20:22:35 +0200 Subject: [PATCH 328/778] Apply updated repository structure & CI workflow (#246) --- .editorconfig | 19 - .../CODE_OF_CONDUCT.md | 0 CONTRIBUTING.md => .github/CONTRIBUTING.md | 0 .github/SECURITY.md | 1839 +++++++++++++++++ .github/workflows/ci.yaml | 21 +- .github/workflows/deploy.yaml | 58 +- .github/workflows/pr-labels.yaml | 21 + 7 files changed, 1932 insertions(+), 26 deletions(-) delete mode 100755 .editorconfig rename CODE_OF_CONDUCT.md => .github/CODE_OF_CONDUCT.md (100%) rename CONTRIBUTING.md => .github/CONTRIBUTING.md (100%) create mode 100644 .github/SECURITY.md create mode 100644 .github/workflows/pr-labels.yaml diff --git a/.editorconfig b/.editorconfig deleted file mode 100755 index 7a12570..0000000 --- a/.editorconfig +++ /dev/null @@ -1,19 +0,0 @@ -root = true - -[*] -charset = utf-8 -end_of_line = lf -indent_style = space -insert_final_newline = true -trim_trailing_whitespace = true -ident_size = 4 - -[*.md] -ident_size = 2 -trim_trailing_whitespace = false - -[*.json] -ident_size = 2 - -[{.gitignore,.gitkeep,.editorconfig}] -ident_size = 2 diff --git a/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md similarity index 100% rename from CODE_OF_CONDUCT.md rename to .github/CODE_OF_CONDUCT.md diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md diff --git a/.github/SECURITY.md b/.github/SECURITY.md new file mode 100644 index 0000000..021b03d --- /dev/null +++ b/.github/SECURITY.md @@ -0,0 +1,1839 @@ +# Security Policy + +I take the security of my software and services seriously. This includes +all open source software I create, maintain or help to maintain. + +If you believe you have found a security vulnerability in any repository +I maintain, including this one, please report it responsible to me as +described below. + +**Please DO NOT report security vulnerabilities publicly!** + +So... DO NOT create a GitHub issue for it ;) + +## Reporting a vulnerability + +Privately and confidently, send me a detailed description of the vulnerability +you have discovered using an encrypted and authenticated channel. Personally, +I prefer this to be done using PGP encrypted email. Contact information +needed for this is listed down below. + +In the report, please include as much information as possible, including: + +- A extensive description of the vulnerability. +- How it could be exploited. +- The potential impact you think it would have (e.g., DOS attackable, privacy + concerns, leaking of credentials). +- Steps for reproducing the vulnerability. +- Code (if any), that is needed for reproducing the issue. +- If you have an idea for a fix, patch or any other adjustment for mitigating + the vulnerability reported. + +Sorry for the long list, but providing as much information as possible allows +me to act more quickly. Make sure to write your report in the English language. + +Please take care not to violate the privacy of other people in your report. +For example, stack traces or exploit scripts sent to me should never contain +private or personally identifiable information. + +## After you have reported the vulnerability + +Give me at least a week to investigate and respond to the reported vulnerability +you have found; and up to 60 days to fix and distribute it. This includes a +window for existing users to upgrade, patch or mitigate the issue as well. + +If you intent, at any point, to disclose the vulnerability to someone else +or maybe even publicly, please give me a reasonable advanced notice. + +If any dependent projects are involved, I will take care of informing the +maintainers of those projects as well. + +## Bug bounty + +Unfortunately, I cannot offer a paid bug bounty program. I will, however, give +my best efforts to show appreciation towards people that took the time and +effort to disclose vulnerabilities responsibly. + +Me, and the open source community, will be forever grateful. + +Oh, and if we ever meet, I'm happy to buy you a beer :) + +## Contact information + +Please contact me, Franck Nijhof, directly on: + +security@frenck.dev (not for support!) + +GPG Fingerprint: `731C 60D6 80E6 E850 F31C 2E88 AB33 ADAC E710 1952` + +https://keys.openpgp.org/search?q=731C60D680E6E850F31C2E88AB33ADACE7101952 + +```txt +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +FHJUUkMAAAIMAAAAIGdUUkMAAAIsAAAAIGJUUkMAAAJMAAAAIGNocm0AAAJsAAAA +JG1sdWMAAAAAAAAAAQAAAAxlblVTAAAAHAAAABwAcwBSAEcAQgAgAGIAdQBpAGwA +dAAtAGkAbgAAbWx1YwAAAAAAAAABAAAADGVuVVMAAAAyAAAAHABOAG8AIABjAG8A +cAB5AHIAaQBnAGgAdAAsACAAdQBzAGUAIABmAHIAZQBlAGwAeQAAAABYWVogAAAA +AAAA9tYAAQAAAADTLXNmMzIAAAAAAAEMSgAABeP///MqAAAHmwAA/Yf///ui///9 +owAAA9gAAMCUWFlaIAAAAAAAAG+UAAA47gAAA5BYWVogAAAAAAAAJJ0AAA+DAAC2 +vlhZWiAAAAAAAABipQAAt5AAABjecGFyYQAAAAAAAwAAAAJmZgAA8qcAAA1ZAAAT +0AAACltwYXJhAAAAAAADAAAAAmZmAADypwAADVkAABPQAAAKW3BhcmEAAAAAAAMA +AAACZmYAAPKnAAANWQAAE9AAAApbY2hybQAAAAAAAwAAAACj1wAAVHsAAEzNAACZ +mgAAJmYAAA9c/8AAEQgAgACAAwESAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAA +AAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNR +YQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZH +SElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Sl +pqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX2 +9/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQE +AwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoW +JDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2 +d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJ +ytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/bAEMACAYGBwYFCAcHBwkJCAoM +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 +73QnlXw4/oDrjt/ZPD2SY9spk8ApQzQbKKSRuGxzZU8irDS5tLtYR9z4j1ulJGWm +j3GvuZjjXSxHy1dwOo8ph2N7b5nmzruXH1wjgppZ48hOcLn/z1dghvh4M8eBvoho +HElMD+bgudYsKEAwQMjPcIbjM+USR9BGSLQ3RnJhbmNrIE5pamhvZiAoRGVhbGVy +RGlyZWN0KSA8Zi5uaWpob2ZAZGVhbGVyZGlyZWN0Lm5sPokCVAQTAQoAPgIbAwIe +AQIXgAULCQgHAwUVCgkICwUWAgMBABYhBHMcYNaA5uhQ8xwuiKszraznEBlSBQJg +eyeWBQkMLyuoAAoJEKszraznEBlSKNkQAKk9a6khEhDigwZWByPcNuv29uNB0m4C +TMKP5kmUXCf1rJcMFc7rxC1JrDiSKUJpeNRJLly4ltp3D3hIt0dWU928CAeHzD9k +veNJZMqA+KLRkjOQt3mQlsWhPN3gCN/oatrVzvchTGInuD5DQj1suPNCCoohgAIR +z248TyTr34cLN16ehAI4PHq9ZL6+V0CbM5a36Dp5nVHtDQQOqUTQzRUGcbQdYtFg +txs9mnODJRt91ykkKi2CBkZP4yzzjdXyAT/2JFBNk/wPNUkHSLZsN5xDwRw44KUG +GqsL4ALMFYv/ITM6lTDDdQyo9g7DOUy36yhpo5nyka+vuvQxeTQouJ4mytaM+5fV +nYd8PGqm+YI9EYKXpWdd55ycVrkD7qGwRPD6OROyn7sLldC6L5HhbexRNywM1qnp +DLd1upPn2LwnqUB4P9W56NxAeVlTrYP2JyZ/1KjtmdmsRnlDv6SIWv+GwLKaVgCr +j0YuAbk4BWQNhEVm38O9vYQPr0ti4A75t6EuHjMc1xrlpTwdMQ30hTu/M3hV6V/P +sLN/YnVVIYvYsokOvPMd5fikOek+CUcxHIkmW1sp5ryDvUDC3wfIXvl70wWsmeU9 +4tN7TJczPIqOynRuNE3nUMMdtrxdU95Auh5BIdFANQNud1SX+E1UCKfs4VIIxNW6 +wNgrzyErU8g5iQIcBBABAgAGBQJYPYAyAAoJEE5+WcG+PB5Y+JUP/0fnrZbh/2uO +vflSKUwb8kt4B2OYsZLdtql5L8ou/go2x6tMV+ciUSq8YkmlhCNzp5up/Qt4iRlo +C/MCAGo3v3Y//65xCz16WoLugXVpQSl3YvGS7dq66b0kPiVEhs67S2dzymG3uvm7 +TtpsHoyREQPSEn10lSXtozu7UsfBK/Zxt+fBF2OpaKWtokem2sNhvRmRfAvfyry7 +THKGEYAcJLgw+lwsunZe3vueCSBiF21P4LkSIcqkfzi5jrw1bsv8E0s+gLm3f5e4 +tNn66v5cWwUblP+i9MhmfitkffxxNDWfJmqHoDMInDoCZbjZRrR2GRgrvgmaU9eD +mlKspgTcE4LPIhTjTq7nAaOGLQ86oV7xU9KCUTzWSGzcL+7M0dCZQf3FrPa8D2Uu +r/I9yQglkkG0kl4yj7uXpdn/5iqVFf5DV/ZiNyIVOdUk1JUT/SBc42bGiqN9w+ev +jkZ+I9vs02JO40spz4MV8PUbJZpZw4eRcc+EuUd8Tw4ox5wDHLrTvvXI8Lg3LZ1G +7CC4ah5RYBQ4MwoljG4KGaCl4inX8hMM1A9hsQ4CoraAeh8LBXSK6pfTZSkWWo3o +8V4CLiDzRP7ofnqzEUMh8JM+NUVKk/KcrmmVFivKaXntu+3VXH56AWb1PIrT2gjR +E5jgwd/4LyEmFWnsDOwyc4KR8SY4C3KtiQI9BBMBCgAnBQJYDvofAhsDBQkDwoLb +BQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEKszraznEBlS7m4QAI0k9eBKf2Wz +LNbgLZ9SpQBHiNYu+vFLZ+ErJ0uTy9Z52ioa7d525MLsjLslS8WFhqiRuo8BXOWV +EIy0aRLazz1ZVK6ul+2Oauzv6pd1Ac+3jgkJDVK2/MQlzFOxkXGyG3h2T2/Wcbqy +YPR4ajTmfaQp6w7wVIdU7irqN5IuF9XkRVWYrk5Hxr/p0LeB50w+n/BQZB/DWetq +O7/ISk4I1ViWv9IkGx7zkqc28hUSaxLHQxsFiAyv2KjX7QkAZ/q0KIlN3FjLLiWn +000bSv200GpTPsUVezLvYWHIqnlTXc1OVYpeVr+sl1ZOiInVQuUKteoayT3D6rQP +Z1I5kBnmCyT9fCa4etljgARyauM7REskE2/0InFOD2oFfI0xq1qE+VxHDVuIp4uJ +veKAv3N+REz9rqyTXyy/rDhCg5pSNnc6WWgwixIlr8iQwg+XVGEl68P+2LcjFj5+ +I5qmTYmbqaPmbaubMK5nSfZthcvQUe5JbaZ+7nhWtmR4l3Qhe+0OAo70W6n7tikT +frbGA/IFTu8FaJfCFlnByoPxgv52RRRxplUNi4hK3K/QdEx0IWS8DDCwvKC5djgL +Sem7jG+EP/826a2YxRM4zF2Oh7Ly0Ob9/no/kSlK5RBlkag7a7kkUuh0pMEbFYJa +soXjsvl2VbbwSBlzClkgdrP4Uv8TMVLZiQI9BBMBCgAnAhsDBQkDwoLbAh4BAheA +BQJYQffRBQsJCAcDBRUKCQgLBRYCAwEAAAoJEKszraznEBlSFegP+wSnfaykt8aB +xR3lQ35nVANyhgc97TCjmtAuPvsbbrWt2vlCBqpG1Zt4YIx9BS0qB4C9uVbQgzUY +awwb97wDutCtY8kbCFb/Hc5T2y6QZo7ezXROPKa0R5qqAzVRBUdi17aa3XoQTSs0 +Ln2OpvnXMaPpw2oHPORbZIN4/VgyeZ3Xmf/gFHF1JwSD6ruKZg8Hqw6VHFcpdJif +56B4nTYYUgYq5/2SmdoLRXQ+jkheFnWZgwnBVEt0IrmAYlEBZe6Y3JBiikIVyMav +NGYrVIWVqK1Uk8nvYh5sZBmnGceTPH/qEUYCew3yucsZXRtP0UwqhU8qPH9CDoJ4 +uKVBYglyY22jv+ZQwhJY67SAiV03g7v3PluLBQ7rF5jBZytkyEh+YGOY45PiYbEC +ex50Pr5Z8u9WX6jS9oxv4eIO6D/EhwqE2DjnMsGXxmWDcxQZZ/tiOEOFvv+8Lf/A +U1BSiZvs/KHTXO9t9o70Qaa1eEO9TiUpHlshYcJm2dB5xzcvaEu1nUaEMW2gF32c +t2zQhzrHOF960fFewpXL5AWnx6CodCfpVbkfUlqZnawXMiqUf/KyDGRXI0BNfTw4 +X1XjOn62E3a2rjQUCOwEOmye6LU1gslNXLU24BV4FsATHeFYT5ShXD9z349/k7w1 +NYekekhbnzZacJLRrs5mdtRt3AO6xXCGiQIiBBMBCAAMBQJYqq4rBYMHhh+AAAoJ +ENKnjZBbW+M9w6UP/2H5Cl2DD2C5cnHI59hZHL7ms0cgTbaY4eifg33EJwjx2oR7 +SXs3D8oLqcc8AO9zyFfKV/Ov4SIgtnNCHaGRRfATMDPKmkA3KbKwJYxBLKPOJoB2 +qP+4BqtAkgzkmOsSxpwt05TvhpAwMMY13N22+w6LZMY5tcMn6n37lRHIY1S+f6j1 +Wq9hAcq26KS1jTcrHXzQBCAwT2THWoUWC6AWyRfmQ9EdzzM+0rYohuxVRAPk2s73 +RJDq1PFwnnNZPNEpUd/0GB4094WZWKLI+PWj/lkT+My882a+pXCv0ewR3Zu5026j +AEmELOvOl9Rke159Jjh3vftn72xXPYjvS0zdmoEz9b85IM54j59QWD5y1NCGfB+D +nfzLs+rYvCvklYHtEU9rku/nrSdHDKBDgZScVz/PZE4PYS/t+/EyaG57zCINpABg +YG2Mt8sk8UWbI5q0y63YN3W5jUj22qGQwPKWM9eeI3D59yLqQfhChMLMoMEmd0N+ +IebDgfPu2kOCe5R45YwIZVZutGEUrtPaPqgBq8lXGSNLqreK7FTeVw3YcQEEifAu +tgNLvrs0byVzq+Vcyb6JpgHqMQYxFbKFWhbf0ctbcGwbpdx05sge+Oj2LDBeGFHr +hse0MK1SxniYU51k6c3Kulu5xP1rmMPDq5wegzFY6atUtrLm10RMyuj2KLiHiQIc +BBABCgAGBQJYz8/iAAoJEDsgzdHcGjGt5ZQP/3VS5NIl0zXMpgCrHy51slGAypW9 +oLpg3wTTgQ+nA+fhRiB4DS05UevYVSZnku91QHP5jaZOHEwUjFjHP98NJruu6upZ +xYPTmBqub2l+k89CekursvVlS8DXSvHPkuc7OAuYxghXpVjNoJJtEIEW/fndZKhV +Gil8NTlrENvUL7ttQlB7Wy8i3OMyaAVYkMhEQSB23WadRF21sI4WhUFDWi+WAsJu +/ZMTzQW6e/qiKZkjREh+JkId0uaSXUv1aAu7K+w17Wu+cUFNudNy7ffo+n32KgEs +kFrdee8FoueA2Rgasfmt9Ux4+jmqVQQ/ybdxWARDmItVINQBIsQqlw/JnwvWUIB0 +b0kUVhwK3CVNDKkBNt7RbpynHslcTB6uRCet3/yuwhnIrR2dYmTit5C/xZInArwF +IMjQCkJTGY9DR+bZOYqdj55Ks2RqZCwLvCfbKeYJNM+NM3PivpLx4qfveO4cDOj3 ++baR+3zyAHn0gWFlKQhYexu6qJIwSOgWkaNWIHxNiDdQgCBURrarw5WXR/Gw3nCk +2rIFOOI2Xf/UWRRq+1EEnnyp4kabYTXhqJH4vrn1jId1jHzvxyjxfmfdnsaQzjUv +xLDWEGUJx6BiqM4cF8c+IVNID7qWYPkeFQEHk3hXVhQIL5IBxQIR+gIw4baV0OM9 +6xy7GM7cWkY8K3FyiQIcBBABCgAGBQJY0OsLAAoJEP1xAF+XmpJtTksP/2RFe/1w +i81UT4sxYt7mKQPKukcNyTGhW2WdyYcC7zWpRf8rO5jF1O8mMTPax0vWfZwZYJ/s +MMYA11nQ37PJ/9Q8wpuuRW6JHXp6uHk09ESqtolms23Nni9KaILN+DZfiys9xHLL +fT7Yvu30XYnuIeVOz62lbCxzHf4dfSbLLK1SFSUVaLw1IlUokuYJuXcTSFOcS9cD +/IKDEEfU6mDWk7+NXkcjtjEqVoj+tWHsx3xDfPCMYTqUIZjn9joYgoO46jQ2GoOD +hQx49DG2+XSlbVvf9BJim1KROOwDzOllE2wS/qhLHPjfvnH4x2s8pYYDFbLDLgrC +KMiMQjnQYR9C2VdVXDpaBj5TQGe744Tc8X0li8gYBexdhx6+LdtCZjBlP4F+W4UF +7SsBrOigKkSbcAT6WGCCbGTix+Dwyx/E0qOMeW/MFcCR/+6ROR/qNCzF3kVKRwi7 +rQ1MnUEYUrwLexsYTeTfcikbM8Lhq/VcgkIVsMFMLF1dXOfNd4RVgobf+Nev8tF6 +3uFrEZkFDJL+5PZ8TNdqLUczus283ZQ4KJKYLUG6mdUFiZ5LHbwfj+jsYjlnyRpb +ktAaUl03fyAhlm4e4GkZstozdZpSbhn4iITUyOtuxB6aLm+qRaofPJk0qR8pIfjW +hzg2HnYIMFvDI6cmF4JaoN2lFrc4xtOH+AexiQIcBBABCgAGBQJY0QC6AAoJEOGO +OevrgZ2ycdsP/24bA/Vlkyv1eIl6BYCIVP81wxXO9ToMPe7JEuuCAZUVnjxMX7PJ +rw3nZWdRscA0GAGACyYb8Ngbdqe+cw6nwdffc385I6lVfIO3WtSu3OSV5TetD6lV +h/CTcLx8rdNespRmY22HgPwVtIFGK1+cLUHuGhHVMVWx9GZiTBL4O+a1xEgEt7gc +5Dp6DgFndxm1Xce0ipX7F6iI6PIN3qMSBX8ZZ0OFusdu/kAp8xkD/lNXgoNCLy42 +jIdNlpZ/g23Y3mdV2Sv0kIYYCFXlzAuc+z4WxOypQXajxG6x86KWDh4yEcEZCxVq +mXB/Ip7sdYZVb89RWcx1gc9eB5K/LdakaRM3g6LT6hDhU/I9y1SaSyL8jGTDT6RQ +WOArGKKh0uZCTRQhy9ODX2R7fGWK7liEHrRx2hEiVNDIRWNZsegoGrJBofyTGmby +L6ZjWwjHqBzhxsDVclS3RFwBIrxXmDqU9Gov9IQlBwHtvPgbEyj31wgAwtN5XWGT +2u/DXPU1KXgAJ8Dp5I2JeIkw5+AXMJIleV4LhISKla12P6u6AonPezeB9EgRuA3R +zy4QVhICbPPRq4Dt6olLinwl4XMg00560xLB9pKks4VUsGXdRz43xUCzzkv1BpII +fFY1Yw1BU0kuy27Q7bJipBnnBjobluGbGe8D1nYqn2IJfPkK2yMRNmdNiQIcBBMB +CgAGBQJY0QvAAAoJECXpVpUYDwHawDQQAJ+7AJPbuvEDTvYuXBSURr8tu9YZkBvG +4LwGeWLvZqhXYfzA+rnhh7qF1UMa0dANH11vpM6Vea9gOkJWuGI2rsy3NfthUkb5 +xBs65JdR1RaAcTDnS4f/YsgT3l3ymCXDgAB50JGFkMmUCBnpsziyz1rOltQyu9WU +/9Pl7ZXOB29DHCcPR1VVPA4GuaNzduDHwJZPqTOAIsupMqlM0X/20nK5EuZ2xUkr +8qzOc6pleOYbeUEOi0VJOZ79iV4Kw7GohBnIgl3v/vqGUIGNOSshM66vu0N1pnDN +uU4hpz0B9dx7wtxi/YgIgkCxB8R+jvr06EiLNkYQE7V868E3Q0FCmhWqX1OKTIDi +o6A6tdb+yVLCZI4JeWFSb5fPwdehQeYOCcY4J3+XUIL2oyKi5MEwQvD/MCHJMKV/ +3+6rSUGxDgqdBk5czenye9aXgSzL62FPFIZUo3XbeuWHMdgqbttdzdcjlvrC1B1R +TTZIpuwfqiqda9PUWZ8mE0dO5hTFYs7QXLbsmvBwVhCr+6j+GFuRtoK/DHy7lGCg +jBJ5lTBKuFXRG6pnQTx+9soc2PkmZ95W9ABjp6WjKWpnOmEhEsS8Z8ZTNyeq6i9P +CgnbDbJ9YCAqvzqZS3hVPyYEZ77JJ+roCM2ZcxrFsSY/7YDCGWkozU82xBmLQRKg +NnVJm0GaEzKHiQIcBBMBCgAGBQJY0oulAAoJEKrlTh++YQ8/sb8P/jsv/QgdkgPA +Y5FVJTCOtqSxar3dd97cjXvTNbcPL93CTKZeP2bLaY5evrgDAuCta0fIw2hDEkJb +rMiHik75PN8hWNrde8bquF1f7IP2aPeIbN7gSZi1xZ10wLOn6I+YWJSiKYcOHkpF +PaOWN4iWi57frUV+eMdU5C78pUfi7AbWdA+NK5g1DWOIip61dzsabNjehWT1UmO9 +w/odeIAg+kxlkeedYWHbHQ53KMsMBREu2tHiqsLCCQs7gcst4oxUbP4RhABCIZMz +L7HXT1bHc7NrXVN49oT0eWneqyyKF1dAKpbUriZ9xts9JoME6N1N6a+cm/J5mIBp +dpMpEz06gFw5xopjAwkO6WJ1P4o2eEGWb1ikKfAGjxCCNkJ6/fHHlwHj2lCJPUVj +6feczwVlZiplWxqbBpGP7SMBvkeI5RXTNlK9VaDvj+I/9YGFLKAylp0wLGw3V9E7 +pWmJh9KoWYNMLkCpeoRyVDiMEwxZgIk9AmZ743FzQlw2UqPYHIuYa/HpOb5MEn4K +V9PmZpGb/otVkqHwQio6XBEDWBiNzt0V7Kvz5+cHkH9zPkAA1FhzwbX6s8LSoRIz +n4L8w+G+PWSIW314RFxqyPzkq1g31sMlwxC/6HjDyAx8Db5DIIS2TR5dWI3R9MAc +i9CkFnUJQ4uiAKcE6G/AsGZtMcr9suKGiQIwBBMBCgAaBQJY0SOhAwUDeA+GPFte +Pl0rW0AuXTI+JAAACgkQ/XEAX5eakm2K0g/9H1UkGJzC2qNc9a/8x8kD3E9aRJoo +3exzryyLobqSkI+8tHEyWnVzCWaZkTnwcQ902NBr9cNJR/ETmyI6n/D0ta8YR0jL +ZyCOJIrr7bU1CcHK+wKjufthkBBfnvfl8DXODy3lQz9qz4uoucdR9gl8ezVVPZ56 +2VYKJkDXU2pt4YTy9yTGAT3ByvpcRekdeEy1U0nAMT/H2MkaN2jdzkXQXXU/MEZO +8psKlxl7JBQljdDVvA4iC9m4g73CP3E4KFhB28vIij18b9upajByLrksa3yrJsEA +0h+KMwBpQYX19pDyW6cRuL8gkl77X9vhNHiyJsddNFe27QmyoIcUM6gTxv3HjNbv +IhsYw7x5VPcVonYe6lHtccmW9ssCgQevmQUUG4T1k9F0nvNMIk+DRsZlw4ByE0gf +HkcyWgncbVGVKBKp+EXUjaxoHiLlviaJ4vw0HavlwYtZEqZiCKpnC8L49l8qUKO3 +p0G47Ps2GsoLWmdt6e31jEcR92Fia7d6UBmpqC4hMgC9yget+YiWlr/PIkcfHZtu +o/1mNg9Vn2NA7YnlpAVxcdK35ikd7UurdfAmsIGDcoIwwtUWny3a+2sYDxrRBz47 +l8IDEwGtkPAMQ5RlGYI+fIN1FNyTRJdpYDQQCCir3LVeiQ+fmQieSqbXwJgxhVcZ +fZUPr3iPs9tZ3vWJAiIEEwEKAAwFAli1MRcFgweGH4AACgkQz/YjtHAvYX2nxQ/+ +IuT/5Zei4Hv40nOmkburp+t1ee1iUymuPnyyErmtY7nF4+QIzZLusXR5vv47uDHT +UZ4+dKoqRrq/HTyYm/Em4mdEa7CLyrA7dNZpJ6OxlWIYD2QAxbdHIsTaC7X88OWF +xwU/iOgJ6e6DO6D7y4AndIGu2Kz6MrLJ65NWpXPSnwudv8MQZ3ZzsSd932/AAtTe +4jEzhIEjNRCUWjMBcLerlubhF4dtfA2JS4U5wsaeW0lH4bIW5LBlx7LI5S3RHuCW +y2FkPYUx5tc1WIXUruJA1MQLCGfe30x0/YCoiwQ6q944CAi3Fb8vVu1yAjLHMsPw +uhta7rfc0I70ztAmLk2QofZ5b20IgB58uUgSaCHBpNYK9vHSyH4RwKBXTtUIJw7X +DxwTIt8X9vuQQD5lcbakCzIyEk5owG6IdqFfGKx3wvz/YoECYIUObkecw0CvMSJh +9UNdkqH/D4A76NpJEC8vso4D0ctDAhnlvhXRvM/ilU6Fr6o3t3Y+U/lbFJG811Km +t3wjvtJgMEtnmZ9DhEOVgUgIZwQMY5VSCbGeAuKMCQGfPUxFzXiGDI9tJU3yUF96 +5vh3oVvytqRU14q9XpPgc6a7EuqvHhZzflShWoiDTzRne83JBcxCFTAg4juAW7vf +C5J/+CPj+KTIaBPkIINsDTWOOTI//3YpnLJpLuI1UNOJAhwEEAEKAAYFAllwe1sA +CgkQ9nldQ8fpKQkvtw//SK0hPgSdVum+0BeQl9OttlFwVY+uKwDYf7lumueIaxcd +kv2OH3oZ2z1Liv390jiMwuCUOxE2JQ5oxBF+LsRyZPUv8URmgFBudW58NKVeQid7 +A6iZDgUcm9oN36vFYsU7mF9HhHCqCy4q77SW6BUu+/e5OIp+ZuSdkvp5L8BSz/F8 +gjzSaAdUK/uHVgFeFOVtYu8ZR3FG1w4b92iCeE09JixrsflT4WOT2J5MLyOjVWSs +eKe/cfVdQDOYIJLIfExbOaTmoKhmHPw/t8Qr/SAr7bgTkbpPlBmFKSoVoN9m8eY2 +KLhfwCDDSuPWO4lOGEUDMO1iUJoj+6A9xij0H4y97G9ukytH6+WcShHDthYLM4ly +S+a7uPayxIGo5MWrHj+SfEPjD9dkQALv/e7JX9vAw73Mk/DI5MJeiH6dJqOTDw6I +t45w2m1vOGr5G8UuiHnPLSNa42HyYQkciaYi76n3Il7aiAcSZpckpPh5WiFugF++ +Y7pU0YCFrKfqVSqu6amnfOVZBEg9c8Pr0+A6wSQE6eoS3BWb17mN8z7e2NXSITMh +zvPt3SMQbTp4POf2b7Tm9ILqOHqrzz/3FSxGgW32se7rb34zmwGwb7ewRM8w4wr8 +8kPEHC/k/2jf6+LXHvoFrazgGZ1LQjJY4s61vb7U963oZfRizgw5DrQlInM82jKJ +AhwEEAEKAAYFAllxrFAACgkQ9nldQ8fpKQmLgRAAhmsKQf8/I3XhQiAp1P8tCxdQ +oM+HVsbqTh5se9vGARfIpS9fKjVJfSIR34d1EAtnqpOsNYKSw2M5Fjc3vVY74+u9 +lR8W2UOzpul0P4aIubJUrE5oYrdivOSEioXrLRAAl9Bpx7CvEP2VJjxNU2c3I3Wo +h0GUbPgWhRKSLt2RUjuE8CpW6HbN4nOP6ta9IujtZoB98wvwdpNWM+40r9zap1Pa +00V/JlcPJGJXMeHtF0Gjf+pwrMZn9x7dP/Yljn/nmy2re5KecdmBHVc8chzONOqU +7buaMdpIzUzFdZ/NC+bC7csYpWrB8h6X3ddM0qCO2ywGSLs08NknuibKJL/j2ARG +nc6KKkQRyo/lx/1gaVOvSr81WaDiKPbRjPd5P9SAkwGacX0NHx6U1GFi4qtD0GVm ++0X5fGV952w4hxpCghelv21U/b9GITuspXQT3yVbl1WJOkZ74uiVuAj1f5ysiiW8 +5OCAV8hDQs8TMKdu7c/qMFVmI7qo0nxJFVH3WHlRH4P2UW6wC+uyPz/imU1cPaGQ +lezH8t9g/j8YWiWtzNZDwEYt1wGqJw5nTQ+XyBpbN0DGs7V2UyK8oZO5+gLctv9H +fyIiSzdjfi0p3gsMzxp0cr6t0gb0tpkehPBSyuA86ulPHFguGfaDB+AXR5lUdCvb +r3JwWBr+QaDMcp6EuU20EWtleWJhc2UuaW8vZnJlbmNriQJUBBMBCgA+AhsDAh4B +AheABQsJCAcDBRUKCQgLBRYCAwEAFiEEcxxg1oDm6FDzHC6IqzOtrOcQGVIFAmB7 +J5YFCQwvK6gACgkQqzOtrOcQGVK+bRAAn4i9FLvSAXuoDkPzXFnVvkxkldZ2ptbh +FtZIUAVMFGlreXoQXrRkzQ57kGCGryY+cL+nOwWYpsvfy8ydt+t9WauG2NCRsfHp +u3kkXCw3t7sftASzhlzocNP0NBexf1nslW43gc1TYQv7qytg26yxw40SF3To9y0G +N9kLjrXXBBfnQBTVvJ/ba59Rb3/RpK+Cz0qzXldtpvIOgu3nevyeKR1Hn3CKdeme +K7AwaiFErVRjgQZyaxl8CdDdvXhOUG7y1Kw7jd+NPo5hnWPawq/5FzWOBm8KQbqD +zZ2LxMVemox5pBjNRcOhlOpsFTLFKPjhOHZ9R0A+G67lih1WVucHPrG5q6mwdBrT +9yBG55AraN6rl7YypoOAvHU7hTMMCfVZNQtd0fw362O6o9SfdKZvHiTHCYBhX3pX +apM7EcRjQu2Vw72Ws6Necu5yp7XdPW1nmS07b52ty0Yp42ekNBdVV75w1dhjWrSg +ZUV6DGSPQayKcqnMYZ0QsgVeBHhMTX3AynVZo6MdRBtoIWwanN8a3uRJ8SY4DFjC +KVMcw+ijgIjYVNLS+MT0Vkco94oAN00njcXBB1jQSCTJrCKuavnrlvRCmabMgvpm ++P2eR2C6pUUA6PDdH0CMBCCm1sDnAqnunC1QWB4inxV/bW3MiZpxK2DPXaRZvnWZ +/uLiaeY0i9CJAhwEEAECAAYFAlg9gDIACgkQTn5Zwb48Hlix3Q/+LPyAgQb9dhBS +E8L87fBPrLQNW/4bPib6WwscAcmKpw83Y+6NX1QZEiIUOy/rvY6D+qDHkS1hXHYT +8tMeyLx5H8cDtiFZhsapGhFo3MOR7J9Eh0x//czhWcv/iK/zTG/74PfP5vPWdJOF +gqGcfMbuGclka8h1+b4kZc/+crbE/rracAvzMDYNuaeV9/oeTeiDQ2jeCOgQnOPa +p4KCu228LCHEyzSHhvsUQMeFMsm9LICaQ+iAXnD1kBJN/70xsAZLSF8Mj7WZLGS4 +kmm8XCGgRp3Z0Gz0FTI72VYnUS/aXK0B93XxyOoVw/fRjMUDi6tuPKPV5dN9pSNo +DXsnA6ddJ+NzZzvWJTb7YDTl3iakW2sxewrIpN17xrvSyYyLOtWKXB6dPuEvpkMj +LChJ9uNI3xv457Sv+wmKmC+UWnSALmMm1Mq9mWT8d530nt0DmBvOjDKTitzTxhiu +esORBNsaTEvhrGAPADAlwfHoJSQEEdnhhA/UvEVz1psz7DASrlwnxROoqGVw5KPl +7oeSUNCGO0RCYIJvbMwyOU6qy3O/PpNlLMZj7LPVFnpPGqqfA3ETK8pN0GjOw52K +62nEk1oA/zO/COedDTjWVO+rLvALReEt649qbGEPFo/SJCRa1cfepomPTh7gTb1l +KYgxcb+GX/W1GjTJyBlztR6gEQsbFGSJAj0EEwEKACcFAlgUpdgCGwMFCQPCgtsF +CwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQqzOtrOcQGVJ2ARAAhKseZMVPen/0 +blaP4cevEdoVIsLNHgbs/0bCUEj2N83IALTkNrN4XOQYX+5VenTD453CTtXglrT0 +bgquV7s9FRnCJPU1Xh1hck5nQrlh8VwP/fVpOMeBqyqytS2CVVcH60oJkiS+niS3 +pA4CxAkkcGUnY2MZYsW5jxSfV5QqV1S1i+qHjo7yVSVDyMWZJvm2BSBwklhF0aQM +64tysMJAcf6hcmBBtNfLBeqOf6S2E60EFW7CfXKxgbCdYLdNZz/3WlMZ3V7GSAdE +IoQ/8mM3nf54WB83QRDC2QO9bZsigJc8IuX4xO0o7YZaB1lw5YTXCriHPgz2khL4 +cGAGJeDnceNJyhZwUJt2mzB/eqYgvbbLHeFWDkk42ArbVtE9H9AbROtFMEub0u8a +qVR/uDMDiziAsJo3KWeK8C3TFRQSqwSKQu/XpD/4VYelfIV+EunmlMWkWcpBaGwM +iyO8/e9q5XyQBVFemfXXoXMFYmGPiTo39ajV4FNALbD/p9KnHVhDHafhx2bjjagA +j3rNAD/wG0q8H2niVEqsjxTOiWGJ9n0yhnO2+Rp2W+yaaHSiyarVwhfJ1GCTfBKD +fJF9SjLCwkHlqIbAJ+kRRoFYBtLcKW4N+tiIc3H26HH+vBjspMp2Ht4cKDLY14bL +q/GSzR1yUPQ8hIkKEfeBkPjItgSN97uJAj0EEwEKACcCGwMFCQPCgtsCHgECF4AF +AlhB99EFCwkIBwMFFQoJCAsFFgIDAQAACgkQqzOtrOcQGVKxRw/+KmDksqVijxpn +hagCGWbt4K0EpBzJdyEKdvmjOFR69TDMjaZX/l0How0r96b7gp8lD752+mumjKXF +H3wfD69MqkYA1og2K9zcEqup/DbiD7CAdAP+6z4R1vIdVDOAT9C05rDfSDVcIvcT +TS/sYBK4NLdlpnPSSxwXPOim/4V+LVV3hc9Eeq1mQvz57ReyVOfbJnd4fFHxTXi6 +cI9naANhr5oJhmpT+c9pQL5qReVjLABOSPDbwD07gfgf0EtWmZp6xcNEdzpugrt3 +Rz+3W2VaCALn5qkYrjj2YC+PtILJOWkvlV13N8y5hu+LyktE/1RSCTuf/dDa//mP +wg2DTT8Rp2cozmt4rEWDenFeQy/+M00UEGCalmAXo4MXnrQjunsQ3cTsyF3CgnIZ +unywXFioH2b7pNtuNm8XXYCQMSZoQG0kIlYYLpUt9ZRnJqUar71fKmzbVmSlu9tk +2zrF1Cia6BoX5hUNxcRg1SOg+ayU0z7aW0Y46wkj/+UxB6f19XknSAMZxRCONLYW +Wuxm+V969RZ58BhTWbZ7vuey+s2Q8ZA5fcVmbcRbVI1DUDtJDv9574DAiol5WHyA +Brvx08jh3AXKI9NL6P7cRS9P2BZguWZspwnsLdc9r++t8KOBLU0LAB3OEr+HMFLo +Tuhfxgwnb3EeQooa110w4ZpLL2IgVYiJAiIEEwEIAAwFAliqrisFgweGH4AACgkQ +0qeNkFtb4z3/qA//YoJKNDhAwLghEykQjgU/RubUvV/aWwD2nBnvL928ecoo1uxV +EhRaubpPL3syLIjD/4xgUywYA1z961RH5Qe+SCSHm/Pxp3c0MOC8upv9dKX9cwSK +S3bA+acpiwigzbmH2F4SwsktNR9RJPrHNv8/7IjIGQUcrOh4xZplXOFvsHx62YFO +tJYOMshWhas+5VjsfRLraj34Hacw423tprxh5CFQmaXlZsRqrHMAZ1qHNlaJE7iC +ftDwBD75zbsM2dPLLWl7oNHssmKUXogzopqHJ23ex6XBUfATTdEVLM2jwFWoL2r9 +J2ZrRDZtKwuQ25rRfw0rfFUMLMSkkajwk60ujKDrgiiWmmJ02ZeTQGA2YdCjB7vb +4YKua1jzQS4EbOQeHYd5RRrasa0jWvRcxIAFzsYClAkHy+/E4ivhYaDw8XKUIBHi +S6n5AkjjSZlfQ/IpXaBLH17TT/GpmZ1peVgGDDEgKuFNp54lrWQDdg75cRP+j4U3 +qnjDAaW/LxK5ta0P9GmCE453EYmFNTYjgzldumifgBlzEaNpHeAS62uhc+TKU6my +tCtjWNP9XDtss4yDyL1Nea5Mppuef60I+2brk801L0/fB1VlcXMK4vYD3iYDG07F +8JeePwUuhivvoPoC+5ish/erzjNGSvqYFNM3fqNSs3svKqeUDSvUrzWSHtuJAhwE +EAEKAAYFAljPz+EACgkQOyDN0dwaMa2fMA/6AuZHVxuID185BBDEjUMKV2193SGz +8r0QpRQdXhOxEp7NPU2e7uck55r3YDOkMMeNR0e3argOAXpRS2uCRlh1FGWGwRSQ +qqU8TyE9xYfwae+9uOpuQHWN7DXC4NstOkaOQMlSgYPU1YLR7iqhMh0oEwpemKah +6a6J6go87sPRw2lPQeyjzn8Rbym9ctIBlKfDd1UYbxqySDfQvsPRaMb9d4BTd5tq +CoqqjCwVaddMiVlqy7SvAmSgSeDKSHAR2iu2LmtmYNHibH5M4OSSHhlmrptgOPhQ +Je+vdtSEFcoD0BNY+39RBCT92UnZZnTIRkUqViaQdNg0JdIaIfWAU3DcIqbkgE9H +ZDRBkpSQU+uDTRDPwWB1eooQIOLIhVixG20J1HT7PbhOV0RNSIqyRhHPvI+PxLLv +ehKQLyTiCYbDuMWT+C/D+4voF8op3Qy0wKGyif0BJM4TCgii6TersiygWwe9hyb4 +30KgwjH7sSkdAhhRjIAT71SUu28WxYsPVq4BTb6AHnZ7hW1nMeJ2ds+NhuGprb3z +MfldVTPw9n385HjJ/VxJZTFLAo9YvwnZ61kuQypMiw8Y4gCNVkaEsYU0Bga6S8nj +u9AOcQX6wxClqpGUi9CabDP6mlSnb7gan7TRPLx39rLsSqrEdtWKGrurnEDgGAPv +eeS7ON7z848wNH+JAhwEEAEKAAYFAljQ6wsACgkQ/XEAX5eakm3+ohAAkLAO4Nqb +BjIpxXYOpZU9hAwsYzfztntFJH28yAxXlnPRWehfmLLDVt55KeeXrhgYiYKo4EMx +WZRKErke8EpJ0DlQEiApRMqFHC9zoVRkKns8Jwkv8MlNOODuBxBbyfvr8zRqfQGx +de8VzEqxxMGNLCXnwx8ES6nSMDpvb9choYj5bZYIOjICS5iNs13DpVxBGZ24371P +NnsoWWybeGe68zWcjLHUwtCcxD10Ek2G0RJXqaajoTd6CiOzZUTJLNDuREs6QBYR +I/2Sg9M2Mpz01hs33Z9WEU/W2YroggNgewZfUbs4pnfyhAIlpSOuv0KW8UDac/iy +kR9crBg74MWQ+cw+n34ksc/GXfRH8S+8f1EgJPjPn3rWcl5RNSgIvXmP/lKgu7Vd +VwFrGonkJKXCsNtHq/FUN6HS8lyYowUSjFD+6KxcFaniqGvfotdsWFGnEwlrGjnT +WjtnupAOMZbg7u2odIOW6BFzrfLElC9brHSeq7VGADh86WqlY1f2t6/aqDRNT9gi +FELoIqmUnlcROcIrtZCAeseoYEXOE4nL8N+bSfFMRXlWO4iGGC6gUck1kTwu2oQn +QAQlfb9WekfLl2vGjXKg9xdalTSCtSmMYNJMCEd9njrh4RUi921Q/+XI9Ctv+U+V +dvUHvlLQyQJpIZ/to+iOGd0/oW5D5VpZy5CJAhwEEAEKAAYFAljRALoACgkQ4Y45 +6+uBnbK2NhAAiXGDgNF+bhHWF2w6RI1tlWsjBi9WhRTJ+vwSbKOekrMlfW40ZhFp +4ISZtalo4f98K1is4FyWIhoUzBghL54UO95cmm64J3h42z4LmKSvracaVSGjxmFo +/AsJ+mX5YwqcRiXynCdubzqERVYv+mjTJVVdz/LrvtMS1U1eoURxnIIfjUHZe2J/ +0lG6tYmViPZYqWG2rQ73X92hwts/eQQDEIYhTSteaZLzxcYxbsiE59taWWGofpGA +qJr7hs+goxxzubAgULsaqsFsa1bd7f92xX6ZEy8ZqIqVPmDvoej7coQQcKtp9kAX +Ldsi7KHc/wXavTGSXNH7stix+yzL1PWFJzazy/tS5h4n1toOGKflhyGTAF7FEayZ +4UWV7ubtDq4e9F0f0X0boXDvFZi/P/SnxEJ1ZbFSJfMfjoGHEBHC9n9mH0dxXGPK +N+6jPisCyeSwEfajNJiaW3CAXQG2+QzpPdVrTYB81/Ho7iC4Ak/ac9niYwHZTMy1 +P1bgle5BWYLnekS3Q/oEAZZ3rCMu9rRJPOh7bnfWP/2m2qEpCDfDJljv3oOq1Ndt +RKwJ7u6wNiz0OJS9PRSNBLux5vmzc2Qbd4YHy/JfF8a1XXcl1FEPRurNBlASDoid +xDsAzewfjKosTZjxYcQ9h/xJ3W2P1Pzh6PJDiVeGSFKcH9L8km/iGOiJAhwEEwEK +AAYFAljRC8AACgkQJelWlRgPAdopwhAAnBr3oRXe+92/2MFSovbb/Lp9T+7gSSN1 +U6JNHCV2QkcZ3/4n66nRAOlVf5z7WgSgkrzkikUOjk2QbNK06bSnnwpBVI2Zi/zh +u5v2jBiYJFRg0N0vACLWBqIknik4zKZCM0yWIb/SlNyJBF85CtLN7q7V/Jq05w2F +ioMFRgtrLh7uT9SX+anUz1RNEEGP1v5KWgoFoV/qS8JTXckh+/buWsyU7q8Jirug +KSLJg0frAZWvdAv0PXb4aKjUD5f9gJR5875vSVvc7DHrlERexArg43YzhAPSq4FU +01iuCZr0mjBXF0nA9I+LuLZEHibQtBEHFvTSi5jp27ZYR8Ss133n3YiFmEyWKM0h +WO6w/b4QAl3krmTordn8uZdBc2aT8twO1ZYgliOb2MTc44VIER9r6cYuKwJSvPsD +eN3JPVvEcBYg0BKwGPxpVaSvC7CBQZxQecXhwUnh91x5Is0bwV0W7n+RDQZ58kiA +YXnOzHvPPxfgTIK6EcYiclGua7ncIYjhiKFrpw3JiIFj7EFvNO8e0OdxYj0BvryD +PVKdNmwd6gLwpg7C9gI1sF2yinjJoF0ZHeh59slkUXtovYzftRrfWET6OzGQPjkk +WZaUJtcKQdW8NYTcfHMRs1NRY2qWm5RG11+a8AEwgaCwxr2OAUF0edo2r7nwQTcD +nP9vmrwoVDuJAhwEEwEKAAYFAljSi6UACgkQquVOH75hDz/dtQ/8DMYE8GHAjI8r +8uLh4HVsHuScak5JJ2VaWcjLGu5RkUyHJInUk+9mUcryToInU/qkVEb8OscPcNpj +X6aqt80xqEQOh3q1nEKtfLpB6lsxgO94Pz9AKykw1mB36Eqf3SYft/7RLBjqjXuJ +LJlbtScsiEwtQfOvHdEb85cL9cQ9E1Ka+NBqt07zw0wZ4C1F2eEq1CJlyGc7uqu1 +OT0O4GFktLoII6KIjX4it5hJ1VtP5+VYMtDU5iRBjjwqVqlvg8+KFLTpE/Hqv7m2 +OUh0NnoUhTYsfr/XYepsLkqdefE77DamVUjx4uvtEEXqxUyEjrS5JkGYzbalYfH9 +SdeDFBu4EOJHwc7IGtK8RDY9DkRM0xZq7NXgeJ4QpO/zYPLS7g2fm4JRIaQxT0J/ +m+McdaGsCROOM+84z27f7QX3gguGZMRyUwBSQ9OhEWMCDDMjRZv615oGBrF3CRrk +XOK6MapOTM0eudqh8YcxwOOQG2UfNrOe/RCSmqeylJYBUNctEB4oJEoSA1lnpJM+ +J/wGD9vRPW2hLfin1jxcV7Fp27NqWqqfLW+GcxJPckZGC0wahOv0d6SU5Sms8HYh +bbz+0vEIPHKYYQEzH5ujahij9D/+mLWz16xPpKLHnkODv8R93WQBZWcSPFvBbltP +UmIO4ZiTOe9qYm0iwF4iz/4jhFziEPCJAjAEEwEKABoFAljRI6EDBQN4D4Y8W14+ +XStbQC5dMj4kAAAKCRD9cQBfl5qSbVKoEACI3Zm1arJg/+6vnNIB6s+yIgSNeUdA ++CHoyLiUccZfl3k0CCVl9oqTW4v0xYnMC6wN2DynLCqu44fJPr8T1JCw/Oii6KjB +OKX4/ImRGTDOhnusAunmQ99h+wwJnfH0HcvGItc0K1eqrj3VWnNPIfD4NC5NaC/U +Ge+mYQ6bkuWgE3CcvkpKGoA0986+6j5+KglHB9KWJRvZ7corxesSEg3JUb0hBIEa +UKQfoP9N6HmKbcum9phVWl7Qt4h7NdjhGrge20NcXnRDpHYu4CD9k/Tc+1qUXyCU +eJMx1LN3/5m020InGu+RK5nlcfKgfGPgYv8dMjRJFT8U4ajYwGjSwz2dzXHPJxOf +vfmT6yc8JMQw0H22zaIJCL/Ezk41Uyx3/5xKR+Iq8prIOuTFyHJTJdLAaBGu5JWc ++b728alJGSKCYQHK63GRdEYFvAyjJG92448x4SLeBomMD+W35uiQtTQ4ZrRewJR2 +7cQrwf4YoY0osGWFaIqL0nnn6HwZhTWkZhUmJX07tCZzmgNXXqQute1hRNwFJob3 +8KtHViPj+z7u2ytPrHEMH21nJ/oPOeB5dzHy5TwRCdLuSnX73+v7nKd1gh68PgWo +56wW74Gwr5+EN3GRkD2XHpZuCd3N49SHb4Aze6pc4aDtQjSDMWzetIUUZ300HyV5 +6EezNAJcXQV1xokCIgQTAQoADAUCWLUxFwWDB4YfgAAKCRDP9iO0cC9hfe22D/40 +ma2+sbo87H//lsuSLJ2nefcKh2azDVs/s/SWg4UGOC0tbYABArOCNAWiJReRsdD5 +8ghReurm79Ad7WNT4DiAQ/8liSWK0d+3B6lHKKmyjQC/fAOzZSYXkozqH+dPz8Ei +QXn/WFLXks4r34+AfIIgbHCBkWnVwixMkigFyvOJLu62SD8kACN3p48/AEbvNpFG +mVYQKi4wfXiV67KXY4uJ093gheWv/R5JhXoCecV2+cAeo+98re8Z3dLsO37Q0e7p +ay0mZKj7r5YTjBvrTdWJwMKgbBg7ejGHdnUPzZyZjeejl4kmcHESSSn58fMLuAGf +MWut1gI/9wMQaJ5RIHaxhXcesvhBv1rVngTCgBI6GiqxaOnfe1QC1hCNU5Y1xlcJ +VNvWpuaOBhUQ5+lZC+LJoUzJLv/GjRBteW55PBHxKZdDX/F6NlqR2JvPn1Lk/PAQ +YBn9gjYxRW3t0huJTcmGeOvy4NoBf48er8+SzPCp4m0rhO/sxC/tqzNJX/cVrJpI +JgbU8q3dbrC4VrFk1g/RhlwAW825wn1yFgVGfcrcmJRmFvsBLQH8xswb8XqVr+GV +cehZaqJniMqgKbavE5/TkBI4L8AmB2UIfGSl8yaYt/GYp/Am5wbHdgeEkyUnda1H +NnyJAmecFCtfEL+xyIgv4Nlvsm0wGqUjfuwrdvl8PIkCHAQQAQoABgUCWXB7WwAK +CRD2eV1Dx+kpCch+D/9WZ9qc0EVoEsYA/EOFOrA6QQ1aVQcs56FhxxuvV69XunQl +6jWo9Qf5hHi7zNejidV0ZUcEYlMAhmM29cUylqhd5zRKDCrIXydbSjQiRciUi0aW +UgymFugd8kkqeZtToyoQ1lipCWweVOfMad3guewe1EkLywWyHwt80YE90x0K67kC +eKr4uXCkdDWGA1oqld5XT61v4x+INtjFx/PYmU1q2wH2aFVRJAGmNDtPwhhKFI+c +Ci2aLs5aJfz3DO9a9fIx1M5JtkTuRqAZpl5iY0SeXdfjOQ050jr6V3jzQVoQprt/ +tP1bPX0/7WkqUzqnP8QXECWYODD86/YPbjcTBfFK0cGTbdFzCxzvD63nYnTzznNt +Jw6alrNxCJOamTqWhd4YBLrei6y06oO1NboNd1Riy3IENALMQFnDoMtV9tW6cv3/ +xeDT4244+yhbWrFHzT3gRULaIvBUQ6CP2RS9IU8dFlvwmvx/nndIv0DwdjUV8rJ0 +1wEaKjZZOSH82A6O5OWX0tx+1EGGd6xm7OugGWejtM2i1QBixSo7rLg0uzJqXt8X +xEGCA359B4m3Ko9jPxE8S4l3tUVMedV42X2hd7Cl2FrDIpjqG8FWsfb+hANjjKW9 +zZSMET3viF9Brlxf7yNlKFQ60tZf7finGHSAinsCICzfK1fyT42YgYBnNkIYDokC +HAQQAQoABgUCWXGsUAAKCRD2eV1Dx+kpCanvD/9fRGHu24Orc7vYv9xk6AjochRR +ia9q36SRIsoZRqDnfehXfjAFoudvJ/Tk3mJh4KT3K26pbFWE2mxoplM4y4YBpvvB +M5mTOMSdtluM4AW4q3HPlidM9ggI1d0GzO78A5I+4zbEwCLKq2CaB0Js3JfZkSVH +zfAs6gRvmUxAdfpT/9+mnxt4MRJYV6BUlirYcsnZAyo4GUjE5Qf1Vcv/Ji43hr/G +5H9HUels/Hb3aJzS0gJfuHC5gDIJdgELE0ww5qt7RglLEZpUVtOKE099g+DhNvxB +0KKGIXf090t9u7LfghGls6+QtxxQtGbJ+GVAvtL8IiChGNU6FrBycpbAXUQmSh7Q +cotuUEmmZ2vGDblWiA5tKyoRVIC5sZpFmVX+brMdK3PKS7pJAwKgUdG9h+NCyG9j +cvS7/LZgBxLnMc76zG0uC9TpDabXN8FOCy3wDTdARgihfSyK8Zjrqr/worU7GtFe +JYKIWgmsMpvVvch8J3vCkyy2Lr4IfZjndM5hn2RevsFx5+/bNUa92TNPHlczQjfE +X2mIvZ9o2cHAT9XAkfPG+w5mSMsajbIxLw5M9tXXCSwY5uIr7CVlxXLJZA3hbkRn +mnlarJ55XxkOeZ1emvB3i8Sst0H/kIAQ3wfK4lRM5Zeeu76OKcDt7WOvBEEQNfP4 +1uUB8E2JHdpNPsEW9LQ8RnJhbmNrIE5pamhvZiAoRGVhbGVyZGlyZWN0KSA8ZnJh +bmNrLm5pamhvZkBkZWFsZXJkaXJlY3Qubmw+iQJUBBMBCgA+AhsDAh4BAheABQsJ +CAcDBRUKCQgLBRYCAwEAFiEEcxxg1oDm6FDzHC6IqzOtrOcQGVIFAmB7J5YFCQwv +K6gACgkQqzOtrOcQGVI+pBAAzo/SXgru6PxyR60Lw5Cwqv11r7cfz638IQrrOs/V +dQFaiXni41UvSmLA4AmkjLpzHMPJtLScflUctJIURneWFULaOSQJnsD16Pd8PsUN +EKQFt9+z+R+t9E2IMdVh1Ez+QFhu1nUeCNkJxRfEck+82bIRpy9TxzCerhBQxMKL ++x8e4bIkF81f1xxtamj0/cLRfWX20PY2CFWlVAADHwjOvIq+x+PZTS8gqUJhs2sA +y/nIpCCHwLZPvlfkScCmzGefHO668iQ91rAEGLpHOM1EIiGS6EzWVqMlJ8RxTgtU +opSSczADoBViS3TMOWb2goCKuKCDII++4GDkkXCwdprsaEygprcjGTDtve7opYj9 +k3TNgv8XHxzkpMbFxX1uhLwc0wMtPek4rx6ECDqNMHHXCWdQNz3f0JPSLF4sqmxD +ofWCHmBYPaq6vTaZq9h8DH3QirV8b3E9wHP1iVkwcVEkWF/rUe6Ili8in2HdkAjb +XKeZd+IGoed+q5XwMJ2Z5LFx9GkvzUvzZ5IjY+X+EZ/qsiVtxqMqi7nE+j0cV+Mf +EWPz4IwZT6tMs5eTGmm14Rus42r9aNw3IyzYKSUa+xq6JJrPAYYR63lq2Z92u5oa +aWQsCvFWJLgP3/fEseGBjM9qGQJi1YGYC4Vo9h7V3Dv+9F5dY1o4iZ0kWmzazSp7 +ATWJAhwEEAECAAYFAlg9gDIACgkQTn5Zwb48HljZEQ//Xs+auwdxA7WkJy77r678 +B9Z0Fo3tA62cGcJnlOZ3g++cdPEi5dlBDdu01yFtaK4Yql3TXCQFDhcw6EUHQEyW +Na0oXUtccSNJluwjMhXv/flDObtWhAsW22AoPtMEnQci0yh8gvg/zq4quZQGbRS9 +86P0ZxWR1ublDG3Wtqo+i0/uhHvfy4KMR4dJmK4QPReZoh5lj8PXwEjmrqOrn2in +7tAkGtzhr/snqBdozMW6dx1/mDFM0So7fx7dxl0mjDXC2/9kIKfp0kZVk/VwYPYJ +JWzFUWG2zSH/XU0vhAjn/S0CDmlfcroAGU03IjIUoVW19V2b57orD80TwyStMyyw +JzoJn919thS6CcS1XJhVMjbZMw5TugQQBpnLiOXo/plk96xePv8PZAwYrKAtPLaw +I7rsbIINtmjCVCHq+K3QBohwpa5RWR3J1E2JgIdgofIGFQyIomFr9SF5vlrWjWIb +Bwk2Q6MJG61EzbtUIm5JZ6v2UV75bGvfxL+Osgx28IyT1B5EFv2MRwOFapBXJ1FD +AORXoYd2fv+/H5ss+WpL02+FDEwdEKakn/hXEDzLQLKOT4ABV6/OF7hPHMaXHho+ +8zBqSjbdhlK5MhO8AC633zg7Oqy2/VmDuXiObCQgWS9K+VcIGyh8s+O/4wxl2cRA +pFaf0tb1oN9VC/r+dOD4a6iJAj0EEwEKACcFAlg9ahICGwMFCQPCgtsFCwkIBwMF +FQoJCAsFFgIDAQACHgECF4AACgkQqzOtrOcQGVIWPg//TsC5+gAgKxjHFiBiBaVV +SU5tBmLdq9M5RshtdBbbeVTSyYaXlG2Er9sY+jLlOqFFMOVd/bPmKAC1y2EFM0LH +J0VPbz0c8gpbKLf+6CJ8/FSZXTotW96L3gcN/6IB6oXNeESHspcDxsQAG+MAE1De +w1n6dE/wG6P+7AE38OyC2PCjKMMJYeGKKWeDgydXxwwfvL6yl5mdCKbPP1wPYZKy +FUKvRopqpgvhjneoql7YP3TELWyqqkFIMHFOsCj4Y8Emcwcn4NqlGba2N97EMIFC +QY/jSkkBp2iucSd+dwwEloy7rgx9R/mA781xn8YMHsMjtQ6xcV0lhlV4fKGkOWIt +0ktZWhQSRsYFkKik370QPGiOrU9gRdiH7NE7PmtLJfSwN+k9si73rMWBkxlAkSDA +lGI1dd03nC0TlKmqZjplcuUNNKc0P2BUlohH/0CmQrBvUHRB+WIpQ/U26/OVlB2v +AdW8K0SlAYi5mv8fZMS3iXQX+lBHZdWS42I45l3ApjvZ4YGyVT54EDvnJIt7LZZe +bdMx8+VZbDlpGok1rVqgv3jmxEZjToQMtW32LoctEHOIhXuA7TlTi/k5CFV6cFJl +YcXuam4DVyfqPnb+YcmlIK8tuP0adezvt3di0y3GbqITgFxYpbU51B0GvRd8w1HB +l5DnQ419E12maUGoiyD/01uJAj0EEwEKACcCGwMFCQPCgtsCHgECF4AFAlhB99EF +CwkIBwMFFQoJCAsFFgIDAQAACgkQqzOtrOcQGVLfwQ/+NEnVELujyRvDAghEN97D +S+580gE2DzeKJ8wdK1muGSUvRRbFhoyAhg+eviQOrZFH8OPKSJKpX7/3gxunDU4k +FME/biR328cVZ856RFTtagbunF+cHqRsLR8xOxlI/vDbS69QCfxsfuZH9D6uj74E +oUJdawluqv8tvrIVAAmW68B8qINXwTKaDSmcSPgiggDUhSzcAPz41ops+XKEqLXJ +ymUDalUUo7Bu6rjdSvi5cvo8Ogy8EiveBKQq1ECJUdGw+xHx5zXGZokJYRoXcTSm +2A7gV55+Xpex1Fg6sjD1yQ/2qH1nxjpmAvZsmPkysV1uNEADuMDBuK0O7ug9Tik8 +XvJfxiIX7yYUK2D1MDcj3m7ObtpTG/uiAjehpBNKcppeSEZdA5cJvxF4KXfWYwxv +Aef6z7TzJ2Ke0yWLtVMNhv0NE5c0MTs5ps3EXuIvp1rMa+l/INbBqnNb7YTH8Q9Y +aN+gJMOcVLf/cV+dy5RzBeoAUWfUyWCPbL709Lq7u/MopwSjcckNTvLapUGuGIDo +WfH566YYdA+fQXEYzRtiPYd39/ZHfsRtW69l5BQcMvbRAsFYs8uyTxaHddb5ijTM +zqMlKH0hNGPAeSI4xoLIMzFMc/SrdNRvpoXeJrrwurpAGYidxfYJMJqUHFgquBs9 +3tl+sZrXeEWekFc/xW+gLQ+JAiIEEwEIAAwFAliqrisFgweGH4AACgkQ0qeNkFtb +4z35sg//WBXHg430Wrb2TuKs9er/LAX3N5t5S8EcVFkqsGdFtCtdHA6Pknper4cr +zPnkGvd/qF2DUr7Mt7SUY/rfYL0bpP9SPG/PK0xMcCkHfDxmNhx1ETM13jZLZSiF +cSwB1dLdQfhuw6KMU8gBqzG2MDIkhVLlGBNx3g2BDpwN8NJHMrbCmFWHwxu9WIye +nQ02NbNlZMunKrdxv+jWdfidVaR3LcyJvRcHNKxY5vXgR33IW0kSx+HKREgkA6JU +z83C94yQsQABDKNsQb3oKSZblhL6xuMTA1X/Q2JlBmDsbr8Sr93M++7i++21W0De +hu1pNPd55vJoY78oHZIwTd32Lk8/j5nMe/n1T/MtqWILzmrmxsrOV2Jo5FOMpQCa +g2qz2H6f0iIEzXwB/z/m0KbfTrmxGR+RVcyLNbdEsPkwNIUqN/iD5cEXFjRH9cXa +oyEt0+rELj9pObx4xFe5AzB8dnu2O97vdIBXaLHMJ5BvHfXbinJVZqoQITQPdO52 +9J8xxs+WpWB1hTusVPemX6tp4neUUYNSXnAKOwXr9KNCpeVjukMeZKDlIdDEtelv +t1i9IsALe6NWCg7Dp694sPHr23RcdLpECEYdSCYWbnnkkjtq7tvk2IM9dm82iGX5 +vm2PABU7SYacRDawohYCkNLSZ6yOMXAnzERHcb9M56LNvYths0WJAhwEEAEKAAYF +AljPz+IACgkQOyDN0dwaMa0UuQ/+KC4rNMNqa4sHGMDnCWFoJYHSvyf7iH0rkTP+ +9U55YFQFtJQrfYLS0Ilf9MJ14y8Zj37x7dlmFSdLfxXl8yA70C176E/Hh60vFYsp +y6pzvmyQoRdgCmRqFazcGog6jwqN9/paR6ChZo6tLDCjv7hyuvD3uaFKR6ZlGrM9 +H+xaOuE+rLFMseFd1FZ8bNQCN+mE95sh3Xzsh7zP83tZSzgyvP16TsoYvncbXa9v +pphikTUh+kpXtrla3qJNRcMxGzodDquRhVDS7mP9LOK3OiCrPcCqfVzPlc+oV3Pz +kHRcp6HQWDAqEitzOLOZwVRlNXx7zoTPSDzF3uL2on47yr1ydz1vhxRO40eQCf18 +sYIqCb7HpOptFKFeabGk/jtIGSTzHOl9iqrczBXbSaC3CjjUUqEHwZgAKbD8Pjmb ++uvm2F6j/Bo6FIEViFDMT/Cs8cR2GfcG61MFoBCs8YhN6zHP0WsgPCliiXGW1K7r +X3N5Zs7waDdPfGYsSCjLPBLeISzcECDhJqURnLaAKAPAbVqR7vHp5SXBUrwSgkTh +ljVGuL7N2fSwpCPx3f/n1gqMjXHoBi5/ACOF5oUMDysEU3YX5SkNcYxCDwkDqnSS +w56PJU702eU1OEaA4seIKLgwZx2TMqJMJm9oPutvdor0D6QDxcm+cf7A/NkdrOcJ +Ia9WweuJAhwEEAEKAAYFAljQ6wsACgkQ/XEAX5eakm1wiw//TwWSohYHzWEjWEpY +gh3iDZF2tnRyacce3u2boWbBD/V6Pdpe33/or/NH+brai2cMqUFEEmhv5smCFasn +yN9hjE1hrJ0mBx2ytapd8eUmTfrLhJoVcgW+vitit/WjzJi/pDj5ildzxmFkT2LH +Rn1TclBJrxp6IpVfxukYgY6y5qpnp0LnAClo5ziUW9eROTSx9TWBppeXcpOPjtUA +LqpmOHgL6D6EfoSEGCULI641QhLb5JbVvg+CS5xMnqPE5sTEr4g8q9r2tR2oGTxw +xow3okhA14sIRedyRxwWpta5PT0qOejoUTcGpcr4PLv+7xW+2aEtUk7HrG9FteA8 +4rRIju9HHsnbfMf5in7v5mGTpcR4wgqpiLMqa05UQZGMJ1QuRe8rXGBgeb6ErRna +lBdUMqG+sIyR8Qeadu7F/ZyCWQcPpS7alAQuPkpr6lJ0UVEfRijS00XDj4vGptxt +PvEsliSMBSmGZRoTIbF/dJJuMMrgv2HD42527+4fuTrPqljdo8CB6Zg/1jfPxxe+ +/i+WoHWIQlknBnAcbL/mpCZUQRHes3JHGiTfIZwIVD7KE6Hby8mmeq/+kGCvV06O +1RU8SFEz4xNInARcXs5kF8g3+Qfvbc0vpWAJw8EQAt8fJNJL1WFWv1+IzeV5spj3 +i+NYChA9/BotNC+DPgZ6jxYUR6iJAhwEEAEKAAYFAljRALoACgkQ4Y456+uBnbIl +rRAAllrwWf084btKEVERORl6ueNc28j58ncVs3OtbvMdONvYZJxfD6MaGWos6AwU +lPLTcVRLj2iUvQyhJpbLwP32FKDX6SBtOzsETRAezuiwGVwEnl3p5LmNJnZfJqoM +xDMj53ErDJwZfQC2C7jlhD1iFZVC6/iiT4CBI1A1EI29bA5liozTzBvU9mCil/eW +wCMk3uEYe+WbomRch9rhImnj6nAhqNnwFGRchwZj+8aAW5u668KEI+G/eIhxuJsv +uSRpApRu4hFJQ5ZFEmrHigCbHlsBoIGmjrquBrguO9MKkMxO3McgdQOi08DB90RD +0rEYmyKfl3jO/KX/zWdCTmMtI97/+/NgYqRxRWIbaA7YV30gQTxaPJQLwsl45glS +8ETNivy8vx5bzOk2zyCuGqHe+Ye3GCxMFN8rO/HjY82QEtwazQlWmU6d18mK06nA +0PBkM8rTllt2ktVYDHyN5IxH7yfeQTRrKt5yGk5EOF14xti3/hinoSQsXhP5PQhK +wsEGPDvGWnK1PprAvgKnAFZ7tbEhTaXcDfxj/BTiI3Gsr9nQcR6ahGRs3vPkwaSk +btpYApx1TxTXNzLaej691oEFnoO4V8EY4zIqLaMsTl2oZarmIEERPeEcNRAxwruS +hXsyRSiCXsC8STYH+Sl+965FkVnkwmwq676cofjmYNzVD7KJAhwEEwEKAAYFAljR +C8AACgkQJelWlRgPAdrarBAAjSfKO/DN4EJM6pjknrA9CrH0O+3bAWRqM+1D8uzf +45UGXQrbWxKsWO5JuXSwu79O14kHGytLAb3oWx8J2/+Q1ui9TMrhBkw+hgvkW188 +FWN8PIhnMSiJmTB1/K9UWgVgcLJxX9FFK8etOQCA8VGaYjVNR7BZ7Z71tJec3Bqs ++vLnV6yrbayvxuYokgjdhFeI2e41U6ImSbV9yRhHyIyMwwnPn1NyW35GtKc/GRvK +9TG6CwEBBb+DwWVsY0+QZO4E2SOD7Tvt7BCrtVXDEax+rTkcgxIww18+q2UIPwy0 +xhxL00y+C36RY7/CZH7ycN9z/umPMCnP6AVVxp9+RrjRLq5wY4pG8hkV9I3brHHA +FtxRilqO48UO0p2ekDfpzyvdFbOGXgEYTYbe9AbjQNP9LXW8uyjclVoYKOylE1k/ +aVT88v3bBhZR0PT4THys0RnYITxCEiowOaReLyY49IjaHLMGSolDWjWC16/Lz9w3 +dcuN9B0D4UbxtVTVEC7YbAkC0V1l4czuf1o/RKihOzR/TpYBSAzMCBOIzJjVb9AM +YS7FyFanIShexWuvD/lDsJ4ZJ9H8C3YBiv6eVOBDwzijS1P+vYAO+66ZFkFvN3Mi +J4Wi1gxrZ2bTOF/vBIdNGqlkmXJmrkVhEILgCR6pzwWXVVm4kAQ+4Fvbz8dLNu/g +HlCJAhwEEwEKAAYFAljSi6UACgkQquVOH75hDz84xg//XSFaoi72dts0TwiBN48k +kylxRfFO2BMPpf6iPWrppX7QIKYCggBgGKermlhfUAleSU2olIm09lnFiz8I9wXV +35p6HzzwI3QsFzz2KnsNeX7zhkjMIgbuV6lrdXrVE38/C7CvEp2dWkGgYxWacHaT +/D5eLCXF4ELjVHh/5ZneVnS34Dg/5BMuwehaTtk+SlGqTr+88PWAUwviiBO9h79B +VcAjGCaknW8o2JX4LBwkLv9/y0/grZn0THLcKwnKynRMYUyBrCXtuDqOgHymnyRd +ZBbAxyvXYEXsVGY7bu7u53pKYjOj1JP4X+qZSKARsEgDEzBlmxGtMke9qQmqtQlu +PEsGBAn5k5N+AznJsqL9tv6fAcSn7OmU0rf681VkDiyWvNgQeXJf3oGYF2SOWgo3 +J9nAnqBZfdpqM4tghWwlu93VglDZ62BViwCB9EDoBis2gxk+HUMYWtAu4dL34CKI +Blk5HITRvZEx24HF+w4pseGpirFzzOOU7jHVWRlSyWCWcuu0VtXQW3L0CC+Ak3mL +vFPxn7oCS7nq/9gcRSIaG/KpBDkXW2g99G14lu4CGlB5rttY6e90nfSsl3lnYTrJ +xPYZzar69z66Sxt/gur4rzDx8X67ZwaoeS7B3YDakdlbQZYP94CsA5HIy3Y/JCvQ +lRX/Gl0tpdZZZHX8R5FZmdyJAjAEEwEKABoFAljRI6EDBQN4D4Y8W14+XStbQC5d +Mj4kAAAKCRD9cQBfl5qSbf6GEADT41iQZrxAU/eh6ueqekI2vN7myd130KOWYklG +LJtWm8wYpqGKF83j7NIBuc8ASRwes38k6yENs1bcwK4dmYoOSJ7J6RrdVKNQMVXM +pbCvUD/0gsO9N3qKQa/g6Ta6iAedp1rhiSETYL/SUhCB0VMtfWzXtRiRrdsGSkqa +5r25zAZKYHBTyPW3VZI16VA6MdTeqhGvDEIRApUSXO4V8E5anImQsiIAtFbpq5mc ++neZa+4+pYcGEOccvWTiqeLNIDDKpHN92n8JinIOiL5/08tqIHbeVpEt9l74dtSL +0AIoAgMrM2xFQzBK5yXQg0r9+ufldpI0IN4b5Mf8Ol43d6N9XlfYUfoTCyDcUcwb +5vnVUjh+w8aeuz4G8SI8rKFLlrnB0XBhI/WEpEI2gxe7BWoyIti3FWtJNYdtvh48 +3GcspeqWsg1Mxe2NILC9IlsjNJr2g6gco1TeR6T5X3yuIkUpDbFdBpMilKGwPoH3 +J9KaezvmX0i70QpnkbN5HDcy+vnik2TgsIzM2XALmEZJwBtCCQEiBXKfuwKz2aII +F8fY/NfqpRwZX5Z9FI7nBkxKBYdEz6TXoikx1z3s6anSaN3Z2q29QYMfENzzx8LM +e0f5NyEvrtr3xAoZf8d9BKPcgL2HOa7hdkrTZtdQ9ilTw9I3eiz+RJOkqFW0g89X +vCFj2YkCIgQTAQoADAUCWLUxFwWDB4YfgAAKCRDP9iO0cC9hfTkpD/oCVc/gZcPA +Lbd7X8YvUP9ryMCjDtP/FGhNQCo5WmK+d/y+Yojka2Av0YMOdbmoLpD/ex9mP8kZ +0wIwcKoLWfy77f/I8NngFQEUaDX5vzzGByWXcHC+EhzkmPT+WKqHb29zS/GZmUzl +kXg3iwsLMob9r7xyqmo0EIDKviNTMw9Rm0uw7Sr+kbQTFxTstNjgoHXfZj+jfP6M +HCSi+DeRUhTRfDnXXTdip9hRTSQgseGe2u0N7vkexE5me2Vd/wiY8tO9KBs7gwS9 +cAdJWJKN0sFkvmSyCIJ0Pq5kjxhiemm0k4pluQfa8U++4t7NiQtLgQ/vjM0eYGWc +xdP5L5FkvX5gxp5Dz5U4fO9wsMNdPSQm9yBxK84rRP7BJGKfPC85TXyBqrJQEx68 +yX5Zlr8W9H1kC2oM3aCY+1LyxduENKlkGkmM9lyyBP5WJFCF6M+6aSEp9QRhaqjg +sgsmqGSmKrGWE7pmGcu+b7DV+0KplALU1+aQWuAgrRs/dofbU+aVhy9vriIla9hg +XJkO9R5+8N7kygwYMrHwilNbvGgQ1b8qErs8vxSZlTZqd6Vt4B+HRir6f4A5w1eo +jCRptUq0blYKqns9jYs96VQBrbiVkbYjVRRT3DqI3cSHKkvjj7C+AuLezFxQzYiR +7FtSQoKtDGUi6J7yA/LBFyvpIR4jEVYiXIkCHAQQAQoABgUCWXB7WwAKCRD2eV1D +x+kpCREOD/wIl/2ON+QjQZd6PFV/eIg5rGUAKgiriW5Wa/1EE3x7z179qkRIG4nF +nvgMXq36YQ+3RMZ+epqsIQk6mW47dXtsnJgjhRkwXNfeknDF2O2eFtDo5WWjOQhd ++eUTM949IsTsuCb7rRrjDjhxekAd1ZPFjy8uPGgqIXjYa8j/Q6DE5rwwkHgAjagc +kZEjGUei6nf9Jv1takIBDBcEEuRNoUnx97SOqwmwutXgfZgIahFC35ilK7ybEBzC +5Er/L0pw1WGcQBXBOhf8S837xtghEkYDkOIuEZINDIwZKSURdDabd1s9yTCmhBzh +SnDVWUjPQpDiqsdDrHcZGsrL7/N7XpkiV5eh1pXMPUwi7h6CgN4uSx8ZuC9hwFoy +h5Rz+rG7cscsuYjZQoAfvPMIHBCzbBK9XRcGR9LRcqRLux8mL7Qye1VEk3rrzn6v +rIu/bEHeUwqm5nw8nt4OrwEDPm8dzGyHZNvUghElPK4Ni4ksM3lJLG28MyTEQNWw +2bZYHWn2QGaQBnTKZkwiIni6vxY8HNKNrpsx6IcWWItFcfmyz0edjRz/BzlnDnFq +X/vO0GQIVI9F7Ol6SZh5tjUCet6yvA7pi5q1h9V+5RCokLOuu5hv2oB8bu3Vp/mb +YXppoumvKyQVK5ydsU0A8oPa/j95/0D9xXNqPk8FdwsT0/qjPBh1T4kCHAQQAQoA +BgUCWXGsUAAKCRD2eV1Dx+kpCZCWD/9XY4uG5hOuFpkDO5mCrfMjGIEDwMRsjhl2 ++jhC+zLj3vRP3C+zIj5CG2xd9eqJZHhNuxZ2EWULGEGUyKnyDAum6FcPr5OuqORm +81Vt1/kdg7krkgbag4vSdE9pmcIFqpu3YbGC/hFiN5HjK3W2itw13pVkuthC9AVS +Ima9+UL8dc0ezKioQJMtl06LglfpYXTn6LK9dNN2hPnP9T2oxtcGTd9bIl00nOrn +RpbHjNUtim3iTBYxFfcPNKSjV9RPMNUODhpkUY3q8ZNldbecd7u2s8MorPDbE/6R +AEL+0Tjbbg/NKEXbPmezd096Ib44CBXcXs+k4CnUZ4HyBIgERyv3qlYK9bMwr8rm +EhMJxVKVVnr4Ew5Rb5qQX4Jln45hdPaeMQ3/YkQB28enJMc8+ltUxC6Q40lXfIQi +3VYRd7Krsd9sT5va+0pa1ZDr7Gzz5MJnz0efbWcKgOSdEIVXhNd2p5rn4KwiuIyl +dGovOoThyeYH1at27D1RZZEX9E5LMfaDRKcDijilcGoBGz3VLykIGO6pb6AVhZT8 +GvA7q7rzX/wwlDszG/UxFE2WthsBezKWtyUnvMFg46DHZIJQEbga2zMI9rM2ewUb +2LokU/yT9TdV5mNCwc53ejKZHbCVKXQ/dP5w3sg7JPqL3s5DnzmfkOnYzlUdojtx +0nPBczqm+4kCMAQTAQoAGgUCWNEjngMFA3gPhjxbXj5dK1tALl0yPiQAAAoJEP1x +AF+XmpJtagMQAKiuG7wjNL1RKV0oPXphr83Hy2VDwY3rVAK15u9eV3AqM+tOpGZj +8SgFmjWtjhoRl5AOJ8846n2S7HtxlfB2iEzNCI9iMPT3oRSP0b+rmOhMLb8y2Air +qiuxz/e0AoEjz63E0btQIedzNwkY7dft/7u3xBhYCN3c7BNZJxIlMJcMD5NZVf82 +lIB8xemiKwgV/+5AI/8AHx+eU21uyd80j9j32DdTu8gvS/Hn8Hudbgl+kLOHA3Jf +ub6O+Yq+Y/E1AG0HH3gh3oSlVqdQZ5NnLJB5lhY0sSJEVkY2vK6bgC9ZDxtThX8R +YC5N7CY/IWT2mxw43TjGAViMoAV8BZbb4WecusLesPMoZYsX64JOqgn4qsj1oq0k +A+xrrmx/47X6Ixxe7v46gkGGgmU8rB9RmhawXlr4xsG0Y87Z4THzLtY5jp48gMu9 +HQXlMt2gylR/uoSmW6Gq5tu8LXjwk3i/O/y1ojkDDTOL8mUAI3BiDJ1SUl4cjOmI +2wl2gNaxqxRvx+fY/36j+1woEGKciO4M6WsZcyBLgHlK2A8xvnc79+JlU+fzLuZZ +WKGUJBv5c9o0nanBWsuV1qUSXncvKVa2o8+NvQoPcXXyD06xM1wYd6b59UmmsQsP +R8j1Y552crNuuBOgDuogg1DbWAPaj+1PAGqACPtZ5V+bqGF5HXwaFk8NiQIwBBMB +CgAaBQJY0SOhAwUDeA+GPFtePl0rW0AuXTI+JAAACgkQ/XEAX5eakm1GzRAAwODT +G4UlkKwhdXFEYMaUcFw7nsMYpurmthYSwG7EcqBvcbbQ1Wu2TWT2HXAFZu6oRYAr +6QuYl9vmSQfs9A9dAGaf71DNmnV24QG9pOnmRSEJO7A8y6qc5KIHvu+SZ43wD+KO +2vl09ZLMyDag9szeSED4VL2zrR8Zfe9iWx1LPevK7dOXyLHbicrXFqWxss0zgec5 +qT9iLmtVfSvAbI42fGzluBDlBdDPtYIYCNWPddW5wbh0pri3P+nu8IjWNxN/ko4H +UPqVG2B+Trx9NkM8vNemkQ1sE4XrNJpRy9A7goG1RuSwZHop8Zrqq5nyFxIELBPi +/pAAmylGNOSt0u/QcIDtM3moyN3lssTj2keEXobINkBFc0SNmEapEVTYTeI73dAC +IB6zb8V6f17bz8UNmqo2OecQe6wbVm2fQfD2dvyrfCCPJYbkcpyP30rRRtHx1HaY +WQz+JQrA/nGOPaG7QMIusGGj7f+yOHKPlbC3AkdLxcb7NyNTQbh9fFEzXRRg5icB +JilikJNHQgWwTeI46n+UnPZg9ADeLT/N3NrWk39MlTxAHmoCdeOPNbuXTbU3bnak +KudEh0iJ8nS2Haoxzn9izZnSLH/RUbmHEr2u0BlP2PV+zoeSlY8ybmKhXPFBACV0 +OMbHvPpN51xCPF1hXDVcTEAPmjZZZuuN0JZ82t6JAjAEEwEKABoFAljT75QDBQJ4 +D4Y8W14+XStbQC5dMj4kAAAKCRA7IM3R3BoxrV2pD/4tm4+F06/8jN1e0Dl12V+G +bgsoT34YIR+xPRNq+vGJRinwIqYUMYHNZo2rViOvOZFQVDRYyHUMXnKTZ5IbqaO9 +dT5C1OlMWvDISXl+rxEUTtzumH/TRv1aQ950MfHBQjpYq30VyNv6/Wdg5oHYmLNT +NLeughUB2yI4gHAPGabWnANYUn8izfEHvdidn+rSuBaP8fKuxF3VHRqU+Y2cyyxD +6fIYjSUpBW8EQFfvy9X1/z4QZ3HNtUYYabap/ZvBVWRgK43ELemkHI+PmKyU3Wbo +0FLWMDtQAq3cCZbQXFPe4wEOooRBmDIJv6PRsSxrdYCcG5lHd90sh7JIyscy5hJ+ +YO0SBW437aRJWCqyh3SbvxVrs5e3LM1nAysGlgoqftZ/04SXKaRZy47YoEfXC94i +xLvDE63XCWpdk9AFKJjQlNlW7XQzl5lvn8v78A/O9Ca31Kr/YnQv8jyt9X4KNhLr +RMwo/aC4XJ70gOxpVR94QPV9ffwXRlJyFc0LUBlGu5HFl+XWaSlHNdFPtHK9v27Y +ZWoNPqMxzdo3Ldtm+e4mP4A8Mgq640JDmV/sg11JwmjaE1tp9qAm2zm77+B11wVl +PiHtrctdVT/SJYpr+UUFaHjvWH8GDUPKWQ/IzZRVZjuWZi8Qe2GhKHXzekZUVGl9 +ebj4joK8GrVwV3oQvb0oWrQnRnJhbmNrIE5pamhvZiA8ZnJlbmNrQGFkZG9ucy5j +b21tdW5pdHk+iQJUBBMBCgA+AhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAFiEE +cxxg1oDm6FDzHC6IqzOtrOcQGVIFAmB7J5YFCQwvK6gACgkQqzOtrOcQGVJwLA/+ +LChdyBJ44HGbSBgSyjYeVI0E2F6XiVroH11SjllH8HUfZazL5rexAqsX8O+IURTs +L5RIbKcTpzB9eyjynbIQuNo82jBGmqvNKnTB541yaJkBr1DKnO+KYG18ZS50qdw/ +Hpsxp3th1pVEXBpX81dW/rnidwphiRc5wYQXfRoSOrQoV3N3aDRo9G9y//uFJjzh +BbvF732k8rmVVfLfc+h7/IP8yqH2irSCEAPKKpL7Zohft7EsoUBqKZTqXm1jf1XJ +AnjbheUci621NO7ZqVO1ThMkMizLpUm5Wekl/VTnlq9xu84VSpforUrSJxS6fMMT +dR0MaIkrJkxZe+NX6nfwLZQLQOTw5snddS5P2i5ywdZg2dIVEBWyZtt2Gmm9un0i ++yuXHrfZTr7t0/r7x+N2b1vgoQByO5gBfxsFBytlh5L5x3AlpYYEiPW4/mrGdv8l +iJvRVizhsO32lX7x3v0DPZ0Wrv1hycC7hHp6Fr7lqk1ephMt3XdLmscs7/xeT6H8 +nAYuiVgLJVAXrc1QxfLhezYmCMw4IzNwTHLYvQY8YsPdo9CAn90YsR4SvkYtp6yP +tpFCoTD0YpFrSFw7g4n9tK2rglPosANQU5gXeF2VjtJm6iEQ3VEQxLeukRkBSAZR +r5/G0R4gjwmpfNy+Z14p+usnRugLqkqvC2Dr9RRRetm0PUZyYW5jayBOaWpob2Yg +KERlYWxlcmRpcmVjdCkgPGZyYW5jay5uaWpob2ZAZGVhbGVyZGlyZWN0LmNvbT6J +AlQEEwEKAD4CGwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AWIQRzHGDWgOboUPMc +LoirM62s5xAZUgUCYHsnlwUJDC8rqAAKCRCrM62s5xAZUizXEACLo4nhloOIgFig +3HmbTYQ6/JiYK30zhKqbh/w0321q65HkaVM+rdWgzFS3zzDolJtdHDzkTW+OlAFN +p7qJetIhk1itZnrAedD0DGIUXPQh6ZRRUyhfvQefqF4UGcvqO/2o8s5XDKLa2XTk +Ax6eK1flIXxg/Zm07McRGRHf94TKZVgckMNZ139FduXPi2VD1tBCMbun7DWG2pg+ +/NMEozrtkr0fB162TRd3u2g4HhRaf93Aus5WG6dWh5xDxF7E2Vz3q1+VtElsc4Ct +l2sNNXbfQkYxTI3449UCY8YVYpumAX3eWyr8ITEghvnJcc5regWMGhx1l0XoU3jk +zNMUjbSJB/8SduRJlfQu1GvPj3f+EG9CAUPvL05sTT4smxYNQt5W7LUQQlDP3tjD +I8G7gRUpZtl0Jc8eUZGQaZzT6m0Sg6R3uEiEmmlTVjnQPhlWZiSa3AhgeyRtxfz5 +FmdD4zQrRU+1Kq6KyK4LeIHoTCWPoO0SjEdOsztUB7qGdoCyMFkkce6j8oyRUpIZ +ktkiLM4zJoSoRASXT/6LJt9HnxYE24O51OK6i4mEGrbfp2IW4WfVIqVmupdkrBYI +dSsYwnDuhmp8N+JSLFE/xDM/IdvauXNM2wZjVlzHz5mBcrJk2XFAQqE/zP4XBl0U +Wd6xIEFhVx3IQDkRQq3dQdgVPLpwkbQhRnJhbmNrIE5pamhvZiA8ZnJlbmNrQGZy +ZW5jay5kZXY+iQJUBBMBCgA+AhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAFiEE +cxxg1oDm6FDzHC6IqzOtrOcQGVIFAmB7J5cFCQwvK6gACgkQqzOtrOcQGVL4aRAA +yu3KzG2Xruwl1G2cKFMzufZSYRid5IvaV+djMvK1JkOmiJ8T8UWv6mxVGoDd5zWq +PjQPcEJ2dSVem+x2BKSF0Cr51LP6c36uBZtG58G92hB+aGNLO5f9c5K8DC8YDk/t +ZzUuXP/cEzH6gvcK54WA6Q/7Iw8XMg2O2xEtpdbA6deiyYUvTW1bOrQ/AnAQeqot +x4SOhdMAvLMxEOKIXoLG9tQs6eHQfIeUveExEQW4PF82D19ikNgHm6xNQAgo4DyC +Bz7Dg9eunra8r4SUx4DKY+DQc9MWKQc1ae11YlOAeZEoVeS2mxVfFIgqyiw0Ugnp +7utCKXtmRJGzoQ5T532+0DXVurCD9Bdj9KmtczoVV47mqrZ3pnRFwyQU4oyxtOBE +wlGVTbiaZhE3oeFnhQ55rF7GYfOxhbxyqAOiR0o6OVp9blvy8QHDeK+RD5qt6xKK +lKcvtmKs/rTM4alJcdhbqqz5z+TiP+c6/cnr6WDzvTFAH3v3qqFZG3TU7SSGBpOG +EZ9i97VueR83y2vzrRhZPHaOHn85JJpp+73LIiy/PzK8d3vwVhLvtFczlAJPpG+y +VDLwdjWZraIO6Ae2IqUwvv6SyeX2IwE4g0cr3mwIV02X68G3ITh6ndj44zbiMMIo +7dB4r+P5iFeZONkskt32Q89rO7JTvITZWkB5SwP/1Aq0HkZyYW5jayBOaWpob2Yg +PGdpdEBmcmVuY2suZGV2PokCVAQTAQoAPgIbAwULCQgHAwUVCgkICwUWAgMBAAIe +AQIXgBYhBHMcYNaA5uhQ8xwuiKszraznEBlSBQJgeyeXBQkMLyuoAAoJEKszrazn +EBlSm9QQANa9WHGfPNDDAQyKCjEAAPLpkF1yX+hPAy21Qkq2TstFT4fCADo9d8uk +gQhViCAm8bUJB1GpTxUb6P9XlubNXSgQQSq4vROAr37/6bxG0svBmmq9ctLx7o2B +GwFkjCzyTfvVQrawotuI5f6xDrgHo+sGsYKAd2bdE3PQuYpOgHoj8knR5gbYvxhG +R23kwZ8hFRhMD2pEmZ/kYLZk8LoVy7AFDd5se9ufNw6QRLD1EVFYLayElc1CtHAR +xSiicIjJ/ZObmfdlLawIrove6RtGfBclgTFKUV0scjSL9pvJqlT1fddQCFKZPBPb +8d0FkgAVS5aBLK9XhNHXNbV/nnPmRLcYwcLtYAx4ftNXedBHJTmgxJ53Yl/Gjeah +3eMeN1neo+jjjFRgHsAqbM0L7VSCzlkb5e6LnF/3AU9cj5+IxFjSLXqp1AIUb6J8 +vE94l+8MkRomMqnb35HiQ6M11iZhreSdSfques6DJ1XiHTvH+53vQroA2PLGlHpV +F2VNKHyFX4KjeuxAuRgCBXIqFiScTwbOGrZ+S23VtkGm8/9DHp1Ypi9BxKPwQLUi +MXHNwUkq+aVcDeojzvI/m9PG2ZkCTPQHWUltCqn36IGrsT8zI1yWy9+aDXvLBsMM +au/QX0nhgWp9lAZLJLkHtm2KWtNE/j01xRqel+w03lckB3XZMPSOtDlGcmFuY2sg +TmlqaG9mIChIb21lIEFzc2lzdGFudCkgPGZyZW5ja0Bob21lLWFzc2lzdGFudC5p +bz6JAlQEEwEKAD4CGwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AWIQRzHGDWgObo +UPMcLoirM62s5xAZUgUCYHsnlwUJDC8rqAAKCRCrM62s5xAZUvV+EACpUoHEPuJW +K8UqqHiiN2bsRttWS9QV8ThPMoc1q71g2I31KL9Bsrl9VWyTjTnfwTaxrGjsBJt7 +0jlDCNbNU0BZ3W9O4RmIX55aMLhIzYQHfF/Ci1Jg4DCqo5GciWlrDEcL8G9/toj1 +8iAqAm+7eqwPkQbM+QxGgjsUKYMVdHGU5QBQ3P4QNjzGsfJcz4LSdL4C9Q9qZQaS +c1ItyWZraEMcYYAewknALiN36mecxXFDBdEePmnPXLKoOV7wOS2h+kiBxdSfuUcN +unR2w0qfoWwL5bSGP165yZFvvF277URa93s++F4+Cmq/rcuSijtA3IOWLg6Emot9 +1R2Om5Az8tcBLVh3oYF20LULU7W93TEeEiBqUt0GSaX5viplW9PI4LUgyAYFcQGt +/8UG8hSb5Kfpa4pRUYj1mC6PpmpklFLbL5CW/8Lenh5UVRoS9JCvVDL7TgRXL0hP +Zycx7Y5EZp0IJVMJLTQaDT1Dz2oBu15ss8NIPsP/1nKt5bChsmRzPmlps0Ha9udq +YPe6xwdbRM32cpmXj8626rsE6Hi5TZ7kJj0OlHRKnDt5S4uh7pIbYH5Woy0qRRJV +S78DNhRIQDQnzMfwdDtoyLMa2V2SbxpIvMbdDaY7t5yET6OFX1FB0nCP19+Y4YZW +k7tVP/q0bWdekIb3GAn8Qul3/PTeDsdGOrQjRnJhbmNrIE5pamhvZiA8c2VjdXJp +dHlAZnJlbmNrLmRldj6JAlQEEwEKAD4CGwMFCwkIBwMFFQoJCAsFFgIDAQACHgEC +F4AWIQRzHGDWgOboUPMcLoirM62s5xAZUgUCYHsnlwUJDC8rqAAKCRCrM62s5xAZ +UnMgEACQ7kclykXpwMQGQZmINfvcurYn4M1fVpyIEG78zCQCFzyQrehemau1A7Fw +73IOhq3An5IN7hY9cfEFqDdae5Ebn2ogiAYwGAorz+yIvEOTGGd0Dyj73+HP/JQY +epPdYpY1M3ojIEVR3zvwnHqlGkNLvu0pGPBw9B2fAT/LR0QnRyDt7ZDCm2ZHkfZm +mQlhMwzZTW6ZQzFVJeX85Rj1KY4SR9PZs1iK8LxH8Ku1PJkm6JfJPDVoHOI1iF8l +QMG3/kq+WeAzAPjiS7MwXPzE2vCgZvRuBn5wh5CDBwkFZ+k6K8VVrmSBlnFQOfH3 +yGBNjLQRrvGf+bCFG+S8Un+9cVaC1ejALVrhxbjZzxzWNnN0+yY32ED+WPfKg5eW +dg7a0PitGAzQX1pGSxB81G4Tgeys/AJqjWSTFzCUHJDQBD7MQ4fR+vu9slNHdGRh +/Kv/P+K7sh9affW7DnPsyy1ZnzEPLERQmMAxvEiALVxgoFfaQTSi5aWclrUwO8O3 +HbhV4rXSOP0E9c5hhK1oUqRPCjzUOGHZu4DRmZ22Q6fkd5K0Xcv3TFj4t8n8bAUu +KXk8yh9I+C18rVI/qRhdAaWvmqyY3Sw+gQY5FD55mlLfz9qqh4b4w2ASwzPBRORj +LFtnSGbsldhyBWPpjinuVMwCC9P7QAQu4yubnHDy66RXvwUm/7kCDQRYDmLuARAA +szT8L8bN2gAhgGWD4flNEegD5xyfg1LU+AnN1b8ZbNeudrEPc7yfGyuNCMSOCRRn +F9u91ggQHHu3khnCMqxuuoUNKXn9CHUumimPTHAlsYOVFsp8Yy4EuDGajn0AfMn5 +L2sqbYmRI2zhmzoV0X+nwS95XRK1bFz/ntRVhGZVMTJ2wc2qoh7VOlACNzfXpnjt +i5XX2l76+p1Ap9V9VAZ2M0V+5aOXCOairMYLY0h6B4CKegD63SyXd+1vWAwGZTM4 +dPiZ2akn6Ufua2aepgW5mpOMdk7pd8tGjLjqcXnIM5W1FgXP4DfcLhIAX+5l0JXs +8H7WUvysENcwwMLM3nZY1gtz62tTlTWWIgyMat2BgjIO346p+9yOebeD9nxT4xQL +BZVLTfgKntih4o4l8lRpS7F/8vP5FUc3CN+zkPkwuT6GBrhali5qHGjoOEgHitC9 +NjoC346xf5lS9GA0Nz3Nyk9mNhV+q1fG2yoGNjZ4jIH//5LfdiGh5jXSSVXtSSec +nyEzY0bXdiv5dShReYb89azGOg4pepVyKK4gY/82G21HCUwCtOdaFWcWyyqxyq87 +kdkhxNdaKtvjkBBsp1trk3x4dQx3KC3on+Z+0T4VTBRggqfnCXeXHBPjFDV7czCQ +5/NeDausDKadq308lKZbndf/iS41jux/Zo8KFtjjXM0AEQEAAYkCJQQYAQoADwIb +DAUCWA54KwUJA8J8PQAKCRCrM62s5xAZUssFEADooDrkzg5NNpyHEExk6aaKWPlJ +NU6T9kbKUEbxkpVpUoBeM1ROdDIaU7Tdiu5j1EUF0xFL51y39WSY2kVeKMxtdq2f +2/ZWjM4C/fVcoS84FrQ0p7RQoq7n/dmV7Ui7hnh3iF+Cb6Oqcu4UbwoKqKYI32PC +Ul0cUwd4egIMi5YM0W7yY782rPSTL8y3Ba4sFgQnogHsLuxlBixdc6rhHwNiVseY +hH63d//MWRAdNl4q/3ICKdMfMLbJA4w/g1YF27cd2ei4g6gHQCC8TkD35+zCR8Zi +e1TcIdxYU+sPW1ULuYEYNwhRj0laFgm8jMPy5bFat60GVxWmA0VzNRxU+LSZXSXZ +g6dn3Ihc8ROpdoXHrzxqqu3dlWUCESQ9fQ0KWUuMRq8N0P9K7Dw1SBX+frZMbhqM +DBL1ImY9JkSwLlg/TiozTAW2CARgTwbSFM9Lzef4LXg/BsQg8/HClIYw50EqbUV+ +zUBmaZa2UEa5bJhvqrd3+aQ4eL1gMF7cTykm1eNpJtFwi4r99v+du4OAY533E4Z0 +c/GoaVyP5lI268qV+/N+oWQrvbMVXTfSKK5FMJGQYeE6W+ruWZ0YwAer0yKBVT38 +DPnlmveAEXQM817DM8rrKAz4gcaTq6jU684nuiWJZeraMY5FurK4r5V4RiDjPiWk +wfBQGVpskLpp4jEvrIkCHwQoAQoACQUCWKmriQIdAQAKCRCrM62s5xAZUshiEADh +wJXWCdATsf89/XB9E5FU/c0/pwZXhsKN8RqwSzQ1Pw2/jxAB0Dkiurgteeldbl5w +5vp+hCLq8afz196orS2cyFhEF4VYitcWhBVFoi2ggl4rdMeNYJFRtii49yafh0Mr +/c56boBziI3C9PGRlR3LAjAvsxph1QKi2q/J4VmlYhRBoZKFn/StivFxY390Itt4 +EsxF/iYktWto8FSDZqpB20LXEVuJ+3c4Ap0pl8bzCW2HR3O+oSM5Pgm0ysGpHgcu +4+sARqVeYodfP4RQF3tk0ifP+lOD0xPRlRxqcNdUHmc4qEaOkDprdUSfflWzjrJc +0CngkLsg8suXw3BcSH9nCgFcnDuHBgkHh78gztnH6JLAylq75yr3KT8a5HhjUmdU +ZYweQy5puVAAz/zfUqogcoL8DLsxg/hdF9THI7rzKWft/vBWb6qONr3ynJavFr++ +5MQzspUUwtBZZlY92g1MquYuzHdxvh+DBfqGiZeZkDqevxC5vfnAAVtUCtlFhjBp +LHqZs3a/mSxLQ3J/3J8V5MjegsTpWcWtfN2Egt2ELEbw/URx4yoCNc4dCwtu5/R2 +eWi0cu/OZ62rPzA0+AzaEOrM/0zDTEjDjI/DIMd+8jktkF5rjuOAkXgHBcfrXf5C +Z2stDjCwOPQ+ugORLhwkEy37NCE9RE7KzEUTUoMyvLkCDQRYDnh1ARAA1WNmHOGJ +2z3UIG/VP5KFecFhATnc1gWanMDw25CtdMFz/O/rr0TDcBAqxYRILuYEgsc/l2Jq +qC+iaTUo5GQnUbn+PuhWuV16yAQSKQbr3qjHyChPmkL3omUqFD23Kc5BgwucN7HF +RAYDaHAwMThGghgjaTVxLzAkn6xYR0ZRSyEGhnB9kez7CKxcVIYp2z+pTvJ/pjjc +whxQXOZ3XL4cLEjDRVs6FygZmZ02LkR/4xqffwSullkj6TylzdpNn7hzNWWN4Dfe +nB/azdmmXwrl0Q36Ow+bWmfMw2iD0rX47f0/CCkFFYICmi7NAS8Q564uY0+pmp9Y +cGb//BDRqhywic9XTokKG9GYIN5IrNzdS1LMsFCwWZnPOnhHtR3ygyKL7KzlOjzC +30pQqelRLe3Ht+swZuXVCC1o3C0IogOrNorE5TD79ra4YXJhxP4pJzY7qos2K+re +OIVe8yWFVPjyoiR6uBv3n9461U4Hk5G95/tMBbMpEQf7FNbm8IAcM8Cn3VPLbDuj +YtZAitMkX0MVV9i4ra4GwC3STxn7GGDRSjKJvJCW5Qh/SABkcP2Qd5K02jnW+Dya +Utlv/qqC26sd/6X1LC7A8epkQxC11McGRsK6P81fRl7XgNLuTuJu4bGzH1fF78xW +/QktLzRSz/QIdzNHWE50QRxauSNBfCCuEdUAEQEAAYkERAQYAQoADwUCWA54dQIb +AgUJA8JnAAIpCRCrM62s5xAZUsFdIAQZAQoABgUCWA54dQAKCRAdTm0kxcWL2cmi +D/4/OBYRUNpCFsDWzdCqj19HoMQizy5/7prikHGMsZhnGt0RAP2hzLpgoZs6J1I9 +NDCWrqYiD1XdbYu/RK5mT4xWqYiTcKIGVBrK+X9SOuzAe+f2ktpnsCk0WLPXSpap +yp4adqDqsh78+Qwsd6K7vhxt7ImEXtghUucivBLi0pnTya700hviSFhF22Go9y9i +cx8ZulCu/AF+7NJ1zWgAAuRw4GriN9xKYJCp+rHYOTrZImwAQQ8EeTEGuoDGgpyE +MTryxFyiG1gzjpWwhOKTgEviTceEgA+wA32MJswPwtcYspgKf1RT4KNo6BdZKr2u +kPTDCUZXrUalr1hAw+YKynB3DOg72904LPStCmGq7qSWrEQ0739LscLOCZ/9uXVj +0JSJXleiRoujx7lqJyp3djubWF1IhlGCFomnP/hckrYVStCDSIO2lIYxZeftHZFY +ROSAltxG/rAEizbxvyyrNz2kjpbUm/FzItROSj0PwS5X+WqoJR8vNedZFD+dQBIU +IjKLukhufKQQyd5cCm1OIipkhcAT5gyA06uG6R2YCCQ/QksK6OLaofzC/mTKtPpA +ktgY3ZhPUl/XBEfAkO5qk3lVvuAo2316SxGGtD5KbbZMlb3ejPPXzezBWo2+xAm+ +0XBgOH1g/WQbhzkPPeEWZKP7x7Myky2G6y+uwIbcb67RCNKZD/9VOfpwPuZ7ma7b +GWzXZ2wPZK+/xLIZlR/kSfjKW60OJJ2pE/TBsFdjqBjiksO8ooWW4gVuz6EBoPjp +GoKGBxrvucbuHSa75J9hWMkdrzU3Rkq0X5qHKg6Sg/FnmLtVerP/dar6/XcwyNMm +AWnacyAFS4FvOGWcryLQxlZRN5HNI66hum/FWYuOaKDasCb3RqsUyrXFJO5xNIr9 +KmzPbexqVk2e8wjd4wN0tVwVaQ4pfVzo1TPQdPMmxJzLY8IxtDmEdhGAO5XslNzu +HzZ5k4UlfzcIVxhTPxjBtBHhjkt+eMBNPGRmPt3YFYrE/ya4xvrFatnxkbRy5+SD +3ieuT3DBz+pFokE2/pJdDwJEAPdhbaQH12Uina36d1Jx9FRnQTZynJ0tfUInXwkP +vpJ/2D7DwshjEuz/j67yqu1wBvAtMgGEAOjGzZeHSavY5KyiRmSRGnxflsYR8jg2 +cIB/epm2ERlT8TPkUk6wBnfBgnAmxVa+hVzzIRV2ILLu0aKah/juXyB0gbEG3gy4 +gGt1wfcuzwaVqUYwiWCyLjOhGNKiorM0b6wyh/+p3mkfCCU8v/aPFB6D7lJILPgs +bLuDf1sec2yyKPdagI/v7IuF5Nma13Q0qUPxrrE8rOxsWSAQ7p8zdAXuJcQRSbPt +OKCpn3eA0i6UOSk6fpf9xMzKDXtalYkCHwQoAQoACQUCWKmrqwIdAQAKCRCrM62s +5xAZUj0BEADiWBG7EBgSGPvjcQ2jqBfpwAkxVmg0l+24UN5XIQNy4xqX0OC/kaPL +to5K2SMhb2F8LZLYnnIBJeRVNGZzgRnIraXrP1JPWqYduyCCjZeMSeUhl8eSDwKz +Ckb/F0lMEVUDwwNZeOtLEFW61ASev2Tm4y02VV3U1di8Du6jMGUSX7FfMkYEhZhG +OZcBjQxsl0AowEpESjrCgWdcaSC6ssBa+f5IEl1cqBntx37NYxAM4oH5oee4GpU2 +CqQqmD9KDWA1QlrLf+TYJ45OmmCqxKINjnfJxmBYUh8A3QW6u4Dh+1vnWo9irbkz +RVDj8en5KvBu4Q01A9FiPuk8XFAQVnFxPqyQf2TE0MetG8iWTC7t7KBEkj2XmxVe +3NIz5i6Wdqzuxt6FyN7cr12K2M3/uE5qc3cedAAdd40WyqOaK0j7eIhy0n4XSxTx +FOEOUmyqz3lSoWs/sKhSdzcw1F+Kctwg+gVMxoBeyb0xoPsh7tuzuFto3nO2Q7Nr +EHqipqIw4XKSq2eI3kMN0lXqM+yxer7KyWGViIuoK+D2XacZtWuqdNE4oKSQRcvz +4ZX16LDm1otNqoDqVvncG3alZ4381+Xf59zB+AmtwJyeYxrdXPxnumC604V3LzIK +dRMCiFodibiGDDVuLl5vbJDUOfvISc0FT4f8VWP7341LqkOvMzulArkCDQRYFKeo +ARAA1isTL3Zr6XXMramZr26cKtZcE7Wmng+bHL1yFpm9netjfQIIT0gYCnApbgNz +NyKdbiWOty+FGTv1kmKAmO6LupDhIwhk7s2kn7/YYVgErHBRh7G4ToEZO5LSksts +qfDpB3r07MrU5ayGhp/tnVqPWt30PC6YJh+NX6aDAxIoEAv41izb0cDyKg+vgwMO +PujaX2RlXJik1E8qxT7N7pi+iDyAbCgzv+gGkIgMcCKOopryrN0vf0Wc00zkKXEB +WLoaiizDIyzv60oAoqkKd8E7sRlonmA7LKivQDTWeM08uZrDXHIRO+0PivdeIJUu +/ulvx61Smk9badHKT8NyCkq5ILGXHquXyxOkyFzjxDzdI6wjPb49jjzrkyAyEr3+ +gGP3e+kzvwsKMfUGxSHxyfJOGEIZro94JQDJxmcCDLdEAx3loZoA4grQYpt+cJQq +Cf/Ay1/vplN8gG+vU/CFtEuGLzJzhwzh19MH57OwivljzoOduQ1X/FT0D3JfEzFE +z8O6HMkn0IRr4+cR9t8TIJIHtGQv+u2iJoDk5C6eNiCgQDgTMMmSAHmGRC0rlvRM +NflveKiM/HSkpUMyRLItJhrwWd3+0rR7bOpDgVAZs3JcEH8iPUjBTTFrzXPu5foQ +3EjfCFji7DsE46GTO+jnIBSXyUMtKYEakw50UDDH+76fffsAEQEAAYkCJQQYAQoA +DwUCWBSnqAIbIAUJA8JnAAAKCRCrM62s5xAZUh9mEACIYEW1MMFvL10/xhzen35e +CkyPFTZxEf7j6Kj/w8LdKgK7qaUfovbxR0r1hTdm64yPGZy/ctYaNeiHvWtG2dxz +A+SmXPpJlXjVGVZvE5kLH+62HttMxT1j/31DB8wSeKpUkkaxUMVJuHVW5C19VwHF +kjsDegO+mab1fKZzSu1cRRK9Or37a5w1KU+9tf5psUTtlTJryZGY1ViTdY2d4rOd +qutzfED0LAMSNwmxIFn2PWr9VMjyGm2aJXrsSrzQs+foWsemOF1CvQ/nBibv2Fsa +3R5avyEPW8PXnhJ4tVKsQe5btkLHy/WvvsGwlTsXXg9wYTHkeaK1KV1Mb6FsxJZB +HuO0zVBu4+wlqrDqeRtwyTniufuBHJeJt7HTdvmgy5/IH15H0JvXoaU6lmvN15CC +4Q3p2dp5+jHyTmlrwiUrRLVfiL9Q6K1nvolaxFzUJTV7uFkkFDUDYKje1s328Kw1 +kNuJmsATW1O8bbUTe9qmOjFq6Z94m5SrZOI281OJPzHK3k6rT+VkZnmqmOfAUIbH +IeAcLK8rFEtdE6iuqIuGHK+hkT2oCGKlnUvd6gvhvon+oahYl8bGYdD0hi90JY8V +Sa9uRGYuRHTmGiusjmHGY1+9A1DP4fsEhWxT08ogxMPtjWcCdy1rZxTWjm4IBFzN +LggifE3amFrNoJeIgdZ/k4kCHwQoAQoACQUCWKmrzgIdAQAKCRCrM62s5xAZUgM/ +D/47W1zBp5Q9BOqBmjpy5CaOTjBK3MxhPsj43RZykBoJ52EdEw28/z3CK6u9DEj7 +tuR/f40qMUOWu98iplMLZlKK6DEX/JpUIgBp5X5uH8xae2tIeU2TNiq1fgND6eDo +MtgCG/oUpUSAdJCsOkD8JRy6Kks9nQTcCPzcvGUNhp+TkW2prJz2Z1gACFSNd9Hj +KuJMyg91Y07EbC6/VA4LOlgPYXRCq5MdCGvtJ8bZcRTx4pI+FZCN0CU7ZyvKu8QR +6TtA0THk9izOKUolSGxnT8DpEyfMxoyBG0pVB5D6dUAsrLkAk+tIzsm8Jh2lwniK +l+fpluBn+lkqhzBzVL5PaXv5D3T2dFk36m/KgYJ0G7KLGfKbX0VtS7FlhHgva7g7 +uIYpBWL0Jb1bgy+YTOxoIeHONVPpptfG9zJYyi+xm+am3Ld3PRvnRustc8JzKqr1 +qs2lr3mmt+ns1K91V375AvFYb+0diIFQWDl0BTjNv6QexgBFESc2BPGw85JPNyKx +Luug6XItTP4BUqQGxkxaxnUWujnbPYOgR79r0LHHPEsPrJNGss7CEDpJDiMfY88s +V7pYRlVwhe+NFh+x7L8DfIQDoAFAB04doRap8tWXVBkd+/YHyXS4vVJku5vTQWZZ +7/Yiu9TCmc1A0omQxvXjmDfaryOL/NGrrfO6nUlK/9PDFokCMAQTAQoAGgUCWNEj +ngMFA3gPhjxbXj5dK1tALl0yPiQAAAoJEP1xAF+XmpJtagMQAKiuG7wjNL1RKV0o +PXphr83Hy2VDwY3rVAK15u9eV3AqM+tOpGZj8SgFmjWtjhoRl5AOJ8846n2S7Htx +lfB2iEzNCI9iMPT3oRSP0b+rmOhMLb8y2Airqiuxz/e0AoEjz63E0btQIedzNwkY +7dft/7u3xBhYCN3c7BNZJxIlMJcMD5NZVf82lIB8xemiKwgV/+5AI/8AHx+eU21u +yd80j9j32DdTu8gvS/Hn8Hudbgl+kLOHA3Jfub6O+Yq+Y/E1AG0HH3gh3oSlVqdQ +Z5NnLJB5lhY0sSJEVkY2vK6bgC9ZDxtThX8RYC5N7CY/IWT2mxw43TjGAViMoAV8 +BZbb4WecusLesPMoZYsX64JOqgn4qsj1oq0kA+xrrmx/47X6Ixxe7v46gkGGgmU8 +rB9RmhawXlr4xsG0Y87Z4THzLtY5jp48gMu9HQXlMt2gylR/uoSmW6Gq5tu8LXjw +k3i/O/y1ojkDDTOL8mUAI3BiDJ1SUl4cjOmI2wl2gNaxqxRvx+fY/36j+1woEGKc +iO4M6WsZcyBLgHlK2A8xvnc79+JlU+fzLuZZWKGUJBv5c9o0nanBWsuV1qUSXncv +KVa2o8+NvQoPcXXyD06xM1wYd6b59UmmsQsPR8j1Y552crNuuBOgDuogg1DbWAPa +j+1PAGqACPtZ5V+bqGF5HXwaFk8NiQIwBBMBCgAaBQJY0SOhAwUDeA+GPFtePl0r +W0AuXTI+JAAACgkQ/XEAX5eakm1GzRAAwODTG4UlkKwhdXFEYMaUcFw7nsMYpurm +thYSwG7EcqBvcbbQ1Wu2TWT2HXAFZu6oRYAr6QuYl9vmSQfs9A9dAGaf71DNmnV2 +4QG9pOnmRSEJO7A8y6qc5KIHvu+SZ43wD+KO2vl09ZLMyDag9szeSED4VL2zrR8Z +fe9iWx1LPevK7dOXyLHbicrXFqWxss0zgec5qT9iLmtVfSvAbI42fGzluBDlBdDP +tYIYCNWPddW5wbh0pri3P+nu8IjWNxN/ko4HUPqVG2B+Trx9NkM8vNemkQ1sE4Xr +NJpRy9A7goG1RuSwZHop8Zrqq5nyFxIELBPi/pAAmylGNOSt0u/QcIDtM3moyN3l +ssTj2keEXobINkBFc0SNmEapEVTYTeI73dACIB6zb8V6f17bz8UNmqo2OecQe6wb +Vm2fQfD2dvyrfCCPJYbkcpyP30rRRtHx1HaYWQz+JQrA/nGOPaG7QMIusGGj7f+y +OHKPlbC3AkdLxcb7NyNTQbh9fFEzXRRg5icBJilikJNHQgWwTeI46n+UnPZg9ADe +LT/N3NrWk39MlTxAHmoCdeOPNbuXTbU3bnakKudEh0iJ8nS2Haoxzn9izZnSLH/R +UbmHEr2u0BlP2PV+zoeSlY8ybmKhXPFBACV0OMbHvPpN51xCPF1hXDVcTEAPmjZZ +ZuuN0JZ82t6JAjAEEwEKABoFAljT75QDBQJ4D4Y8W14+XStbQC5dMj4kAAAKCRA7 +IM3R3BoxrV2pD/4tm4+F06/8jN1e0Dl12V+GbgsoT34YIR+xPRNq+vGJRinwIqYU +MYHNZo2rViOvOZFQVDRYyHUMXnKTZ5IbqaO9dT5C1OlMWvDISXl+rxEUTtzumH/T +Rv1aQ950MfHBQjpYq30VyNv6/Wdg5oHYmLNTNLeughUB2yI4gHAPGabWnANYUn8i +zfEHvdidn+rSuBaP8fKuxF3VHRqU+Y2cyyxD6fIYjSUpBW8EQFfvy9X1/z4QZ3HN +tUYYabap/ZvBVWRgK43ELemkHI+PmKyU3Wbo0FLWMDtQAq3cCZbQXFPe4wEOooRB +mDIJv6PRsSxrdYCcG5lHd90sh7JIyscy5hJ+YO0SBW437aRJWCqyh3SbvxVrs5e3 +LM1nAysGlgoqftZ/04SXKaRZy47YoEfXC94ixLvDE63XCWpdk9AFKJjQlNlW7XQz +l5lvn8v78A/O9Ca31Kr/YnQv8jyt9X4KNhLrRMwo/aC4XJ70gOxpVR94QPV9ffwX +RlJyFc0LUBlGu5HFl+XWaSlHNdFPtHK9v27YZWoNPqMxzdo3Ldtm+e4mP4A8Mgq6 +40JDmV/sg11JwmjaE1tp9qAm2zm77+B11wVlPiHtrctdVT/SJYpr+UUFaHjvWH8G +DUPKWQ/IzZRVZjuWZi8Qe2GhKHXzekZUVGl9ebj4joK8GrVwV3oQvb0oWrkCDQRY +QcMgARAA02sPkrOD/Orl6pZmTMVqEvPNfCxddFt0A9b1j3DTgvES6Rj6lhmaN+Gc +l/dHJxgjVLoFsJUjeuAe8undVqIvl8+UI9EWIvhSLhfc/Ciup0bCmoyV5PAJ9OwX +awzVQacVsrsFPaWYU1ZGn52gxNVKdWkZ4VsLEEE6eQMjKZk3jWwl40Tdl9tMbw+5 +2NjSpP0LDYPLB12HRwhN3OkyW14eQ5Li6d+W8qMQTuMIGw+JAy+SqMNk2pTclX/Q +pKNUooZR5Ox+ZWaWHcJNN8oaQxeEaUC0vsUuChhKnHG+W67tw5vA7cGg12qwHhZm +FxUaBZN8jAoj2E8hPHzAcxIRtVglBXM8aQR2fPK+/9FSUkojYjIz6vJFnVR+HTeo +NgYTTEDngI6SUpr23Fj6wh93vU/iigOxM1TzSRdPt5C/B68x4C10hqirrD4gIb2b +rOCWVHmRHqJaqGgq4eRrredJvnys82IXF9e4kCD0GoeREgfYQSizjsTW9UhPiNdt +VliqWKFB7nY1iDU02ISfiXMKQ8XLCChY+D0VA3Y8KrxWCwNeDZFLtfjFyLWJToRB +v/Jy1inua3a26W90qBCBGUP1DEt/ZUs38ARZEi1taGVeg1O/EBxxI21z+4e2ujfI +I76X4X//bKeLeRSm+RbjC1TeVZUz3Tp1NzA5sqZLINcLwtbp+WMAEQEAAYkEWwQY +AQoAJgIbAhYhBHMcYNaA5uhQ8xwuiKszraznEBlSBQJgeye/BQkKGpgfAinBXSAE +GQEKAAYFAlhBwyAACgkQ1iWDuoqxHKNAcg//VGTdvuDHGU46QcydFMGDQxU6boJK +4VLCqjf6uEarHZtro14clJGu7nAE+CTwrDlOvqlruwG8WH86rre6wvUfcszeYqgk +u5OWGGxu13vEMq1b95WAg8W1ik+bLMykvAV5bHCKAbEaO66QJkc097YXMZbFrYOk +Ei8nc8bjZKwHotG+LrLhx5WiA0bdTCMI9t0/ymerPIFSoAIkeYQKSY82zwH7Vs6t +geEW7IvFaTQx1p9Z2YOFfNQO+TAM4l4GqOPgnY6y7FrS1jyjoP9Ev3v3zAuU3WLP +NiqKItpPVL0J98cBwZ8ZRU7Q+NwKBesAk8IkvhLkAYXyEJIS2+ufBq3uiDrqYyf8 +co6NkXhps8pAeNGY2ULBGADpxhMeZbYMP/9UxWZ1KOdJ5jFjRNT8mWXUtGfOc+oe +ALdDZ5unF0HqrK36r+rIx/AKBSDdodjI/6VqADVI6OFrUUXfDZZfNhhMJHfGp9QV +SsVTzNt5dHRP7UL1mF1F8g4Pp472cGZ/BujqiAyoouBnkGmvqhbrWNwoBXBMoWHr +SvGncXDBa8bbFzDB3iDRYU7wvxa92C+pB4esm5OatkuKeX9db35Xz3SBuEbKCtGD +fLMnhA5iEvhY4ddwW2g4f9f4jr+iAmB0Lnv+kQ4m3jNfPELkp2Z51QGViMVbjziH +84jVoQhd0VUKnwIJEKszraznEBlS764QAK57tr7rzjNrJeVy9SS9Ix6+AR+mIu84 +oRh9YjFLoxqTYga0nBMEn/xEN6dEz/+4yO4QO0/YLGZweVyEfLMoH1YaPRVc7kNS +tPi91E981NJ2BgsavNuPGtOC2HPWPBmFwDTD9bhnu5v2C+KqcbRUPz5xiFNUBat9 +f8eHEnP8DTZhuqG9Xp1cR38IfkPv1Goe/6h1cormIRlIf87tX1ur8HElYmzFH/us +4lwwrnHuts3WfIyRP8/TmkIpLlfFYuMf9kiTR65KY7lM6uvWB9loZvxrUMbd/uAp +BVwVfgaffRLItMQ4HY86jT8FrNNep+uJJX6AJHB3TV89tQO6LxIbpBBtZS7iZo2B +XjWTuhYmm8welxkmSFNj3wvGWTzF9WeJiQs1geIYFY+tx7adjClzqxO4BKf6S/uf +tOsUdnDGQpwdfSu3/8Mw9bLWUEnv6+ADRXGnXT8M/h0LqOlevZp2AlHHmg/VCkJf +GjIh+itdYjrqqG9/pgcm2nPer31b0jXYp30mmNBnCEpOz8WwoF6qcgFPnNnMo6ex +I2RtsI4fUexftYvubzW+9hddAOTCFgD5vQqYJKRE6pW7AlydEQ0vJuQ9mWz04EOx +SMjxRpEKmw3TO/QVSfU11XX6vG1RC8yqrBWlf3aV0c4bjWQuIM0izjWvam6xL+5F +sQf7opPb0GpAuQINBFhBw1sBEACwPc5HbNzvj/UF7Ty13ksDgfDTacpaGqIPuWqG +9fFpVmwDeGQ3oBjgL2IuMg7CF4ChcqocF9tFA5f3Kl6RgMV4rXDdplhW5jIc8TSX +mv6ERUxI40U5NurCNSNS7ma6AVsPgNNeTEC6EvwHu1DaZuGhACQGhkZyRJWgCttM +2tiCgDXHaFXtK+SBCKmQog3Q+4juNPP2Q/DWGKRHLdB22y4h6Ekd1icCkVrggdnh +plfB2cG3xRtPrdt/jkLD5AM0r8RyNIEHD6v8MGvLi94QsEh4YAvwnttGC2IckhNu +uvRV5gbj3PIGhmZBS5n0WlK8mB7fNtfx0LZjEHO9Z1hi5VDo93+WgvewWyW03bRE +OVgAW1R8M8L6MGHrOJWDBB2FgLWZhFcR5SfsDhUKuNDAspYsOE4ZOJcA8WHEt5Yr +uEJhzV4XZKj28H4mE8l1kRWLxAJHiHQWGgXb5LqBBu8kdntDIRxWAVVZST24QBkS +s+nkFOSp34NFY9uCS5sbN29MxkG6xX8fFZgM+9+GeSRFcAFmYQnWNyDD1zyYAkLC +JbiSDbrusEBXu9LcT50hMjay5gaYYEQ7euFATVHJgNqMw++YiLjEzKO35J9y3FI4 +rhGb9dkO/vUzx3pTZlE0DnZmyyS8NT0DNqTd6MWH+rH0DolCzuQp+pqvSzwgzRrL +ynWuLwARAQABiQI8BBgBCgAmAhsMFiEEcxxg1oDm6FDzHC6IqzOtrOcQGVIFAmB7 +J8YFCQoal+sACgkQqzOtrOcQGVJmAhAA3aIF4QQ+CwONZd67Jq88XJb4S79vx6wo +UBCtW9blmQ0dvo3NFaSbyu1fWOmG3OJxyPHa9Uabt1bl6i4vMs6akfyamFzC28vM +uk4H9FCwwKh56JPO41Xdj5ZDP8MExMG1UVj1Zz9kwDWqOBCLEqbIU2TeS0lLERF+ +LkOQ3ZsDAZgnZfbvo6ZOqscx6ktmq/dVu7vVLCBvbECitRyAaHrl6vTzyPDS+64E ++PRR3DbAN0yYMMpwsJ3nNppXHuTqCbHRjlnOmAGHRTV6pcA/MKYFptzEEdxjaZ+o +72mLvwRDeJxWLjrHO2N32iSmVoOVDQ0IyPkM/+t8Q09hxvtBahhddy1EtQRtItcg +0OnhA0eJJBAMRr9/wNG+tiJAxUm/RpyGtTerFOv3Bxu08erzAHS1IelKOjj2nNfG +gX5iT+boiWBoz3++Lts+xIXPmeiW8CeW3bbq54knD1ScA1GKYr2lbMRe/DV+PkUK +k3OEZoZT7FsZNDhE/Ifj52Brs2pYuBV7uDUxlUV1r4IFP76/isOl7IkBFGnfIfI/ +5bZdCld8zAznOXkzVzSHPD5ge0IudhAq/vn8VCQxDsx3d9JkS9rfLUz5FPTf5fl0 +EjIwx2Hg8/h6TAelvmYIUMIq5EhdY4nW74yzWUVwTryCgv4LZGwyLiDTLmJ4uxF0 +dG/puyu6c3e5Ag0EWEHDbQEQALY7vnt3MIbSUwVi9Pi8DT23kddQwaFf6oPakSy5 +U99IxwUDgdU4SQM+qddRhtdA9oQC+seMqUPLYfrIBLqIjOU7UfY/Jl2heerQ0WKD +dnlMR9UYPP/3jne2yptKfU6NJFG3/mUxUuWJwdrY6trJrF0/Ihb7aPdxD8oKeYKY +jDeW63ElY/IKrRGD7x6KedeKXaoG9WqPJLaorFm2We/38mHX9TVSgpzesWEiS8HI +28oGC6IbdrZR5Me7aeTOZUz6eGaslfsNfuSQvT/Euw2Z3c2OyusSrveS40mgr7qx +Shxg8B8ow9xZ1iAJCZRtlpA5wdBgcz94h8XyY0vjtUy+tzPlCxg8oac6wgV9Ak8c +uQBjiy8F3gq+aPmgfH4/dJphlyfS46dIxSF+u+5N/zd5f+xem5XOD89Swa4XxfVW +tx7NVGU19gUmmbcPoIUyOqojGkFvleczE2T02AEMiCO7xEqmSDT91KcocJPBy+Mt +9OxXb4yxIXa9o6Xx8RtcX42QcMYR7+/JpYmq2rEaMkXd+QyxQptPYpmQZ8pczGBp +NtPBQ5PUOg6q/4P3zw7gfju5RbR8INTl8/wPLFL4J97uOVzAzVxVpQvrgrpJES/E +uXhMOH9ag3qpd/GpaB0v5IVgEKhfueiccIBE1rV0sSRXIE6E7EjawxSqmHmPA8cf +4umLABEBAAGJAjwEGAEKACYCGyAWIQRzHGDWgOboUPMcLoirM62s5xAZUgUCYHsn +zwUJChqX4gAKCRCrM62s5xAZUioND/0aylw8RS7/fXlFAFhw58wbimmvBehFWFFR +DsoTWS51yuM+zduKAslFFwEQCucJkx/dRvymPTyQIZ53ZZ9pSZxSD2K3Lrdv887G +8y29i5oYrSNd5sdN0YS0C45ooH94/OvWcKcEEf27xBMEgax0+zsyvEPNWMwvom7o +W7JsiEujUD9lemqjWJ2stBFfOv00vkmgAHg+BDsPQyy9BGlpSbkfbEBlz1OH1kWy +9ZNBtAaPrL5xwT6S+NT0JyCWedajpoiorhVYOkm+JmXC8MX6+zx8om7QSOs309Oo +TP/4Rpz271aJwtiHiqEWD+02xbr7SbcGF8c7yBjnJZMV+O4sVwUtrnwpcZlEuzoQ +eRvOUqEt4iWMVORv8yVFaSSS6crqMqsTDpP4JajP6JOvhDWeUUchMclScXYJWLKe +cc8aSoYzqI0E+XHGdDPxIvnq0DKadvwCLbghTaPSni6e235bga8Yh6dg3rWfwPi6 +NI4DBsWARhwJVRyn5YOkTmnLMkgOal7lkbrLl+RWfJ+9W1AIzr/hFCnFZaAvM+gd +h4UJzKZHmqobr+qknfVilY/LMVmGgsTmCDcZRT3kzP5BmeBZrWQbe23BZy66jGQC +lGUFWhY2rpcBUdNCFo4R05odn0PCt1gzB2fBHLOV7GwMu3vfb22pe/zN0Rk+/ChF +9f1qWfS1d4kCMAQTAQoAGgUCWNEjngMFA3gPhjxbXj5dK1tALl0yPiQAAAoJEP1x +AF+XmpJtagMQAKiuG7wjNL1RKV0oPXphr83Hy2VDwY3rVAK15u9eV3AqM+tOpGZj +8SgFmjWtjhoRl5AOJ8846n2S7HtxlfB2iEzNCI9iMPT3oRSP0b+rmOhMLb8y2Air +qiuxz/e0AoEjz63E0btQIedzNwkY7dft/7u3xBhYCN3c7BNZJxIlMJcMD5NZVf82 +lIB8xemiKwgV/+5AI/8AHx+eU21uyd80j9j32DdTu8gvS/Hn8Hudbgl+kLOHA3Jf +ub6O+Yq+Y/E1AG0HH3gh3oSlVqdQZ5NnLJB5lhY0sSJEVkY2vK6bgC9ZDxtThX8R +YC5N7CY/IWT2mxw43TjGAViMoAV8BZbb4WecusLesPMoZYsX64JOqgn4qsj1oq0k +A+xrrmx/47X6Ixxe7v46gkGGgmU8rB9RmhawXlr4xsG0Y87Z4THzLtY5jp48gMu9 +HQXlMt2gylR/uoSmW6Gq5tu8LXjwk3i/O/y1ojkDDTOL8mUAI3BiDJ1SUl4cjOmI +2wl2gNaxqxRvx+fY/36j+1woEGKciO4M6WsZcyBLgHlK2A8xvnc79+JlU+fzLuZZ +WKGUJBv5c9o0nanBWsuV1qUSXncvKVa2o8+NvQoPcXXyD06xM1wYd6b59UmmsQsP +R8j1Y552crNuuBOgDuogg1DbWAPaj+1PAGqACPtZ5V+bqGF5HXwaFk8NiQIwBBMB +CgAaBQJY0SOhAwUDeA+GPFtePl0rW0AuXTI+JAAACgkQ/XEAX5eakm1GzRAAwODT +G4UlkKwhdXFEYMaUcFw7nsMYpurmthYSwG7EcqBvcbbQ1Wu2TWT2HXAFZu6oRYAr +6QuYl9vmSQfs9A9dAGaf71DNmnV24QG9pOnmRSEJO7A8y6qc5KIHvu+SZ43wD+KO +2vl09ZLMyDag9szeSED4VL2zrR8Zfe9iWx1LPevK7dOXyLHbicrXFqWxss0zgec5 +qT9iLmtVfSvAbI42fGzluBDlBdDPtYIYCNWPddW5wbh0pri3P+nu8IjWNxN/ko4H +UPqVG2B+Trx9NkM8vNemkQ1sE4XrNJpRy9A7goG1RuSwZHop8Zrqq5nyFxIELBPi +/pAAmylGNOSt0u/QcIDtM3moyN3lssTj2keEXobINkBFc0SNmEapEVTYTeI73dAC +IB6zb8V6f17bz8UNmqo2OecQe6wbVm2fQfD2dvyrfCCPJYbkcpyP30rRRtHx1HaY +WQz+JQrA/nGOPaG7QMIusGGj7f+yOHKPlbC3AkdLxcb7NyNTQbh9fFEzXRRg5icB +JilikJNHQgWwTeI46n+UnPZg9ADeLT/N3NrWk39MlTxAHmoCdeOPNbuXTbU3bnak +KudEh0iJ8nS2Haoxzn9izZnSLH/RUbmHEr2u0BlP2PV+zoeSlY8ybmKhXPFBACV0 +OMbHvPpN51xCPF1hXDVcTEAPmjZZZuuN0JZ82t6JAjAEEwEKABoFAljT75QDBQJ4 +D4Y8W14+XStbQC5dMj4kAAAKCRA7IM3R3BoxrV2pD/4tm4+F06/8jN1e0Dl12V+G +bgsoT34YIR+xPRNq+vGJRinwIqYUMYHNZo2rViOvOZFQVDRYyHUMXnKTZ5IbqaO9 +dT5C1OlMWvDISXl+rxEUTtzumH/TRv1aQ950MfHBQjpYq30VyNv6/Wdg5oHYmLNT +NLeughUB2yI4gHAPGabWnANYUn8izfEHvdidn+rSuBaP8fKuxF3VHRqU+Y2cyyxD +6fIYjSUpBW8EQFfvy9X1/z4QZ3HNtUYYabap/ZvBVWRgK43ELemkHI+PmKyU3Wbo +0FLWMDtQAq3cCZbQXFPe4wEOooRBmDIJv6PRsSxrdYCcG5lHd90sh7JIyscy5hJ+ +YO0SBW437aRJWCqyh3SbvxVrs5e3LM1nAysGlgoqftZ/04SXKaRZy47YoEfXC94i +xLvDE63XCWpdk9AFKJjQlNlW7XQzl5lvn8v78A/O9Ca31Kr/YnQv8jyt9X4KNhLr +RMwo/aC4XJ70gOxpVR94QPV9ffwXRlJyFc0LUBlGu5HFl+XWaSlHNdFPtHK9v27Y +ZWoNPqMxzdo3Ldtm+e4mP4A8Mgq640JDmV/sg11JwmjaE1tp9qAm2zm77+B11wVl +PiHtrctdVT/SJYpr+UUFaHjvWH8GDUPKWQ/IzZRVZjuWZi8Qe2GhKHXzekZUVGl9 +ebj4joK8GrVwV3oQvb0oWg== +=dRLN +-----END PGP PUBLIC KEY BLOCK----- +``` diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f29aca8..1c3645e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,7 @@ jobs: - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2.3.4 - name: 🚀 Run Add-on Lint - uses: frenck/action-addon-linter@v2.1 + uses: frenck/action-addon-linter@v2 with: community: true path: "./${{ needs.information.outputs.target }}" @@ -132,13 +132,17 @@ jobs: uses: actions/cache@v2.1.5 with: path: /tmp/.docker-cache - key: docker-${{ github.ref }}-${{ matrix.architecture }}-${{ github.sha }} + key: + docker-${{ github.ref }}-${{ matrix.architecture }}-${{ github.sha + }} restore-keys: | docker-${{ github.ref }}-${{ matrix.architecture }} - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.1.0 - name: 🏗 Set up Docker Buildx uses: docker/setup-buildx-action@v1.3.0 + - name: 🏗 Set up CodeNotary + run: bash <(curl https://getvcn.codenotary.com -L) - name: ℹ️ Compose build flags id: flags run: | @@ -160,6 +164,19 @@ jobs: echo "::error ::Could not determine platform for architecture ${{ matrix.architecture }}" exit 1 fi + - name: ⤵️ Download base image + run: docker pull "${{ steps.flags.outputs.from }}" + - name: ✅ Verify authenticity of base image + run: | + vcn authenticate \ + "docker://${{ steps.flags.outputs.from }}" + vcn authenticate \ + --output json \ + --signerID 0x03e406879fd89e52f38f4aab0061266d1183980a \ + "docker://${{ steps.flags.outputs.from }}" \ + | jq \ + --exit-status \ + '.verification.status == 0' - name: 🚀 Build uses: docker/build-push-action@v2.4.0 with: diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 491424f..b439c75 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -64,6 +64,10 @@ jobs: matrix: architecture: ${{ fromJson(needs.information.outputs.architectures) }} steps: + - name: 🔂 Wait for other runs to complete + uses: softprops/turnstyle@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2.3.4 - name: 🏗 Set up build cache @@ -71,13 +75,17 @@ jobs: uses: actions/cache@v2.1.5 with: path: /tmp/.docker-cache - key: docker-${{ github.ref }}-${{ matrix.architecture }}-${{ github.sha }} + key: + docker-${{ github.ref }}-${{ matrix.architecture }}-${{ github.sha + }} restore-keys: | docker-${{ github.ref }}-${{ matrix.architecture }} - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.1.0 - name: 🏗 Set up Docker Buildx uses: docker/setup-buildx-action@v1.3.0 + - name: 🏗 Set up CodeNotary + run: bash <(curl https://getvcn.codenotary.com -L) - name: ℹ️ Compose build flags id: flags run: | @@ -103,12 +111,25 @@ jobs: uses: docker/login-action@v1.9.0 with: registry: ghcr.io - username: ${{ secrets.GHCR_USERNAME }} - password: ${{ secrets.GHCR_PASSWORD }} - - name: 🚀 Build and push + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: ⤵️ Download base image + run: docker pull "${{ steps.flags.outputs.from }}" + - name: ✅ Verify authenticity of base image + run: | + vcn authenticate \ + "docker://${{ steps.flags.outputs.from }}" + vcn authenticate \ + --output json \ + --signerID 0x03e406879fd89e52f38f4aab0061266d1183980a \ + "docker://${{ steps.flags.outputs.from }}" \ + | jq \ + --exit-status \ + '.verification.status == 0' + - name: 🚀 Build uses: docker/build-push-action@v2.4.0 with: - push: true + load: true # yamllint disable rule:line-length tags: | ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:${{ needs.information.outputs.environment }} @@ -130,6 +151,33 @@ jobs: BUILD_REF=${{ github.sha }} BUILD_REPOSITORY=${{ github.repository }} BUILD_VERSION=${{ needs.information.outputs.version }} + - name: 🔏 Notarize + # yamllint disable rule:line-length + run: | + if vcn authenticate \ + --output json \ + "docker://ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:${{ needs.information.outputs.version }}" \ + | jq \ + --exit-status \ + '.verification.status != 0'; + then + vcn login + vcn notarize \ + --public \ + "docker://ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:${{ needs.information.outputs.version }}" + fi + env: + VCN_USER: ${{ secrets.VCN_USER }} + VCN_PASSWORD: ${{ secrets.VCN_PASSWORD }} + VCN_NOTARIZATION_PASSWORD: ${{ secrets.VCN_NOTARIZATION_PASSWORD }} + VCN_OTP_EMPTY: true + - name: 🚀 Push + # yamllint disable rule:line-length + run: | + docker push \ + "ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:${{ needs.information.outputs.environment }}" + docker push \ + "ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:${{ needs.information.outputs.version }}" publish-edge: name: 📢 Publish to edge repository diff --git a/.github/workflows/pr-labels.yaml b/.github/workflows/pr-labels.yaml new file mode 100644 index 0000000..41da9cf --- /dev/null +++ b/.github/workflows/pr-labels.yaml @@ -0,0 +1,21 @@ +--- +name: PR Labels + +# yamllint disable-line rule:truthy +on: + pull_request: + types: [opened, labeled, unlabeled, synchronize] + +jobs: + pr_labels: + name: Verify + runs-on: ubuntu-latest + steps: + - name: 🏷 Verify PR has a valid label + uses: jesusvasquez333/verify-pr-label-action@v1.4.0 + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + valid-labels: >- + breaking-change, bugfix, documentation, enhancement, refactor, + performance, new-feature, maintenance, ci, dependencies + disable-reviews: true From 7233072891f41991269abfb82b629da7b3fefa7a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 5 May 2021 09:49:22 +0200 Subject: [PATCH 329/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20lukas-t?= =?UTF-8?q?r.materialdesignicons-intellisense=20to=203.2.0=20(#247)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 832d187..7fdac2a 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -2,7 +2,7 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#6.3.2 ESPHome.esphome-vscode#0.13.0 keesschollaart.vscode-home-assistant#1.16.0 -lukas-tr.materialdesignicons-intellisense#3.1.0 +lukas-tr.materialdesignicons-intellisense#3.2.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 redhat.vscode-yaml#0.16.0 From 5aaf9dbd08eea0849746660b74c5e741c78e7624 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 5 May 2021 09:56:20 +0200 Subject: [PATCH 330/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20redhat.?= =?UTF-8?q?vscode-yaml=20to=200.18.0=20(#248)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 7fdac2a..da75fa8 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -5,5 +5,5 @@ keesschollaart.vscode-home-assistant#1.16.0 lukas-tr.materialdesignicons-intellisense#3.2.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 -redhat.vscode-yaml#0.16.0 +redhat.vscode-yaml#0.18.0 usernamehw.errorlens#3.2.5 From 5790b2a3fd9e066c186413b3b42e930fe8df7880 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 May 2021 16:27:12 +0200 Subject: [PATCH 331/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20brpaz/hadol?= =?UTF-8?q?int-action=20from=20v1.4.0=20to=20v1.5.0=20(#249)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [brpaz/hadolint-action](https://github.com/brpaz/hadolint-action) from v1.4.0 to v1.5.0. - [Release notes](https://github.com/brpaz/hadolint-action/releases) - [Changelog](https://github.com/hadolint/hadolint-action/blob/master/.releaserc) - [Commits](https://github.com/brpaz/hadolint-action/compare/v1.4.0...c27bd9edc1e95eed30474db8f295ff5807ebca14) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1c3645e..02d1e8b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -52,7 +52,7 @@ jobs: - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2.3.4 - name: 🚀 Run Hadolint - uses: brpaz/hadolint-action@v1.4.0 + uses: brpaz/hadolint-action@v1.5.0 with: dockerfile: "./${{ needs.information.outputs.target }}/Dockerfile" From aebab5444f4c98ae030baf5fe0250bbf436ba7b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 May 2021 14:23:56 +0200 Subject: [PATCH 332/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20frenck/acti?= =?UTF-8?q?on-addon-linter=20from=202=20to=202.1=20(#250)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [frenck/action-addon-linter](https://github.com/frenck/action-addon-linter) from 2 to 2.1. - [Release notes](https://github.com/frenck/action-addon-linter/releases) - [Commits](https://github.com/frenck/action-addon-linter/compare/v2...v2.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 02d1e8b..be5b3b3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,7 @@ jobs: - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2.3.4 - name: 🚀 Run Add-on Lint - uses: frenck/action-addon-linter@v2 + uses: frenck/action-addon-linter@v2.1 with: community: true path: "./${{ needs.information.outputs.target }}" From a77d58a3f3971a7acd68ea0307dfe1d41a4f1976 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 May 2021 20:50:47 +0200 Subject: [PATCH 333/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=203.10.0=20(#253)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 578200d..b01992e 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -53,7 +53,7 @@ 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/v3.9.3/code-server-3.9.3-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.10.0/code-server-3.10.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From a2098beec8af38a4542b4b388008fb57578fab66 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 15 May 2021 20:52:35 +0200 Subject: [PATCH 334/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20esbenp.?= =?UTF-8?q?prettier-vscode=20to=206.4.0=20(#254)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index da75fa8..cd16205 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.11.0 -esbenp.prettier-vscode#6.3.2 +esbenp.prettier-vscode#6.4.0 ESPHome.esphome-vscode#0.13.0 keesschollaart.vscode-home-assistant#1.16.0 lukas-tr.materialdesignicons-intellisense#3.2.0 From 5d52c33041dd21ae8fde137e7ecde93043612d5d Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 17 May 2021 15:50:13 +0200 Subject: [PATCH 335/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.17.0=20(#255)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index cd16205..92ad001 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#6.4.0 ESPHome.esphome-vscode#0.13.0 -keesschollaart.vscode-home-assistant#1.16.0 +keesschollaart.vscode-home-assistant#1.17.0 lukas-tr.materialdesignicons-intellisense#3.2.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 From 3d64c3cae7add3a702266914aaeba6e237443b28 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 17 May 2021 16:00:00 +0200 Subject: [PATCH 336/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20ESPHome?= =?UTF-8?q?.esphome-vscode=20to=200.16.0=20(#256)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 92ad001..4ff6c9c 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#6.4.0 -ESPHome.esphome-vscode#0.13.0 +ESPHome.esphome-vscode#0.16.0 keesschollaart.vscode-home-assistant#1.17.0 lukas-tr.materialdesignicons-intellisense#3.2.0 netcorext.uuid-generator#0.0.4 From f15ab0da5f25232167019afdb3b93e92573d9860 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 May 2021 10:00:59 +0200 Subject: [PATCH 337/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20actions/sta?= =?UTF-8?q?le=20from=203.0.18=20to=203.0.19=20(#257)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/stale](https://github.com/actions/stale) from 3.0.18 to 3.0.19. - [Release notes](https://github.com/actions/stale/releases) - [Commits](https://github.com/actions/stale/compare/v3.0.18...v3.0.19) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/stale.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml index e7cfe89..d9a5240 100644 --- a/.github/workflows/stale.yaml +++ b/.github/workflows/stale.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 🚀 Run stale - uses: actions/stale@v3.0.18 + uses: actions/stale@v3.0.19 with: repo-token: ${{ secrets.GITHUB_TOKEN }} days-before-stale: 30 From e941b99de624e63bef91450d32a52964bfda7341 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 19 May 2021 19:02:13 +0200 Subject: [PATCH 338/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20Home=20?= =?UTF-8?q?Assistant=20CLI=20to=20v4.12.2=20(#260)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index b01992e..3eb120e 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -86,7 +86,7 @@ RUN \ && ls -la /root/.code-server/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.12.0/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.12.2/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From 5559ff7f9b38c869a593cd473e685cf910feab30 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 19 May 2021 21:01:57 +0200 Subject: [PATCH 339/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=203.10.1=20(#261)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 3eb120e..25a97ab 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -53,7 +53,7 @@ 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/v3.10.0/code-server-3.10.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.10.1/code-server-3.10.1-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 9e1e3a428d6c4a53dc0248ac32f23636aa7ce842 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 May 2021 16:48:10 +0200 Subject: [PATCH 340/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20frenck/acti?= =?UTF-8?q?on-addon-information=20from=201.0.0=20to=201.1=20(#262)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [frenck/action-addon-information](https://github.com/frenck/action-addon-information) from 1.0.0 to 1.1. - [Release notes](https://github.com/frenck/action-addon-information/releases) - [Commits](https://github.com/frenck/action-addon-information/compare/v1.0.0...v1.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index be5b3b3..82040f0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@v2.3.4 - name: 🚀 Run add-on information action id: information - uses: frenck/action-addon-information@v1.0.0 + uses: frenck/action-addon-information@v1.1 lint-addon: name: Lint Add-on diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index b439c75..aec199f 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -36,7 +36,7 @@ jobs: uses: actions/checkout@v2.3.4 - name: 🚀 Run add-on information action id: information - uses: frenck/action-addon-information@v1.0.0 + uses: frenck/action-addon-information@v1.1 - name: ℹ️ Gather version and environment id: release run: | From deeecf4cdbd3f1b423e5d87417a00fa67d9ba44f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 22 May 2021 16:34:36 +0200 Subject: [PATCH 341/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=203.10.2=20(#263)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 25a97ab..2e6e1ae 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -53,7 +53,7 @@ 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/v3.10.1/code-server-3.10.1-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.10.2/code-server-3.10.2-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From e10964f5f8515fa9b5038d1b70580cebd225e436 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 22 May 2021 16:38:39 +0200 Subject: [PATCH 342/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.18.0=20(#264)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 4ff6c9c..736d28f 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#6.4.0 ESPHome.esphome-vscode#0.16.0 -keesschollaart.vscode-home-assistant#1.17.0 +keesschollaart.vscode-home-assistant#1.18.0 lukas-tr.materialdesignicons-intellisense#3.2.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 From 8222bd61a934e27a1a94b8e0980bb1eb7c3d02bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 May 2021 11:56:03 +0200 Subject: [PATCH 343/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20micnncim/ac?= =?UTF-8?q?tion-label-syncer=20from=201.2.0=20to=201.3.0=20(#265)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [micnncim/action-label-syncer](https://github.com/micnncim/action-label-syncer) from 1.2.0 to 1.3.0. - [Release notes](https://github.com/micnncim/action-label-syncer/releases) - [Commits](https://github.com/micnncim/action-label-syncer/compare/v1.2.0...v1.3.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/labels.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/labels.yaml b/.github/workflows/labels.yaml index 5a6ab37..b2adbb1 100644 --- a/.github/workflows/labels.yaml +++ b/.github/workflows/labels.yaml @@ -17,6 +17,6 @@ jobs: - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2.3.4 - name: 🚀 Run Label Syncer - uses: micnncim/action-label-syncer@v1.2.0 + uses: micnncim/action-label-syncer@v1.3.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From bbddfb87954b71c21ef4187e8722442d18d1c364 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 25 May 2021 17:09:41 +0200 Subject: [PATCH 344/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20Home=20?= =?UTF-8?q?Assistant=20CLI=20to=20v4.12.3=20(#266)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 2e6e1ae..1533fed 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -86,7 +86,7 @@ RUN \ && ls -la /root/.code-server/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.12.2/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.12.3/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From 9db36a6ea7e6351b48785db00e202d05f618481f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 20:53:36 +0200 Subject: [PATCH 345/778] :arrow_up: Bump docker/setup-qemu-action from 1.1.0 to 1.2.0 (#268) --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 82040f0..decf1ce 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -138,7 +138,7 @@ jobs: restore-keys: | docker-${{ github.ref }}-${{ matrix.architecture }} - name: 🏗 Set up QEMU - uses: docker/setup-qemu-action@v1.1.0 + uses: docker/setup-qemu-action@v1.2.0 - name: 🏗 Set up Docker Buildx uses: docker/setup-buildx-action@v1.3.0 - name: 🏗 Set up CodeNotary diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index aec199f..d6d16c5 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -81,7 +81,7 @@ jobs: restore-keys: | docker-${{ github.ref }}-${{ matrix.architecture }} - name: 🏗 Set up QEMU - uses: docker/setup-qemu-action@v1.1.0 + uses: docker/setup-qemu-action@v1.2.0 - name: 🏗 Set up Docker Buildx uses: docker/setup-buildx-action@v1.3.0 - name: 🏗 Set up CodeNotary From 6e78fe280248caacfb13bc65ccdd150a237ff61a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 May 2021 12:33:30 +0200 Subject: [PATCH 346/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20actions/cac?= =?UTF-8?q?he=20from=202.1.5=20to=202.1.6=20(#270)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/cache](https://github.com/actions/cache) from 2.1.5 to 2.1.6. - [Release notes](https://github.com/actions/cache/releases) - [Commits](https://github.com/actions/cache/compare/v2.1.5...v2.1.6) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index decf1ce..bcb7b48 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -129,7 +129,7 @@ jobs: uses: actions/checkout@v2.3.4 - name: 🏗 Set up build cache id: cache - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: /tmp/.docker-cache key: diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index d6d16c5..582ffdc 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -72,7 +72,7 @@ jobs: uses: actions/checkout@v2.3.4 - name: 🏗 Set up build cache id: cache - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: /tmp/.docker-cache key: From 5e4fc329857b5ba1c88b6562e4a7c8cb38552f4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 May 2021 13:18:08 +0200 Subject: [PATCH 347/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20docker/buil?= =?UTF-8?q?d-push-action=20from=202.4.0=20to=202.5.0=20(#269)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2.4.0 to 2.5.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v2.4.0...v2.5.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bcb7b48..781426a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -178,7 +178,7 @@ jobs: --exit-status \ '.verification.status == 0' - name: 🚀 Build - uses: docker/build-push-action@v2.4.0 + uses: docker/build-push-action@v2.5.0 with: push: false context: ${{ needs.information.outputs.target }} diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 582ffdc..8aa5b2f 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -127,7 +127,7 @@ jobs: --exit-status \ '.verification.status == 0' - name: 🚀 Build - uses: docker/build-push-action@v2.4.0 + uses: docker/build-push-action@v2.5.0 with: load: true # yamllint disable rule:line-length From 3a319425f21e9a65754b5a369200a6d2246b2593 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 14:18:17 +0200 Subject: [PATCH 348/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20frenck/acti?= =?UTF-8?q?on-addon-information=20from=201.1=20to=201.2=20(#271)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [frenck/action-addon-information](https://github.com/frenck/action-addon-information) from 1.1 to 1.2. - [Release notes](https://github.com/frenck/action-addon-information/releases) - [Commits](https://github.com/frenck/action-addon-information/compare/v1.1...v1.2) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 781426a..daadc51 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@v2.3.4 - name: 🚀 Run add-on information action id: information - uses: frenck/action-addon-information@v1.1 + uses: frenck/action-addon-information@v1.2 lint-addon: name: Lint Add-on diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 8aa5b2f..80f7b1c 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -36,7 +36,7 @@ jobs: uses: actions/checkout@v2.3.4 - name: 🚀 Run add-on information action id: information - uses: frenck/action-addon-information@v1.1 + uses: frenck/action-addon-information@v1.2 - name: ℹ️ Gather version and environment id: release run: | From 1833cb4792949e3b216626847771d5b2ca28910d Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 24 Jun 2021 16:12:51 +0200 Subject: [PATCH 349/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20mariadb?= =?UTF-8?q?-client=20to=201:10.3.29-0+deb10u1=20(#275)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 1533fed..db36340 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -31,7 +31,7 @@ RUN \ git=1:2.20.1-2+deb10u3 \ iputils-ping=3:20180629-2+deb10u2 \ locales=2.28-10 \ - mariadb-client=1:10.3.27-0+deb10u1 \ + mariadb-client=1:10.3.29-0+deb10u1 \ mosquitto-clients=1.5.7-1+deb10u1 \ net-tools=1.60+git20180626.aebd88e-1 \ nmap=7.70+dfsg1-6+deb10u1 \ From dca0ef0086d83e18fc2cc8035bef7f31ebcc2a55 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 24 Jun 2021 16:30:55 +0200 Subject: [PATCH 350/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20nmap=20?= =?UTF-8?q?to=207.70+dfsg1-6+deb10u2=20(#276)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index db36340..a2a0094 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -34,7 +34,7 @@ RUN \ mariadb-client=1:10.3.29-0+deb10u1 \ mosquitto-clients=1.5.7-1+deb10u1 \ net-tools=1.60+git20180626.aebd88e-1 \ - nmap=7.70+dfsg1-6+deb10u1 \ + nmap=7.70+dfsg1-6+deb10u2 \ openssh-client=1:7.9p1-10+deb10u2 \ openssl=1.1.1d-0+deb10u6 \ python3-dev=3.7.3-1 \ From 8f888eb96dd9d2be19434ae96ab7c915af6bedaf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Jun 2021 16:31:07 +0200 Subject: [PATCH 351/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20docker/logi?= =?UTF-8?q?n-action=20from=201.9.0=20to=201.10.0=20(#273)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/login-action](https://github.com/docker/login-action) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 80f7b1c..2473c59 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -108,7 +108,7 @@ jobs: exit 1 fi - name: 🏗 Login to GitHub Container Registry - uses: docker/login-action@v1.9.0 + uses: docker/login-action@v1.10.0 with: registry: ghcr.io username: ${{ github.repository_owner }} From 533e4d3189059fdc16c1c1f5b5381b5488f376c5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 24 Jun 2021 17:24:44 +0200 Subject: [PATCH 352/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=20v4.2.1=20(#277)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- vscode/build.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index a2a0094..6a416c6 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.2.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.2.1 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.json b/vscode/build.json index c89c83d..21b8de4 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { "build_from": { - "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:4.2.0", - "amd64": "ghcr.io/hassio-addons/debian-base/amd64:4.2.0" + "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:4.2.1", + "amd64": "ghcr.io/hassio-addons/debian-base/amd64:4.2.1" } } From 880d085b12021670d3e21655a942431fdb9ca821 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Jun 2021 09:21:21 +0200 Subject: [PATCH 353/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20docker/setu?= =?UTF-8?q?p-buildx-action=20from=201.3.0=20to=201.4.1=20(#279)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1.3.0 to 1.4.1. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1.3.0...v1.4.1) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index daadc51..30fb5f9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -140,7 +140,7 @@ jobs: - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.2.0 - name: 🏗 Set up Docker Buildx - uses: docker/setup-buildx-action@v1.3.0 + uses: docker/setup-buildx-action@v1.4.1 - name: 🏗 Set up CodeNotary run: bash <(curl https://getvcn.codenotary.com -L) - name: ℹ️ Compose build flags diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 2473c59..607ff81 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -83,7 +83,7 @@ jobs: - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.2.0 - name: 🏗 Set up Docker Buildx - uses: docker/setup-buildx-action@v1.3.0 + uses: docker/setup-buildx-action@v1.4.1 - name: 🏗 Set up CodeNotary run: bash <(curl https://getvcn.codenotary.com -L) - name: ℹ️ Compose build flags From e83d8e31045dbcbf3a15802c6eefeb34cf289203 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 30 Jun 2021 20:36:16 +0200 Subject: [PATCH 354/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.19.0=20(#281)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 736d28f..ee3d194 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#6.4.0 ESPHome.esphome-vscode#0.16.0 -keesschollaart.vscode-home-assistant#1.18.0 +keesschollaart.vscode-home-assistant#1.19.0 lukas-tr.materialdesignicons-intellisense#3.2.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 From 807790a2383e9d59cd52f7bf147f86e4c645a3a3 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 30 Jun 2021 20:37:57 +0200 Subject: [PATCH 355/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20usernam?= =?UTF-8?q?ehw.errorlens=20to=203.3.0=20(#282)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index ee3d194..0d0657d 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -6,4 +6,4 @@ lukas-tr.materialdesignicons-intellisense#3.2.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 redhat.vscode-yaml#0.18.0 -usernamehw.errorlens#3.2.5 +usernamehw.errorlens#3.3.0 From 04cd0d4c127cb004eba48be155eb6dc88b5df104 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 30 Jun 2021 20:55:31 +0200 Subject: [PATCH 356/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20ESPHome?= =?UTF-8?q?.esphome-vscode=20to=200.18.0=20(#283)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 0d0657d..75f3e2a 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#6.4.0 -ESPHome.esphome-vscode#0.16.0 +ESPHome.esphome-vscode#0.18.0 keesschollaart.vscode-home-assistant#1.19.0 lukas-tr.materialdesignicons-intellisense#3.2.0 netcorext.uuid-generator#0.0.4 From 8088d0e59a4e2f8773953570ec0ebfd79280f2c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Jul 2021 10:42:37 +0200 Subject: [PATCH 357/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20docker/buil?= =?UTF-8?q?d-push-action=20from=202.5.0=20to=202.6.1=20(#285)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2.5.0 to 2.6.1. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v2.5.0...v2.6.1) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 30fb5f9..78fdc0e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -178,7 +178,7 @@ jobs: --exit-status \ '.verification.status == 0' - name: 🚀 Build - uses: docker/build-push-action@v2.5.0 + uses: docker/build-push-action@v2.6.1 with: push: false context: ${{ needs.information.outputs.target }} diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 607ff81..803cf06 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -127,7 +127,7 @@ jobs: --exit-status \ '.verification.status == 0' - name: 🚀 Build - uses: docker/build-push-action@v2.5.0 + uses: docker/build-push-action@v2.6.1 with: load: true # yamllint disable rule:line-length From 20cba4b54c6ddcc29e3cc9970c27ed774a16c2f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jul 2021 09:28:08 +0200 Subject: [PATCH 358/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20docker/setu?= =?UTF-8?q?p-buildx-action=20from=201.4.1=20to=201.5.0=20(#287)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1.4.1 to 1.5.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1.4.1...v1.5.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 78fdc0e..5c15f1d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -140,7 +140,7 @@ jobs: - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.2.0 - name: 🏗 Set up Docker Buildx - uses: docker/setup-buildx-action@v1.4.1 + uses: docker/setup-buildx-action@v1.5.0 - name: 🏗 Set up CodeNotary run: bash <(curl https://getvcn.codenotary.com -L) - name: ℹ️ Compose build flags diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 803cf06..5b241b1 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -83,7 +83,7 @@ jobs: - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.2.0 - name: 🏗 Set up Docker Buildx - uses: docker/setup-buildx-action@v1.4.1 + uses: docker/setup-buildx-action@v1.5.0 - name: 🏗 Set up CodeNotary run: bash <(curl https://getvcn.codenotary.com -L) - name: ℹ️ Compose build flags From 6972580d352a282133f1654fc3a8b7246e910ca6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jul 2021 13:21:21 +0200 Subject: [PATCH 359/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20dessant/loc?= =?UTF-8?q?k-threads=20from=202.0.3=20to=202.1.1=20(#289)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [dessant/lock-threads](https://github.com/dessant/lock-threads) from 2.0.3 to 2.1.1. - [Release notes](https://github.com/dessant/lock-threads/releases) - [Changelog](https://github.com/dessant/lock-threads/blob/master/CHANGELOG.md) - [Commits](https://github.com/dessant/lock-threads/compare/v2.0.3...v2.1.1) --- updated-dependencies: - dependency-name: dessant/lock-threads dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lock.yaml b/.github/workflows/lock.yaml index ff147a2..2701640 100644 --- a/.github/workflows/lock.yaml +++ b/.github/workflows/lock.yaml @@ -12,7 +12,7 @@ jobs: name: 🔒 Lock closed issues and PRs runs-on: ubuntu-latest steps: - - uses: dessant/lock-threads@v2.0.3 + - uses: dessant/lock-threads@v2.1.1 with: github-token: ${{ github.token }} issue-lock-inactive-days: "30" From 0e3113ae58f3dfc82d8baa423b92bbad9fd2086f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Jul 2021 14:19:17 +0200 Subject: [PATCH 360/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20docker/setu?= =?UTF-8?q?p-buildx-action=20from=201.5.0=20to=201.5.1=20(#290)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1.5.0 to 1.5.1. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1.5.0...v1.5.1) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5c15f1d..1db6a33 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -140,7 +140,7 @@ jobs: - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.2.0 - name: 🏗 Set up Docker Buildx - uses: docker/setup-buildx-action@v1.5.0 + uses: docker/setup-buildx-action@v1.5.1 - name: 🏗 Set up CodeNotary run: bash <(curl https://getvcn.codenotary.com -L) - name: ℹ️ Compose build flags diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 5b241b1..1db843f 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -83,7 +83,7 @@ jobs: - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.2.0 - name: 🏗 Set up Docker Buildx - uses: docker/setup-buildx-action@v1.5.0 + uses: docker/setup-buildx-action@v1.5.1 - name: 🏗 Set up CodeNotary run: bash <(curl https://getvcn.codenotary.com -L) - name: ℹ️ Compose build flags From c24e6e49ee56adb0a4c3940e6608d7febe0b1352 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Jul 2021 11:46:05 +0200 Subject: [PATCH 361/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20frenck/acti?= =?UTF-8?q?on-addon-linter=20from=202.1=20to=202.2=20(#291)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [frenck/action-addon-linter](https://github.com/frenck/action-addon-linter) from 2.1 to 2.2. - [Release notes](https://github.com/frenck/action-addon-linter/releases) - [Commits](https://github.com/frenck/action-addon-linter/compare/v2.1...v2.2) --- updated-dependencies: - dependency-name: frenck/action-addon-linter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1db6a33..835b16a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,7 @@ jobs: - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2.3.4 - name: 🚀 Run Add-on Lint - uses: frenck/action-addon-linter@v2.1 + uses: frenck/action-addon-linter@v2.2 with: community: true path: "./${{ needs.information.outputs.target }}" From 78437a0bb36ce9facc4c624050878ec1ff04e780 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Jul 2021 11:49:20 +0200 Subject: [PATCH 362/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20actions/sta?= =?UTF-8?q?le=20from=203.0.19=20to=204=20(#292)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/stale](https://github.com/actions/stale) from 3.0.19 to 4. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v3.0.19...v4) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/stale.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml index d9a5240..e066c74 100644 --- a/.github/workflows/stale.yaml +++ b/.github/workflows/stale.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 🚀 Run stale - uses: actions/stale@v3.0.19 + uses: actions/stale@v4 with: repo-token: ${{ secrets.GITHUB_TOKEN }} days-before-stale: 30 From cf678dd08e04dd7c0468692bc7a96a7a7c38059c Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 15 Jul 2021 12:32:03 +0200 Subject: [PATCH 363/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=20v4.2.2=20(#293)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- vscode/build.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 6a416c6..d267d50 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.2.1 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.2.2 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.json b/vscode/build.json index 21b8de4..aefd116 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { "build_from": { - "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:4.2.1", - "amd64": "ghcr.io/hassio-addons/debian-base/amd64:4.2.1" + "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:4.2.2", + "amd64": "ghcr.io/hassio-addons/debian-base/amd64:4.2.2" } } From db42018d38afba1d14a2fabae36a470f7959987e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 15 Jul 2021 12:37:17 +0200 Subject: [PATCH 364/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=203.11.0=20(#294)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index d267d50..3a29fb3 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -53,7 +53,7 @@ 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/v3.10.2/code-server-3.10.2-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.11.0/code-server-3.11.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 8ea72c2bdda92eb185dae9bea2c709a43658e468 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 15 Jul 2021 12:52:09 +0200 Subject: [PATCH 365/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20ESPHome?= =?UTF-8?q?.esphome-vscode=20to=200.20.0=20(#295)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 75f3e2a..4286931 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#6.4.0 -ESPHome.esphome-vscode#0.18.0 +ESPHome.esphome-vscode#0.20.0 keesschollaart.vscode-home-assistant#1.19.0 lukas-tr.materialdesignicons-intellisense#3.2.0 netcorext.uuid-generator#0.0.4 From bdc4c1922e5a104cd20e30cab321eabb3390e20f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 15 Jul 2021 13:03:42 +0200 Subject: [PATCH 366/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.20.0=20(#296)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 4286931..325d418 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#6.4.0 ESPHome.esphome-vscode#0.20.0 -keesschollaart.vscode-home-assistant#1.19.0 +keesschollaart.vscode-home-assistant#1.20.0 lukas-tr.materialdesignicons-intellisense#3.2.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 From 5d657ba1c1a01e7a611e4acb028bb165bdb4dff6 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 15 Jul 2021 14:33:56 +0200 Subject: [PATCH 367/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20esbenp.?= =?UTF-8?q?prettier-vscode=20to=208.0.1=20(#297)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 325d418..48f8d9a 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.11.0 -esbenp.prettier-vscode#6.4.0 +esbenp.prettier-vscode#8.0.1 ESPHome.esphome-vscode#0.20.0 keesschollaart.vscode-home-assistant#1.20.0 lukas-tr.materialdesignicons-intellisense#3.2.0 From 320c3af50ff45853f0f20c1a9480eb8b35daa6f7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 3 Aug 2021 16:35:17 +0200 Subject: [PATCH 368/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.21.0=20(#298)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 48f8d9a..afd2b77 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#8.0.1 ESPHome.esphome-vscode#0.20.0 -keesschollaart.vscode-home-assistant#1.20.0 +keesschollaart.vscode-home-assistant#1.21.0 lukas-tr.materialdesignicons-intellisense#3.2.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 From 6eacd23fda75ace7e6120a8c4832d2fd47717b87 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 3 Aug 2021 16:59:00 +0200 Subject: [PATCH 369/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20ESPHome?= =?UTF-8?q?.esphome-vscode=20to=200.22.0=20(#299)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index afd2b77..39d89ef 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#8.0.1 -ESPHome.esphome-vscode#0.20.0 +ESPHome.esphome-vscode#0.22.0 keesschollaart.vscode-home-assistant#1.21.0 lukas-tr.materialdesignicons-intellisense#3.2.0 netcorext.uuid-generator#0.0.4 From 252c0ff480c192f80fe9857198b71339cdbbe146 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Aug 2021 08:32:05 +0200 Subject: [PATCH 370/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20yamllint=20?= =?UTF-8?q?from=201.26.1=20to=201.26.2=20in=20/vscode=20(#300)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index e686ae0..7608e6d 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ homeassistant_cli==0.9.1 -yamllint==1.26.1 +yamllint==1.26.2 From 93cc18b3ef6b2db95b15454725f0e47370850bfd Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 11 Aug 2021 16:08:06 +0200 Subject: [PATCH 371/778] =?UTF-8?q?=F0=9F=9A=80=20Add-on=20CI=20improvemen?= =?UTF-8?q?ts=20(#302)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yaml | 16 +++++++++++----- .github/workflows/deploy.yaml | 16 +++++++++++----- .github/workflows/pr-labels.yaml | 3 ++- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 835b16a..bd4aa6a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -132,11 +132,9 @@ jobs: uses: actions/cache@v2.1.6 with: path: /tmp/.docker-cache - key: - docker-${{ github.ref }}-${{ matrix.architecture }}-${{ github.sha - }} + key: docker-${{ matrix.architecture }}-${{ github.sha }} restore-keys: | - docker-${{ github.ref }}-${{ matrix.architecture }} + docker-${{ matrix.architecture }} - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.2.0 - name: 🏗 Set up Docker Buildx @@ -186,7 +184,7 @@ jobs: cache-from: | type=local,src=/tmp/.docker-cache ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:edge - cache-to: type=local,mode=max,dest=/tmp/.docker-cache + cache-to: type=local,mode=max,dest=/tmp/.docker-cache-new platforms: ${{ steps.flags.outputs.platform }} build-args: | BUILD_ARCH=${{ matrix.architecture }} @@ -197,3 +195,11 @@ jobs: BUILD_REF=${{ github.sha }} BUILD_REPOSITORY=${{ github.repository }} BUILD_VERSION=edge + # This ugly bit is necessary, or our cache will grow forever... + # Well until we hit GitHub's limit of 5GB :) + # https://github.com/docker/build-push-action/issues/252 + # https://github.com/moby/buildkit/issues/1896 + - name: 🚚 Swap build cache + run: | + rm -rf /tmp/.docker-cache + mv /tmp/.docker-cache-new /tmp/.docker-cache diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 1db843f..00ac981 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -75,11 +75,9 @@ jobs: uses: actions/cache@v2.1.6 with: path: /tmp/.docker-cache - key: - docker-${{ github.ref }}-${{ matrix.architecture }}-${{ github.sha - }} + key: docker-${{ matrix.architecture }}-${{ github.sha }} restore-keys: | - docker-${{ github.ref }}-${{ matrix.architecture }} + docker-${{ matrix.architecture }} - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.2.0 - name: 🏗 Set up Docker Buildx @@ -140,7 +138,7 @@ jobs: cache-from: | type=local,src=/tmp/.docker-cache ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:edge - cache-to: type=local,mode=max,dest=/tmp/.docker-cache + cache-to: type=local,mode=max,dest=/tmp/.docker-cache-new platforms: ${{ steps.flags.outputs.platform }} build-args: | BUILD_ARCH=${{ matrix.architecture }} @@ -151,6 +149,14 @@ jobs: BUILD_REF=${{ github.sha }} BUILD_REPOSITORY=${{ github.repository }} BUILD_VERSION=${{ needs.information.outputs.version }} + # This ugly bit is necessary, or our cache will grow forever... + # Well until we hit GitHub's limit of 5GB :) + # https://github.com/docker/build-push-action/issues/252 + # https://github.com/moby/buildkit/issues/1896 + - name: 🚚 Swap build cache + run: | + rm -rf /tmp/.docker-cache + mv /tmp/.docker-cache-new /tmp/.docker-cache - name: 🔏 Notarize # yamllint disable rule:line-length run: | diff --git a/.github/workflows/pr-labels.yaml b/.github/workflows/pr-labels.yaml index 41da9cf..cdb62ab 100644 --- a/.github/workflows/pr-labels.yaml +++ b/.github/workflows/pr-labels.yaml @@ -3,7 +3,7 @@ name: PR Labels # yamllint disable-line rule:truthy on: - pull_request: + pull_request_target: types: [opened, labeled, unlabeled, synchronize] jobs: @@ -14,6 +14,7 @@ jobs: - name: 🏷 Verify PR has a valid label uses: jesusvasquez333/verify-pr-label-action@v1.4.0 with: + pull-request-number: "${{ github.event.pull_request.number }}" github-token: "${{ secrets.GITHUB_TOKEN }}" valid-labels: >- breaking-change, bugfix, documentation, enhancement, refactor, From 6d17cda851c9e3f2d340da4575edcae2630942bc Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 11 Aug 2021 16:21:29 +0200 Subject: [PATCH 372/778] =?UTF-8?q?=F0=9F=9A=91=20Fix=20contributing=20lin?= =?UTF-8?q?k=20in=20readme=20(#303)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 002802c..ccbe0cf 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ This is an active open-source project. We are always open to people who want to use the code or contribute to it. We have set up a separate document containing our -[contribution guidelines](CONTRIBUTING.md). +[contribution guidelines](.github/CONTRIBUTING.md). Thank you for being involved! :heart_eyes: From 3e84e8989bdf6b86cd1d0e5aafa7f1cb81ef58a2 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 11 Aug 2021 16:21:41 +0200 Subject: [PATCH 373/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=20v4.2.3=20(#304)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- vscode/build.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 3a29fb3..f7c7af6 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.2.2 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.2.3 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.json b/vscode/build.json index aefd116..7d63589 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { "build_from": { - "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:4.2.2", - "amd64": "ghcr.io/hassio-addons/debian-base/amd64:4.2.2" + "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:4.2.3", + "amd64": "ghcr.io/hassio-addons/debian-base/amd64:4.2.3" } } From 71eeb007aff9ec625237874888ef554dc9fc7a15 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 11 Aug 2021 16:34:45 +0200 Subject: [PATCH 374/778] =?UTF-8?q?=F0=9F=8F=8E=20Enable=20streaming=20mod?= =?UTF-8?q?e=20for=20Ingress=20(#306)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/config.json b/vscode/config.json index 2c186b3..64afdd5 100755 --- a/vscode/config.json +++ b/vscode/config.json @@ -6,6 +6,7 @@ "url": "https://github.com/hassio-addons/addon-vscode", "ingress": true, "ingress_port": 1337, + "ingress_stream": true, "panel_icon": "mdi:microsoft-visual-studio-code", "startup": "services", "init": false, From a39bf68e5fe5e47198c92cccb429517f18afa654 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 11 Aug 2021 17:03:11 +0200 Subject: [PATCH 375/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=203.11.1=20(#305)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ⬆️ Upgrades code-server to 3.11.1 * Use the correct URL --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index f7c7af6..cdfa27e 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -53,7 +53,7 @@ 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/v3.11.0/code-server-3.11.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.11.1/code-server-3.11.1-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 07c84522a17df8ab102541225a73577a843e17e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Aug 2021 09:02:25 +0200 Subject: [PATCH 376/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20dessant/loc?= =?UTF-8?q?k-threads=20from=202.1.1=20to=202.1.2=20(#308)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [dessant/lock-threads](https://github.com/dessant/lock-threads) from 2.1.1 to 2.1.2. - [Release notes](https://github.com/dessant/lock-threads/releases) - [Changelog](https://github.com/dessant/lock-threads/blob/master/CHANGELOG.md) - [Commits](https://github.com/dessant/lock-threads/compare/v2.1.1...v2.1.2) --- updated-dependencies: - dependency-name: dessant/lock-threads dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lock.yaml b/.github/workflows/lock.yaml index 2701640..3f5a74a 100644 --- a/.github/workflows/lock.yaml +++ b/.github/workflows/lock.yaml @@ -12,7 +12,7 @@ jobs: name: 🔒 Lock closed issues and PRs runs-on: ubuntu-latest steps: - - uses: dessant/lock-threads@v2.1.1 + - uses: dessant/lock-threads@v2.1.2 with: github-token: ${{ github.token }} issue-lock-inactive-days: "30" From 0b6cecd7d056834b5656cd83dc1f7541635fd396 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 20 Aug 2021 10:48:46 +0200 Subject: [PATCH 377/778] :arrow_up: Upgrades add-on base image to v5.0.0 --- vscode/Dockerfile | 50 +++++++++++++++++++++++------------------------ vscode/build.json | 4 ++-- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index cdfa27e..ac701c4 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.2.3 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.0.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -24,26 +24,26 @@ RUN \ apt-get update \ \ && apt-get install -y --no-install-recommends \ - ack=2.24-1 \ - bsdtar=3.3.3-4+deb10u1 \ - build-essential=12.6 \ - colordiff=1.0.18-1 \ - git=1:2.20.1-2+deb10u3 \ - iputils-ping=3:20180629-2+deb10u2 \ - locales=2.28-10 \ - mariadb-client=1:10.3.29-0+deb10u1 \ - mosquitto-clients=1.5.7-1+deb10u1 \ - net-tools=1.60+git20180626.aebd88e-1 \ - nmap=7.70+dfsg1-6+deb10u2 \ - openssh-client=1:7.9p1-10+deb10u2 \ - openssl=1.1.1d-0+deb10u6 \ - python3-dev=3.7.3-1 \ - python3=3.7.3-1 \ - unzip=6.0-23+deb10u2 \ - uuid-runtime=2.33.1-0.1 \ - wget=1.20.1-1.1 \ - zip=3.0-11+b1 \ - zsh=5.7.1-1 \ + ack=3.4.0-1 \ + libarchive-tools=3.4.3-2+b1 \ + 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 \ + mariadb-client=1:10.5.11-1 \ + 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 \ + openssl=1.1.1k-1 \ + python3-dev=3.9.2-3 \ + python3=3.9.2-3 \ + unzip=6.0-26 \ + uuid-runtime=2.36.1-8 \ + wget>=1.21-1 \ + zip=3.0-12 \ + zsh=5.8-6+b2 \ \ && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \ && locale-gen \ @@ -112,10 +112,10 @@ RUN \ python3-dev \ uuid-runtime \ \ - && find /usr/local/lib/python3.7/ -type d -name tests -depth -exec rm -rf {} \; \ - && find /usr/local/lib/python3.7/ -type d -name test -depth -exec rm -rf {} \; \ - && find /usr/local/lib/python3.7/ -name __pycache__ -depth -exec rm -rf {} \; \ - && find /usr/local/lib/python3.7/ -name "*.pyc" -depth -exec rm -f {} \; \ + && find /usr/local \ + \( -type d -a -name test -o -name tests -o -name '__pycache__' \) \ + -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) \ + -exec rm -rf '{}' + \ \ && rm -fr \ /tmp/* \ diff --git a/vscode/build.json b/vscode/build.json index 7d63589..fa62d86 100644 --- a/vscode/build.json +++ b/vscode/build.json @@ -1,6 +1,6 @@ { "build_from": { - "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:4.2.3", - "amd64": "ghcr.io/hassio-addons/debian-base/amd64:4.2.3" + "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:5.0.0", + "amd64": "ghcr.io/hassio-addons/debian-base/amd64:5.0.0" } } From 01d3d8c13229ccafbe556822ba49895440f54aac Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 20 Aug 2021 10:56:01 +0200 Subject: [PATCH 378/778] Temporary disable DL3008, as wget version is not consistent right now --- vscode/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ac701c4..935071d 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -19,7 +19,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -# hadolint ignore=SC2181 +# hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ \ @@ -41,7 +41,7 @@ RUN \ python3=3.9.2-3 \ unzip=6.0-26 \ uuid-runtime=2.36.1-8 \ - wget>=1.21-1 \ + wget=1.21-1 \ zip=3.0-12 \ zsh=5.8-6+b2 \ \ From eb83618b93d3badf7f92ccd101318ae5b4b57cd5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 20 Aug 2021 11:10:14 +0200 Subject: [PATCH 379/778] Minimal wget, amd64 is out of line --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 935071d..52e915d 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -41,7 +41,7 @@ RUN \ python3=3.9.2-3 \ unzip=6.0-26 \ uuid-runtime=2.36.1-8 \ - wget=1.21-1 \ + wget>=1.21-1 \ zip=3.0-12 \ zsh=5.8-6+b2 \ \ From b320acfbbf190a90a93592aba4bc7a0c709699f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 11:04:42 +0200 Subject: [PATCH 380/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20yamllint=20?= =?UTF-8?q?from=201.26.2=20to=201.26.3=20in=20/vscode=20(#312)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [yamllint](https://github.com/adrienverge/yamllint) from 1.26.2 to 1.26.3. - [Release notes](https://github.com/adrienverge/yamllint/releases) - [Changelog](https://github.com/adrienverge/yamllint/blob/master/CHANGELOG.rst) - [Commits](https://github.com/adrienverge/yamllint/compare/v1.26.2...v1.26.3) --- updated-dependencies: - dependency-name: yamllint dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 7608e6d..f9e68f0 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ homeassistant_cli==0.9.1 -yamllint==1.26.2 +yamllint==1.26.3 From 30d70379ee1d07f71581730637bfca92b168cfc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 11:04:53 +0200 Subject: [PATCH 381/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20docker/buil?= =?UTF-8?q?d-push-action=20from=202.6.1=20to=202.7.0=20(#311)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2.6.1 to 2.7.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v2.6.1...v2.7.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bd4aa6a..7885568 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -176,7 +176,7 @@ jobs: --exit-status \ '.verification.status == 0' - name: 🚀 Build - uses: docker/build-push-action@v2.6.1 + uses: docker/build-push-action@v2.7.0 with: push: false context: ${{ needs.information.outputs.target }} diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 00ac981..4766783 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -125,7 +125,7 @@ jobs: --exit-status \ '.verification.status == 0' - name: 🚀 Build - uses: docker/build-push-action@v2.6.1 + uses: docker/build-push-action@v2.7.0 with: load: true # yamllint disable rule:line-length From c3ab3538bd3ce5e0705657deb3701194868d3b34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Aug 2021 09:00:55 +0200 Subject: [PATCH 382/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20frenck/acti?= =?UTF-8?q?on-addon-linter=20from=202.2=20to=202.3=20(#313)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [frenck/action-addon-linter](https://github.com/frenck/action-addon-linter) from 2.2 to 2.3. - [Release notes](https://github.com/frenck/action-addon-linter/releases) - [Commits](https://github.com/frenck/action-addon-linter/compare/v2.2...v2.3) --- updated-dependencies: - dependency-name: frenck/action-addon-linter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7885568..1cd0d55 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,7 @@ jobs: - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2.3.4 - name: 🚀 Run Add-on Lint - uses: frenck/action-addon-linter@v2.2 + uses: frenck/action-addon-linter@v2.3 with: community: true path: "./${{ needs.information.outputs.target }}" From 976dc4b209a36297b9bdca203c08203a5ce8d166 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 21:07:10 +0200 Subject: [PATCH 383/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20creyD/prett?= =?UTF-8?q?ier=5Faction=20from=203.3=20to=204.0=20(#318)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [creyD/prettier_action](https://github.com/creyD/prettier_action) from 3.3 to 4.0. - [Release notes](https://github.com/creyD/prettier_action/releases) - [Commits](https://github.com/creyD/prettier_action/compare/v3.3...v4.0) --- updated-dependencies: - dependency-name: creyD/prettier_action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1cd0d55..8345bd9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -103,7 +103,7 @@ jobs: - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2.3.4 - name: 🚀 Run Prettier - uses: creyD/prettier_action@v3.3 + uses: creyD/prettier_action@v4.0 with: prettier_options: --write **/*.{json,js,md,yaml} env: From 7147ba1e4cbb8047758b4aa5a5ea84d07c00afd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 21:07:20 +0200 Subject: [PATCH 384/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20docker/setu?= =?UTF-8?q?p-buildx-action=20from=201.5.1=20to=201.6.0=20(#317)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1.5.1 to 1.6.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1.5.1...v1.6.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- .github/workflows/deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8345bd9..b129768 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -138,7 +138,7 @@ jobs: - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.2.0 - name: 🏗 Set up Docker Buildx - uses: docker/setup-buildx-action@v1.5.1 + uses: docker/setup-buildx-action@v1.6.0 - name: 🏗 Set up CodeNotary run: bash <(curl https://getvcn.codenotary.com -L) - name: ℹ️ Compose build flags diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 4766783..d0ff759 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -81,7 +81,7 @@ jobs: - name: 🏗 Set up QEMU uses: docker/setup-qemu-action@v1.2.0 - name: 🏗 Set up Docker Buildx - uses: docker/setup-buildx-action@v1.5.1 + uses: docker/setup-buildx-action@v1.6.0 - name: 🏗 Set up CodeNotary run: bash <(curl https://getvcn.codenotary.com -L) - name: ℹ️ Compose build flags From ce03203fd75a70fa9441468eb8ca1b450c861eb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Sep 2021 11:18:42 +0200 Subject: [PATCH 385/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20frenck/acti?= =?UTF-8?q?on-addon-linter=20from=202.3=20to=202.4.1=20(#325)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [frenck/action-addon-linter](https://github.com/frenck/action-addon-linter) from 2.3 to 2.4.1. - [Release notes](https://github.com/frenck/action-addon-linter/releases) - [Commits](https://github.com/frenck/action-addon-linter/compare/v2.3...v2.4.1) --- updated-dependencies: - dependency-name: frenck/action-addon-linter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b129768..3e2b1f0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,7 @@ jobs: - name: ⤵️ Check out code from GitHub uses: actions/checkout@v2.3.4 - name: 🚀 Run Add-on Lint - uses: frenck/action-addon-linter@v2.3 + uses: frenck/action-addon-linter@v2.4.1 with: community: true path: "./${{ needs.information.outputs.target }}" From deb9bd3d12d647a846fe89076dca7ab194f8c008 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 7 Oct 2021 16:10:08 +0200 Subject: [PATCH 386/778] :arrow_up: Upgrade lock-threads workflow to 3.0.0 (#327) --- .github/workflows/lock.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lock.yaml b/.github/workflows/lock.yaml index 3f5a74a..2f5e1c8 100644 --- a/.github/workflows/lock.yaml +++ b/.github/workflows/lock.yaml @@ -12,10 +12,10 @@ jobs: name: 🔒 Lock closed issues and PRs runs-on: ubuntu-latest steps: - - uses: dessant/lock-threads@v2.1.2 + - uses: dessant/lock-threads@v3.0.0 with: github-token: ${{ github.token }} - issue-lock-inactive-days: "30" + issue-inactive-days: "30" issue-lock-reason: "" - pr-lock-inactive-days: "1" + pr-inactive-days: "1" pr-lock-reason: "" From cea5dad4effe463abf95d2694e9496052ac1c097 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 11:18:53 +0200 Subject: [PATCH 387/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20actions/che?= =?UTF-8?q?ckout=20from=202.3.4=20to=202.3.5=20(#330)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.4 to 2.3.5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.3.4...v2.3.5) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 18 +++++++++--------- .github/workflows/deploy.yaml | 4 ++-- .github/workflows/labels.yaml | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3e2b1f0..0d5090c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,7 +24,7 @@ jobs: target: ${{ steps.information.outputs.target }} steps: - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.3.5 - name: 🚀 Run add-on information action id: information uses: frenck/action-addon-information@v1.2 @@ -36,7 +36,7 @@ jobs: runs-on: ubuntu-latest steps: - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.3.5 - name: 🚀 Run Add-on Lint uses: frenck/action-addon-linter@v2.4.1 with: @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-latest steps: - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.3.5 - name: 🚀 Run Hadolint uses: brpaz/hadolint-action@v1.5.0 with: @@ -61,7 +61,7 @@ jobs: runs-on: ubuntu-latest steps: - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.3.5 - name: 🚀 Run JQ run: | shopt -s globstar @@ -72,7 +72,7 @@ jobs: runs-on: ubuntu-latest steps: - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.3.5 - name: 🚀 Run mdl uses: actionshub/markdownlint@2.0.2 @@ -81,7 +81,7 @@ jobs: runs-on: ubuntu-latest steps: - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.3.5 - name: 🚀 Run Shellcheck uses: ludeeus/action-shellcheck@1.1.0 env: @@ -92,7 +92,7 @@ jobs: runs-on: ubuntu-latest steps: - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.3.5 - name: 🚀 Run YAMLLint uses: frenck/action-yamllint@v1.1 @@ -101,7 +101,7 @@ jobs: runs-on: ubuntu-latest steps: - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.3.5 - name: 🚀 Run Prettier uses: creyD/prettier_action@v4.0 with: @@ -126,7 +126,7 @@ jobs: architecture: ${{ fromJson(needs.information.outputs.architectures) }} steps: - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.3.5 - name: 🏗 Set up build cache id: cache uses: actions/cache@v2.1.6 diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index d0ff759..675cbad 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -33,7 +33,7 @@ jobs: version: ${{ steps.release.outputs.version }} steps: - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.3.5 - name: 🚀 Run add-on information action id: information uses: frenck/action-addon-information@v1.2 @@ -69,7 +69,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.3.5 - name: 🏗 Set up build cache id: cache uses: actions/cache@v2.1.6 diff --git a/.github/workflows/labels.yaml b/.github/workflows/labels.yaml index b2adbb1..d1b2dbe 100644 --- a/.github/workflows/labels.yaml +++ b/.github/workflows/labels.yaml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v2.3.5 - name: 🚀 Run Label Syncer uses: micnncim/action-label-syncer@v1.3.0 env: From 034b890557a22ac3187cb9cad92000db00a65279 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 9 Nov 2021 18:24:09 +0100 Subject: [PATCH 388/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20locales?= =?UTF-8?q?=20to=202.31-13+deb11u2=20(#337)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 52e915d..7ea5815 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -30,7 +30,7 @@ RUN \ colordiff=1.0.18-1.1 \ git=1:2.30.2-1 \ iputils-ping=3:20210202-1 \ - locales=2.31-13 \ + locales=2.31-13+deb11u2 \ mariadb-client=1:10.5.11-1 \ mosquitto-clients=2.0.11-1 \ net-tools=1.60+git20181103.0eebece-1 \ From a1d9be889fbff636bab997cf6dcba9813d591b44 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 9 Nov 2021 18:46:58 +0100 Subject: [PATCH 389/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20mariadb?= =?UTF-8?q?-client=20to=201:10.5.12-0+deb11u1=20(#338)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 7ea5815..28904f6 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -31,7 +31,7 @@ RUN \ git=1:2.30.2-1 \ iputils-ping=3:20210202-1 \ locales=2.31-13+deb11u2 \ - mariadb-client=1:10.5.11-1 \ + mariadb-client=1:10.5.12-0+deb11u1 \ mosquitto-clients=2.0.11-1 \ net-tools=1.60+git20181103.0eebece-1 \ nmap=7.91+dfsg1+really7.80+dfsg1-2 \ From 3a7923b042df8b86c3185e6ac496e8e8ca9a2620 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 9 Nov 2021 19:12:36 +0100 Subject: [PATCH 390/778] Switch to centralized GitHub Action Workflows (#339) --- .github/labels.yml | 85 --------- .github/release-drafter.yml | 57 ------ .github/workflows/ci.yaml | 195 +------------------ .github/workflows/deploy.yaml | 250 +------------------------ .github/workflows/labels.yaml | 22 +-- .github/workflows/lock.yaml | 15 +- .github/workflows/pr-labels.yaml | 23 +-- .github/workflows/release-drafter.yaml | 12 +- .github/workflows/stale.yaml | 34 +--- 9 files changed, 37 insertions(+), 656 deletions(-) delete mode 100644 .github/labels.yml delete mode 100644 .github/release-drafter.yml diff --git a/.github/labels.yml b/.github/labels.yml deleted file mode 100644 index 2d0f68a..0000000 --- a/.github/labels.yml +++ /dev/null @@ -1,85 +0,0 @@ ---- -- name: "breaking-change" - color: ee0701 - description: "A breaking change for existing users." -- name: "bugfix" - color: ee0701 - description: "Inconsistencies or issues which will cause a problem for users or implementors." -- name: "documentation" - color: 0052cc - description: "Solely about the documentation of the project." -- name: "enhancement" - color: 1d76db - description: "Enhancement of the code, not introducing new features." -- name: "refactor" - color: 1d76db - description: "Improvement of existing code, not introducing new features." -- name: "performance" - color: 1d76db - description: "Improving performance, not introducing new features." -- name: "new-feature" - color: 0e8a16 - description: "New features or options." -- name: "maintenance" - color: 2af79e - description: "Generic maintenance tasks." -- name: "ci" - color: 1d76db - description: "Work that improves the continue integration." -- name: "dependencies" - color: 1d76db - description: "Upgrade or downgrade of project dependencies." - -- name: "in-progress" - color: fbca04 - description: "Issue is currently being resolved by a developer." -- name: "stale" - color: fef2c0 - description: "There has not been activity on this issue or PR for quite some time." -- name: "no-stale" - color: fef2c0 - description: "This issue or PR is exempted from the stable bot." - -- name: "security" - color: ee0701 - description: "Marks a security issue that needs to be resolved asap." -- name: "incomplete" - color: fef2c0 - description: "Marks a PR or issue that is missing information." -- name: "invalid" - color: fef2c0 - description: "Marks a PR or issue that is missing information." - -- name: "beginner-friendly" - color: 0e8a16 - description: "Good first issue for people wanting to contribute to the project." -- name: "help-wanted" - color: 0e8a16 - description: "We need some extra helping hands or expertise in order to resolve this." - -- name: "hacktoberfest" - description: "Issues/PRs are participating in the Hacktoberfest." - color: fbca04 -- name: "hacktoberfest-accepted" - description: "Issues/PRs are participating in the Hacktoberfest." - color: fbca04 - -- name: "priority-critical" - color: ee0701 - description: "This should be dealt with ASAP. Not fixing this issue would be a serious error." -- name: "priority-high" - color: b60205 - description: "After critical issues are fixed, these should be dealt with before any further issues." -- name: "priority-medium" - color: 0e8a16 - description: "This issue may be useful, and needs some attention." -- name: "priority-low" - color: e4ea8a - description: "Nice addition, maybe... someday..." - -- name: "major" - color: b60205 - description: "This PR causes a major version bump in the version number." -- name: "minor" - color: 0e8a16 - description: "This PR causes a minor version bump in the version number." diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml deleted file mode 100644 index cb404ea..0000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,57 +0,0 @@ ---- -name-template: "v$RESOLVED_VERSION" -tag-template: "v$RESOLVED_VERSION" -change-template: "- $TITLE @$AUTHOR (#$NUMBER)" -sort-direction: ascending - -categories: - - title: "🚨 Breaking changes" - labels: - - "breaking-change" - - title: "✨ New features" - labels: - - "new-feature" - - title: "🐛 Bug fixes" - labels: - - "bugfix" - - title: "🚀 Enhancements" - labels: - - "enhancement" - - "refactor" - - "performance" - - title: "🧰 Maintenance" - labels: - - "maintenance" - - "ci" - - title: "📚 Documentation" - labels: - - "documentation" - - title: "⬆️ Dependency updates" - labels: - - "dependencies" - -version-resolver: - major: - labels: - - "major" - - "breaking-change" - minor: - labels: - - "minor" - - "new-feature" - patch: - labels: - - "bugfix" - - "chore" - - "ci" - - "dependencies" - - "documentation" - - "enhancement" - - "performance" - - "refactor" - default: patch - -template: | - ## What’s changed - - $CHANGES diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0d5090c..adf12e4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,194 +12,7 @@ on: workflow_dispatch: jobs: - information: - name: Gather add-on information - runs-on: ubuntu-latest - outputs: - architectures: ${{ steps.information.outputs.architectures }} - build: ${{ steps.information.outputs.build }} - description: ${{ steps.information.outputs.description }} - name: ${{ steps.information.outputs.name }} - slug: ${{ steps.information.outputs.slug }} - target: ${{ steps.information.outputs.target }} - steps: - - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.5 - - name: 🚀 Run add-on information action - id: information - uses: frenck/action-addon-information@v1.2 - - lint-addon: - name: Lint Add-on - needs: - - information - runs-on: ubuntu-latest - steps: - - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.5 - - name: 🚀 Run Add-on Lint - uses: frenck/action-addon-linter@v2.4.1 - with: - community: true - path: "./${{ needs.information.outputs.target }}" - - lint-hadolint: - name: Hadolint - needs: - - information - runs-on: ubuntu-latest - steps: - - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.5 - - name: 🚀 Run Hadolint - uses: brpaz/hadolint-action@v1.5.0 - with: - dockerfile: "./${{ needs.information.outputs.target }}/Dockerfile" - - lint-json: - name: JSON Lint - runs-on: ubuntu-latest - steps: - - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.5 - - name: 🚀 Run JQ - run: | - shopt -s globstar - cat **/*.json | jq '.' - - lint-markdown: - name: MarkdownLint - runs-on: ubuntu-latest - steps: - - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.5 - - name: 🚀 Run mdl - uses: actionshub/markdownlint@2.0.2 - - lint-shellcheck: - name: Shellcheck - runs-on: ubuntu-latest - steps: - - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.5 - - name: 🚀 Run Shellcheck - uses: ludeeus/action-shellcheck@1.1.0 - env: - SHELLCHECK_OPTS: -s bash - - lint-yamllint: - name: YAMLLint - runs-on: ubuntu-latest - steps: - - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.5 - - name: 🚀 Run YAMLLint - uses: frenck/action-yamllint@v1.1 - - lint-prettier: - name: Prettier - runs-on: ubuntu-latest - steps: - - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.5 - - name: 🚀 Run Prettier - uses: creyD/prettier_action@v4.0 - with: - prettier_options: --write **/*.{json,js,md,yaml} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - build: - name: Build ${{ matrix.architecture }} - needs: - - information - - lint-addon - - lint-hadolint - - lint-json - - lint-markdown - - lint-prettier - - lint-shellcheck - - lint-yamllint - runs-on: ubuntu-latest - strategy: - matrix: - architecture: ${{ fromJson(needs.information.outputs.architectures) }} - steps: - - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.5 - - name: 🏗 Set up build cache - id: cache - uses: actions/cache@v2.1.6 - with: - path: /tmp/.docker-cache - key: docker-${{ matrix.architecture }}-${{ github.sha }} - restore-keys: | - docker-${{ matrix.architecture }} - - name: 🏗 Set up QEMU - uses: docker/setup-qemu-action@v1.2.0 - - name: 🏗 Set up Docker Buildx - uses: docker/setup-buildx-action@v1.6.0 - - name: 🏗 Set up CodeNotary - run: bash <(curl https://getvcn.codenotary.com -L) - - name: ℹ️ Compose build flags - id: flags - run: | - echo "::set-output name=date::$(date +"%Y-%m-%dT%H:%M:%SZ")" - from=$(jq --raw-output ".build_from.${{ matrix.architecture }}" "${{ needs.information.outputs.build }}") - echo "::set-output name=from::${from}" - - if [[ "${{ matrix.architecture}}" = "amd64" ]]; then - echo "::set-output name=platform::linux/amd64" - elif [[ "${{ matrix.architecture }}" = "i386" ]]; then - echo "::set-output name=platform::linux/386" - elif [[ "${{ matrix.architecture }}" = "armhf" ]]; then - echo "::set-output name=platform::linux/arm/v6" - elif [[ "${{ matrix.architecture }}" = "armv7" ]]; then - echo "::set-output name=platform::linux/arm/v7" - elif [[ "${{ matrix.architecture }}" = "aarch64" ]]; then - echo "::set-output name=platform::linux/arm64/v8" - else - echo "::error ::Could not determine platform for architecture ${{ matrix.architecture }}" - exit 1 - fi - - name: ⤵️ Download base image - run: docker pull "${{ steps.flags.outputs.from }}" - - name: ✅ Verify authenticity of base image - run: | - vcn authenticate \ - "docker://${{ steps.flags.outputs.from }}" - vcn authenticate \ - --output json \ - --signerID 0x03e406879fd89e52f38f4aab0061266d1183980a \ - "docker://${{ steps.flags.outputs.from }}" \ - | jq \ - --exit-status \ - '.verification.status == 0' - - name: 🚀 Build - uses: docker/build-push-action@v2.7.0 - with: - push: false - context: ${{ needs.information.outputs.target }} - file: ${{ needs.information.outputs.target }}/Dockerfile - cache-from: | - type=local,src=/tmp/.docker-cache - ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:edge - cache-to: type=local,mode=max,dest=/tmp/.docker-cache-new - platforms: ${{ steps.flags.outputs.platform }} - build-args: | - BUILD_ARCH=${{ matrix.architecture }} - BUILD_DATE=${{ steps.flags.outputs.date }} - BUILD_DESCRIPTION=${{ needs.information.outputs.description }} - BUILD_FROM=${{ steps.flags.outputs.from }} - BUILD_NAME=${{ needs.information.outputs.name }} - BUILD_REF=${{ github.sha }} - BUILD_REPOSITORY=${{ github.repository }} - BUILD_VERSION=edge - # This ugly bit is necessary, or our cache will grow forever... - # Well until we hit GitHub's limit of 5GB :) - # https://github.com/docker/build-push-action/issues/252 - # https://github.com/moby/buildkit/issues/1896 - - name: 🚚 Swap build cache - run: | - rm -rf /tmp/.docker-cache - mv /tmp/.docker-cache-new /tmp/.docker-cache + workflows: + uses: hassio-addons/workflows/.github/workflows/addon-ci.yaml@main + secrets: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 675cbad..208af26 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -13,248 +13,8 @@ on: - completed jobs: - information: - if: | - github.event_name == 'release' - || ( - github.event_name == 'workflow_run' - && github.event.workflow_run.conclusion == 'success' - ) - name: ℹ️ Gather add-on information - runs-on: ubuntu-latest - outputs: - architectures: ${{ steps.information.outputs.architectures }} - build: ${{ steps.information.outputs.build }} - description: ${{ steps.information.outputs.description }} - environment: ${{ steps.release.outputs.environment }} - name: ${{ steps.information.outputs.name }} - slug: ${{ steps.information.outputs.slug }} - target: ${{ steps.information.outputs.target }} - version: ${{ steps.release.outputs.version }} - steps: - - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.5 - - name: 🚀 Run add-on information action - id: information - uses: frenck/action-addon-information@v1.2 - - name: ℹ️ Gather version and environment - id: release - run: | - sha="${{ github.sha }}" - environment="edge" - version="${sha:0:7}" - if [[ "${{ github.event_name }}" = "release" ]]; then - version="${{ github.event.release.tag_name }}" - version="${version,,}" - version="${version#v}" - environment="stable" - if [[ "${{ github.event.release.prerelease }}" = "true" ]]; then - environment="beta" - fi - fi - - echo "::set-output name=environment::${environment}" - echo "::set-output name=version::${version}" - - deploy: - name: 👷 Build & Deploy ${{ matrix.architecture }} - needs: information - runs-on: ubuntu-latest - strategy: - matrix: - architecture: ${{ fromJson(needs.information.outputs.architectures) }} - steps: - - name: 🔂 Wait for other runs to complete - uses: softprops/turnstyle@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.5 - - name: 🏗 Set up build cache - id: cache - uses: actions/cache@v2.1.6 - with: - path: /tmp/.docker-cache - key: docker-${{ matrix.architecture }}-${{ github.sha }} - restore-keys: | - docker-${{ matrix.architecture }} - - name: 🏗 Set up QEMU - uses: docker/setup-qemu-action@v1.2.0 - - name: 🏗 Set up Docker Buildx - uses: docker/setup-buildx-action@v1.6.0 - - name: 🏗 Set up CodeNotary - run: bash <(curl https://getvcn.codenotary.com -L) - - name: ℹ️ Compose build flags - id: flags - run: | - echo "::set-output name=date::$(date +"%Y-%m-%dT%H:%M:%SZ")" - from=$(jq --raw-output ".build_from.${{ matrix.architecture }}" "${{ needs.information.outputs.build }}") - echo "::set-output name=from::${from}" - - if [[ "${{ matrix.architecture}}" = "amd64" ]]; then - echo "::set-output name=platform::linux/amd64" - elif [[ "${{ matrix.architecture }}" = "i386" ]]; then - echo "::set-output name=platform::linux/386" - elif [[ "${{ matrix.architecture }}" = "armhf" ]]; then - echo "::set-output name=platform::linux/arm/v6" - elif [[ "${{ matrix.architecture }}" = "armv7" ]]; then - echo "::set-output name=platform::linux/arm/v7" - elif [[ "${{ matrix.architecture }}" = "aarch64" ]]; then - echo "::set-output name=platform::linux/arm64/v8" - else - echo "::error ::Could not determine platform for architecture ${{ matrix.architecture }}" - exit 1 - fi - - name: 🏗 Login to GitHub Container Registry - uses: docker/login-action@v1.10.0 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: ⤵️ Download base image - run: docker pull "${{ steps.flags.outputs.from }}" - - name: ✅ Verify authenticity of base image - run: | - vcn authenticate \ - "docker://${{ steps.flags.outputs.from }}" - vcn authenticate \ - --output json \ - --signerID 0x03e406879fd89e52f38f4aab0061266d1183980a \ - "docker://${{ steps.flags.outputs.from }}" \ - | jq \ - --exit-status \ - '.verification.status == 0' - - name: 🚀 Build - uses: docker/build-push-action@v2.7.0 - with: - load: true - # yamllint disable rule:line-length - tags: | - ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:${{ needs.information.outputs.environment }} - ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:${{ needs.information.outputs.version }} - # yamllint enable rule:line-length - context: ${{ needs.information.outputs.target }} - file: ${{ needs.information.outputs.target }}/Dockerfile - cache-from: | - type=local,src=/tmp/.docker-cache - ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:edge - cache-to: type=local,mode=max,dest=/tmp/.docker-cache-new - platforms: ${{ steps.flags.outputs.platform }} - build-args: | - BUILD_ARCH=${{ matrix.architecture }} - BUILD_DATE=${{ steps.flags.outputs.date }} - BUILD_DESCRIPTION=${{ needs.information.outputs.description }} - BUILD_FROM=${{ steps.flags.outputs.from }} - BUILD_NAME=${{ needs.information.outputs.name }} - BUILD_REF=${{ github.sha }} - BUILD_REPOSITORY=${{ github.repository }} - BUILD_VERSION=${{ needs.information.outputs.version }} - # This ugly bit is necessary, or our cache will grow forever... - # Well until we hit GitHub's limit of 5GB :) - # https://github.com/docker/build-push-action/issues/252 - # https://github.com/moby/buildkit/issues/1896 - - name: 🚚 Swap build cache - run: | - rm -rf /tmp/.docker-cache - mv /tmp/.docker-cache-new /tmp/.docker-cache - - name: 🔏 Notarize - # yamllint disable rule:line-length - run: | - if vcn authenticate \ - --output json \ - "docker://ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:${{ needs.information.outputs.version }}" \ - | jq \ - --exit-status \ - '.verification.status != 0'; - then - vcn login - vcn notarize \ - --public \ - "docker://ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:${{ needs.information.outputs.version }}" - fi - env: - VCN_USER: ${{ secrets.VCN_USER }} - VCN_PASSWORD: ${{ secrets.VCN_PASSWORD }} - VCN_NOTARIZATION_PASSWORD: ${{ secrets.VCN_NOTARIZATION_PASSWORD }} - VCN_OTP_EMPTY: true - - name: 🚀 Push - # yamllint disable rule:line-length - run: | - docker push \ - "ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:${{ needs.information.outputs.environment }}" - docker push \ - "ghcr.io/hassio-addons/${{ needs.information.outputs.slug }}/${{ matrix.architecture }}:${{ needs.information.outputs.version }}" - - publish-edge: - name: 📢 Publish to edge repository - if: needs.information.outputs.environment == 'edge' - needs: - - information - - deploy - environment: - name: ${{ needs.information.outputs.environment }} - runs-on: ubuntu-latest - steps: - - name: 🚀 Dispatch repository updater update signal - uses: peter-evans/repository-dispatch@v1.1.3 - with: - token: ${{ secrets.DISPATCH_TOKEN }} - repository: hassio-addons/repository-edge - event-type: update - client-payload: > - { - "addon": "${{ needs.information.outputs.slug }}", - "name": "${{ needs.information.outputs.name }}", - "repository": "${{ github.repository }}", - "version": "${{ needs.information.outputs.version }}" - } - - publish-beta: - name: 📢 Publish to beta repository - if: | - needs.information.outputs.environment == 'beta' || - needs.information.outputs.environment == 'stable' - needs: - - information - - deploy - environment: - name: ${{ needs.information.outputs.environment }} - runs-on: ubuntu-latest - steps: - - name: 🚀 Dispatch repository updater update signal - uses: peter-evans/repository-dispatch@v1.1.3 - with: - token: ${{ secrets.DISPATCH_TOKEN }} - repository: hassio-addons/repository-beta - event-type: update - client-payload: > - { - "addon": "${{ needs.information.outputs.slug }}", - "name": "${{ needs.information.outputs.name }}", - "repository": "${{ github.repository }}", - "version": "${{ github.event.release.tag_name }}" - } - - publish-stable: - name: 📢 Publish to stable repository - if: needs.information.outputs.environment == 'stable' - needs: - - information - - deploy - environment: - name: ${{ needs.information.outputs.environment }} - runs-on: ubuntu-latest - steps: - - name: 🚀 Dispatch repository updater update signal - uses: peter-evans/repository-dispatch@v1.1.3 - with: - token: ${{ secrets.DISPATCH_TOKEN }} - repository: hassio-addons/repository - event-type: update - client-payload: > - { - "addon": "${{ needs.information.outputs.slug }}", - "name": "${{ needs.information.outputs.name }}", - "repository": "${{ github.repository }}", - "version": "${{ github.event.release.tag_name }}" - } + workflows: + uses: hassio-addons/workflows/.github/workflows/addon-deploy.yaml@main + secrets: + DISPATCH_TOKEN: ${{ secrets.DISPATCH_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/labels.yaml b/.github/workflows/labels.yaml index d1b2dbe..23a272f 100644 --- a/.github/workflows/labels.yaml +++ b/.github/workflows/labels.yaml @@ -3,20 +3,12 @@ name: Sync labels # yamllint disable-line rule:truthy on: - push: - branches: - - main - paths: - - .github/labels.yml + schedule: + - cron: "34 5 * * *" + workflow_dispatch: jobs: - labels: - name: ♻️ Sync labels - runs-on: ubuntu-latest - steps: - - name: ⤵️ Check out code from GitHub - uses: actions/checkout@v2.3.5 - - name: 🚀 Run Label Syncer - uses: micnncim/action-label-syncer@v1.3.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + workflows: + uses: hassio-addons/workflows/.github/workflows/labels.yaml@main + secrets: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/lock.yaml b/.github/workflows/lock.yaml index 2f5e1c8..1d278d1 100644 --- a/.github/workflows/lock.yaml +++ b/.github/workflows/lock.yaml @@ -8,14 +8,7 @@ on: workflow_dispatch: jobs: - lock: - name: 🔒 Lock closed issues and PRs - runs-on: ubuntu-latest - steps: - - uses: dessant/lock-threads@v3.0.0 - with: - github-token: ${{ github.token }} - issue-inactive-days: "30" - issue-lock-reason: "" - pr-inactive-days: "1" - pr-lock-reason: "" + workflows: + uses: hassio-addons/workflows/.github/workflows/lock.yaml@main + secrets: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/pr-labels.yaml b/.github/workflows/pr-labels.yaml index cdb62ab..bc96029 100644 --- a/.github/workflows/pr-labels.yaml +++ b/.github/workflows/pr-labels.yaml @@ -4,19 +4,14 @@ name: PR Labels # yamllint disable-line rule:truthy on: pull_request_target: - types: [opened, labeled, unlabeled, synchronize] + types: + - opened + - labeled + - unlabeled + - synchronize jobs: - pr_labels: - name: Verify - runs-on: ubuntu-latest - steps: - - name: 🏷 Verify PR has a valid label - uses: jesusvasquez333/verify-pr-label-action@v1.4.0 - with: - pull-request-number: "${{ github.event.pull_request.number }}" - github-token: "${{ secrets.GITHUB_TOKEN }}" - valid-labels: >- - breaking-change, bugfix, documentation, enhancement, refactor, - performance, new-feature, maintenance, ci, dependencies - disable-reviews: true + workflows: + uses: hassio-addons/workflows/.github/workflows/pr-labels.yaml@main + secrets: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release-drafter.yaml b/.github/workflows/release-drafter.yaml index 06cc26a..ce377ad 100644 --- a/.github/workflows/release-drafter.yaml +++ b/.github/workflows/release-drafter.yaml @@ -8,11 +8,7 @@ on: - main jobs: - update_release_draft: - name: ✏️ Draft release - runs-on: ubuntu-latest - steps: - - name: 🚀 Run Release Drafter - uses: release-drafter/release-drafter@v5.15.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + workflows: + uses: hassio-addons/workflows/.github/workflows/release-drafter.yaml@main + secrets: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml index e066c74..a063b17 100644 --- a/.github/workflows/stale.yaml +++ b/.github/workflows/stale.yaml @@ -8,33 +8,7 @@ on: workflow_dispatch: jobs: - stale: - name: 🧹 Clean up stale issues and PRs - runs-on: ubuntu-latest - steps: - - name: 🚀 Run stale - uses: actions/stale@v4 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - days-before-stale: 30 - days-before-close: 7 - remove-stale-when-updated: true - stale-issue-label: "stale" - exempt-issue-labels: "no-stale,help-wanted" - stale-issue-message: > - There hasn't been any activity on this issue recently, so we - clean up some of the older and inactive issues. - - Please make sure to update to the latest version and - check if that solves the issue. Let us know if that works for you - by leaving a comment 👍 - - This issue has now been marked as stale and will be closed if no - further activity occurs. Thanks! - stale-pr-label: "stale" - exempt-pr-labels: "no-stale" - stale-pr-message: > - There hasn't been any activity on this pull request recently. This - pull request has been automatically marked as stale because of that - and will be closed if no further activity occurs within 7 days. - Thank you for your contributions. + workflows: + uses: hassio-addons/workflows/.github/workflows/stale.yaml@main + secrets: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From ae250d5b8f12cc0ae2f4c54a376324a0958c1040 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 9 Nov 2021 19:21:50 +0100 Subject: [PATCH 391/778] Migrate JSON config to YAML (#340) --- vscode/build.json | 6 ------ vscode/build.yaml | 4 ++++ vscode/config.json | 37 ------------------------------------- vscode/config.yaml | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 vscode/build.json create mode 100644 vscode/build.yaml delete mode 100755 vscode/config.json create mode 100644 vscode/config.yaml diff --git a/vscode/build.json b/vscode/build.json deleted file mode 100644 index fa62d86..0000000 --- a/vscode/build.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "build_from": { - "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:5.0.0", - "amd64": "ghcr.io/hassio-addons/debian-base/amd64:5.0.0" - } -} diff --git a/vscode/build.yaml b/vscode/build.yaml new file mode 100644 index 0000000..bec450d --- /dev/null +++ b/vscode/build.yaml @@ -0,0 +1,4 @@ +--- +build_from: + aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.0.0 + amd64: ghcr.io/hassio-addons/debian-base/amd64:5.0.0 diff --git a/vscode/config.json b/vscode/config.json deleted file mode 100755 index 64afdd5..0000000 --- a/vscode/config.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "Visual Studio Code", - "version": "dev", - "slug": "vscode", - "description": "Fully featured VSCode experience, to edit your HA config in the browser, including auto-completion!", - "url": "https://github.com/hassio-addons/addon-vscode", - "ingress": true, - "ingress_port": 1337, - "ingress_stream": true, - "panel_icon": "mdi:microsoft-visual-studio-code", - "startup": "services", - "init": false, - "arch": ["aarch64", "amd64"], - "uart": true, - "hassio_api": true, - "hassio_role": "manager", - "homeassistant_api": true, - "map": [ - "config:rw", - "ssl:rw", - "addons:rw", - "media:rw", - "share:rw", - "backup:rw" - ], - "services": ["mysql:want", "mqtt:want"], - "options": { - "packages": [], - "init_commands": [] - }, - "schema": { - "log_level": "list(trace|debug|info|notice|warning|error|fatal)?", - "config_path": "str?", - "packages": ["str"], - "init_commands": ["str"] - } -} diff --git a/vscode/config.yaml b/vscode/config.yaml new file mode 100644 index 0000000..653a293 --- /dev/null +++ b/vscode/config.yaml @@ -0,0 +1,39 @@ +--- +name: Visual Studio Code +version: dev +slug: vscode +description: Fully featured VSCode experience, to edit your HA config in the browser, including auto-completion! +url: https://github.com/hassio-addons/addon-vscode +ingress: true +ingress_port: 1337 +ingress_stream: true +panel_icon: mdi:microsoft-visual-studio-code +startup: services +init: false +arch: + - aarch64 + - amd64 +uart: true +hassio_api: true +hassio_role: manager +homeassistant_api: true +map: + - config:rw + - ssl:rw + - addons:rw + - media:rw + - share:rw + - backup:rw +services: + - mysql:want + - mqtt:want +options: + packages: [] + init_commands: [] +schema: + log_level: list(trace|debug|info|notice|warning|error|fatal)? + config_path: str? + packages: + - str + init_commands: + - str From 202bf8e2fd128413a63e3ee192d831c658254a7a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 9 Nov 2021 19:40:28 +0100 Subject: [PATCH 392/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=205.2.1=20(#341)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 4 ++-- vscode/build.json | 6 ++++++ vscode/build.yaml | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 vscode/build.json diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 28904f6..d7bbf8c 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.0.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.2.1 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -36,7 +36,7 @@ RUN \ net-tools=1.60+git20181103.0eebece-1 \ nmap=7.91+dfsg1+really7.80+dfsg1-2 \ openssh-client=1:8.4p1-5 \ - openssl=1.1.1k-1 \ + openssl=1.1.1k-1+deb11u1 \ python3-dev=3.9.2-3 \ python3=3.9.2-3 \ unzip=6.0-26 \ diff --git a/vscode/build.json b/vscode/build.json new file mode 100644 index 0000000..b411a6f --- /dev/null +++ b/vscode/build.json @@ -0,0 +1,6 @@ +{ + "build_from": { + "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:5.2.1", + "amd64": "ghcr.io/hassio-addons/debian-base/amd64:5.2.1" + } +} diff --git a/vscode/build.yaml b/vscode/build.yaml index bec450d..73e0570 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,4 +1,4 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.0.0 - amd64: ghcr.io/hassio-addons/debian-base/amd64:5.0.0 + aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.2.1 + amd64: ghcr.io/hassio-addons/debian-base/amd64:5.2.1 From e2e34a7e376022b0733e31a485df419dca1462d5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 9 Nov 2021 20:20:06 +0100 Subject: [PATCH 393/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=203.12.0=20(#342)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index d7bbf8c..5a7a8d1 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -53,7 +53,7 @@ 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/v3.11.1/code-server-3.11.1-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v3.12.0/code-server-3.12.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From a1e25896948eb10b3faa7cbc97cdba7d65cf4f78 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 10 Nov 2021 16:16:29 +0100 Subject: [PATCH 394/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=205.2.2=20(#344)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- vscode/build.json | 6 ------ vscode/build.yaml | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 vscode/build.json diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 5a7a8d1..d005965 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.2.1 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.2.2 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.json b/vscode/build.json deleted file mode 100644 index b411a6f..0000000 --- a/vscode/build.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "build_from": { - "aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:5.2.1", - "amd64": "ghcr.io/hassio-addons/debian-base/amd64:5.2.1" - } -} diff --git a/vscode/build.yaml b/vscode/build.yaml index 73e0570..39bf093 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,4 +1,4 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.2.1 - amd64: ghcr.io/hassio-addons/debian-base/amd64:5.2.1 + aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.2.2 + amd64: ghcr.io/hassio-addons/debian-base/amd64:5.2.2 From 75e830b839c4f9c58af3e728c17d87a4f521fb1c Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 10 Nov 2021 17:29:49 +0100 Subject: [PATCH 395/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20esbenp.?= =?UTF-8?q?prettier-vscode=20to=209.0.0=20(#345)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 39d89ef..0e6cb28 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.11.0 -esbenp.prettier-vscode#8.0.1 +esbenp.prettier-vscode#9.0.0 ESPHome.esphome-vscode#0.22.0 keesschollaart.vscode-home-assistant#1.21.0 lukas-tr.materialdesignicons-intellisense#3.2.0 From 80ce8a78d798470d47cd427223a29e78d01f1972 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 10 Nov 2021 19:23:04 +0100 Subject: [PATCH 396/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20lukas-t?= =?UTF-8?q?r.materialdesignicons-intellisense=20to=203.3.0=20(#346)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 0e6cb28..ef0f76d 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -2,7 +2,7 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#9.0.0 ESPHome.esphome-vscode#0.22.0 keesschollaart.vscode-home-assistant#1.21.0 -lukas-tr.materialdesignicons-intellisense#3.2.0 +lukas-tr.materialdesignicons-intellisense#3.3.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 redhat.vscode-yaml#0.18.0 From 4345ddc4e62c62a296e630cb8ec2e38bc293f332 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 11 Nov 2021 00:38:35 +0100 Subject: [PATCH 397/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20Home=20?= =?UTF-8?q?Assistant=20CLI=20to=20v4.14.0=20(#347)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index d005965..a65c4c1 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -86,7 +86,7 @@ RUN \ && ls -la /root/.code-server/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.12.3/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.14.0/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From 2b46cca6cb53bfe8f614930ec6f631911c657df0 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 12 Nov 2021 10:17:51 +0100 Subject: [PATCH 398/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.22.0=20(#348)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index ef0f76d..8e0ddf0 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#9.0.0 ESPHome.esphome-vscode#0.22.0 -keesschollaart.vscode-home-assistant#1.21.0 +keesschollaart.vscode-home-assistant#1.22.0 lukas-tr.materialdesignicons-intellisense#3.3.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 From 645fdbbe167c6ec2f432e1538ecc59236f2ba086 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 12 Nov 2021 10:18:35 +0100 Subject: [PATCH 399/778] Rename add-on to Studio Code Server (#349) --- README.md | 16 +++++++-------- vscode/.README.j2 | 2 +- vscode/DOCS.md | 20 +++++++++---------- vscode/config.yaml | 4 ++-- vscode/icon.png | Bin 4604 -> 13128 bytes vscode/logo.png | Bin 62695 -> 13128 bytes vscode/rootfs/etc/cont-init.d/code-server.sh | 2 +- vscode/rootfs/etc/cont-init.d/mosquitto.sh | 2 +- vscode/rootfs/etc/cont-init.d/mysql.sh | 2 +- vscode/rootfs/etc/cont-init.d/user.sh | 2 +- vscode/rootfs/etc/services.d/code/finish | 2 +- vscode/rootfs/etc/services.d/code/run | 2 +- 12 files changed, 25 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index ccbe0cf..fa20232 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Home Assistant Community Add-on: Visual Studio Code +# Home Assistant Community Add-on: Studio Code Server [![GitHub Release][releases-shield]][releases] ![Project Stage][project-stage-shield] @@ -21,18 +21,16 @@ [![Support Frenck on Patreon][patreon-shield]][patreon] -Visual Studio Code, accessible through the browser. +A VSCode experience, accessible through the browser. -![Visual Studio Code in the Home Assistant Frontend](images/screenshot.png) +![Studio Code Server in the Home Assistant Frontend](images/screenshot.png) ## About -This add-on runs Visual Studio Code, allowing you to edit your Home Assistant -configuration directly from your web browser and can be embedded straight -into the Home Assistant frontend UI. - -Visual Studio Code runs as a remote server using `code-server`, and is a -fully fledged VSCode experience. +This add-on runs [code-server](https://github.com/cdr/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. The add-on has the Home Assistant, MDI icons and YAML extensions pre-installed and pre-configured right out of the box. This means that auto-completion works diff --git a/vscode/.README.j2 b/vscode/.README.j2 index 8d5bdf2..37536a2 100644 --- a/vscode/.README.j2 +++ b/vscode/.README.j2 @@ -23,7 +23,7 @@ The add-on has the Home Assistant, MDI icons and YAML extensions pre-installed and pre-configured right out of the box. This means that auto-completion works instantly, without the need for configuring anything. -![Visual Studio Code in the Home Assistant Frontend][screenshot] +![Studio Code Server in the Home Assistant Frontend][screenshot] {% if channel == "edge" %} ## WARNING! THIS IS AN EDGE VERSION! diff --git a/vscode/DOCS.md b/vscode/DOCS.md index 2fbe7c3..fd2e5b8 100644 --- a/vscode/DOCS.md +++ b/vscode/DOCS.md @@ -1,11 +1,9 @@ -# Home Assistant Community Add-on: Visual Studio Code +# Home Assistant Community Add-on: Studio Code Server -This add-on runs Visual Studio Code, allowing you to edit your Home Assistant -configuration directly from your web browser and can be embedded straight -into the Home Assistant frontend UI. - -Visual Studio Code runs as a remote server using `code-server`, and is a -fully fledged VSCode experience. +This add-on runs [code-server](https://github.com/cdr/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. The add-on has the Home Assistant, MDI icons and YAML extensions pre-installed and pre-configured right out of the box. This means that auto-completion works @@ -16,12 +14,12 @@ instantly, without the need for configuring anything. The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on. -1. Search for the "Visual Studio Code" add-on in the Supervisor add-on store +1. Search for the "Studio Code Server" add-on in the Supervisor add-on store and install it. -1. Start the "Visual Studio Code" add-on. -1. Check the logs of the "Visual Studio Code" add-on to see if everything went +1. Start the "Studio Code Server" add-on. +1. Check the logs of the "Studio Code Server" add-on to see if everything went well. -1. Click the "OPEN WEB UI" button to open Visual Studio Code. +1. Click the "OPEN WEB UI" button to open Studio Code Server. ## Configuration diff --git a/vscode/config.yaml b/vscode/config.yaml index 653a293..0a95662 100644 --- a/vscode/config.yaml +++ b/vscode/config.yaml @@ -1,8 +1,8 @@ --- -name: Visual Studio Code +name: Studio Code Server version: dev slug: vscode -description: Fully featured VSCode experience, to edit your HA config in the browser, including auto-completion! +description: Fully featured Visual Studio Code (VSCode) experience integrated in the Home Assistant frontend. url: https://github.com/hassio-addons/addon-vscode ingress: true ingress_port: 1337 diff --git a/vscode/icon.png b/vscode/icon.png index b3225e44d933efdc7c90fe49c050c651dfd88fc1..e33d6ee30e0a268caee49ec45a0d1486c5cdad11 100644 GIT binary patch literal 13128 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 literal 4604 zcmVzUiU02n-Xyr?wEbGXMZFgMBZONG z#KoHeQIzY1Q&}X+L+`a9ly?#3fM5x_1h*Wuvo!$S1VB-~B)ZoGqy+-8Y$HGzBdu@~ zfpJ{oZ_2?gf?JLNC@287ip38>@c*Mep+M+aALwg7{d~44_wOxCgK2!U;*%J z)C1wj*GL0Q(Dg~Ncq9-@9|j1|Q@@%t#bHUUP-d-=4*;P0eY{5dB=vDo8Vo^jtJLM) z1j)%!bD;c$Q+nBHoc#dEpkaqr00>2TT{0SoCF^i~qj0>UC|CE7fWS^;t~5Zh1B40H z7Y!Tp@G1dvqgW`9Wv4OE03>@ITH*ChqhBGdaHc4a?8#1J&H=DJ?lf+|wP%GZuM`XX zL)mG}F#yT#X{T|Gb{g@1K2{n}5<+yb)0lGrZ1?L?r;$3YZy*pBh;rrKLN|66^9Vq? z)A$PY>xCna7Tod&K)Tad4K>2@M{#Y1;Fd!G()$*%{INjoL~`2+0dQnZYk*tDPTSNX zNzk>EYJgWm4Ipn5J6(g&1L_fB;2Hz4GqmU;NNM0e%!T7irwl+|TU5A3|GQ$*gP1RS z!j)%;`9pie!?75Eyb8bMe-G0jHP~iu?8>LfBfdnG%CrA_?_yXRSN}txzQpzAqL$uvgqX zFaWbm_=u~6V6jH7g`cvs=0(G?o+W557tX-JLO0AJOyC6r(DA~T=Y+zSG2y57=+2tC z_7{TVO9Cwd0|U^pHedcAP59~EkC}(HxIU!7Dy)8o`Ai0&^QL+~5j+Ef!vP)=nRMNXWCm=0g~+< zK#u|FutlB=8VR2@Ksy0ArPsupcg?W3e_^unQ01JEV_AavY(qw6#D&j4ftAYJ%H`DqgJRl@Ne!U`DX*a)W313#t*;zhdo6OB1Q zZ=<(gQs6mO_zXZh05IWG#mWhhl;p9br|nH(KV5%`o@gDMHVA(agpd2kEPR`8U1tCQ zK#J36wSZqkEgJ~D;m#QbRZYeGd&v~cF(zU9Y`#~v!uMMd-lTBDXdpnq0HihSd!rR9 zM+rwq&%pLJ-Ygl{yKm1?Ki;G#Ly)c6{OXccg%3a>d_CA(38)8+DPsVpcEe*$AkZdZ zSosOC*HM#@aczI85k7>NIV}py!^_qCtQ95i5M@p-eM-aNGXUG839LDgwPp}#A3+CP zdaJ}j`F1l%Q(W6$J`KX3Kt7z_9qcvEEdggqp@f|N z7UZW#2cb#y?xn2>A1Yr?>ivPo2!JE?z3QC!IYSO79=g8omaeDg&q5ICMO2>{}D zBx0CBOJwXI08=F{`ZWkYtIF3il3T?2eY=~0jo32s6%2p|pfw1*kKs!w2+~WPO=w&E zBnlMRsiGB%&RVTOg=bRv7);dFb7^}RO@BsW&%*Io1H=KyZVoDk(VM*t&%Y@IML!f0 zeh)%&tdLL%6AqsdeikoZ7f9MHoa$%IKpUYm04V^p3_;01l(fN?7zF8_x#QmeVdxtg z%OHHz*EK5tc9ckq+j|Be0|1#IaO6kmP5)~l@S85o;HgEJHF~D_J)=$FU^=o8SNRM; zb^x+NfJGK;4y8kYo-ugSuWNroPcbXUnR_roW&pAS&^iQ2qbkZ5TK!__GYWZ^C=c!< z&{o*6YzCnH0Hi}u@IOpG!GEHq&|AN8sC=``Tv-%X`3%6!0+56N`Sz}S4y$okCulJ% zryi~?-$PKzVS>P2B5kPO}a6>N7_4S+=>Xc5%*i4GzI(1`#fclEB*A2!ianNt7+ zAHeah6=>QFFaVtdKr(vw1|7gzo2FW~^)UBO4wF_m$jkt+$Ik%FGyusb|3(NOAJ*c{ zCeO|(uQkiY-xgu(!i<0cm?;2~(Yt>%Pkx&sbSF@{MGN7VQIo&`%m4tfV2(d+zwo_D zICxp6h&B>gC5ZT_{AmRdbTI%~0BAi|uh$Acz1)gc<DGe1VO4;Lw8C8VUttJqk!n@s7YV|G60Za zo_`B+^&tFo+dXJ(_b)`W%^#Xe*B-(DWq`m$A{&#?k5jlU1VI-AkOn~ZC;zr|;m5r9 zf_JJwi$@7N)puf0GeKZYf)UQk!u7sx?l=6LGRFkQ0BAK`>#sUXx0a&vb%d@zgk3_r zgBNrq)HBQhiZAu7*LFSApr{Nc0EZw`d++jX3_u)!>{GovjPTP!zqBxayWJ5x*zj@X zIs*X)CVSj~y2sTxF3o%f1CRxPsQoO;zv+RkHCOo~X1aDpY^yl+b5MQ_bqHF4z(x+O z4^!CP%1O~6RGk_03Ii}D;rlC_3*SeCu1U&Ri#S1(8#v`9+w=S8(EE)b^vgn!Igmup z61=irrd}>C-HiKvnE}}TC;u)j*jj3|FE)YTbR|{(l%PXBUKFQj5dwQ}5S-)PY4#~F z@SGj|1})|_-;*Nzas5Tm&uXOdGedy5KUWTmrL98X*L8}xS$&-3`T$K%*D`|-CraDV zt(a;xw6hQn2Bcel+-~IxGXQM@!1@EdfhrB#w0ekb?TEWH+ARzOK zU=|BOx|&x-uDm`H%IUTqL9!|d129`4fJShM=BNh;9-b5{L!WjZcC`qb$Yv&n&*$jb=ZMYqWMd*N%)ksvqtf85jX8`ih zj8Ny_y@z_*3j_0-sd)wZB0zBN9xO^Skp0ocI+B-MG4Jlqj}f-C3KP4=16?Fx$SA#9ug3Z#x9TgbriBJ~jh;!fn^ ztL&kI{IYP?94r<*uvZq7!T_`#fW|N+R>yEuoFhxB%9ray_$J$SOuf0O{}%DLi|2n&EMenH&I_rfL%u*6;=X>S?5J{U&PY%qeYn;;7WTxcy|GK|OdYaQA|7k9F7K!czxEHadf-g*M!Zj_j# z{!=nbUlC6KN5y&f?UR<@*vQ`iGz`ErY_K$hp-?#r2SBUYME9_UVK@duxQV^SD^R$z!XOc@~< zJi&mVrwI({MWta%R5z8tpdrkZ6X@ov2eXpacnI)qWh~YJ4MLBtKoW%^dpBCci}@RV9VW$8 z4#VdH4m*YQUr>dqTzLom`zm@pN7Y0q^&f<^^ej_Y-VTm$HkoFFHjmfN-Q$=c7#OTS z;Mb>h5S+&ThB>1MLWxdcaZjP6DxVH>0_4r~@1+FHca&ChEAP`$MXCM<{1W3Q3Y3FnPXN|Pz7C7_*Q?O{sTRb88fWfb8M^kA%eHz<(>K9^LJ*Bomj$y#` zGTLxto#UM;TyK>sL*HX|7-uUC>VC&DHP&Tx!?O{bfv?7wqBA7LkqZ&PFi_ z>SGoL+1W6_sWsC|vxM%*f2%W*N<)Xl1<%pi|8MWyQ4om1AnZ}B1RKGNcn3=h3mY+U zWos+%Ab1UX%|^k_GuYet*hv@(Ca@y=0L>3uZWF#uW|NsezEQ-Fh{2jBvQa*WTMVuT zgKQjza6=2U%}w;s?31v#495BdhKCQs?AXo+c8ooKdlwSDjf5d13^j|o6Q}uWOQ?0Q zp#@GRW0eR4(o<4R(2*2E%fOKOFjOe&?htfrQi%g6=$LmC@89PxN~mI+yx4W1s^K=W z_Y=~El-*0*>UBk({cXj8QgRr$YxxV-Sk=Q2oLZ;4YrjUlH)}Fs5MRK+E@c#T_AaJN zOQ;nLuz`jaahh)uhG1qw>bXf%CC3m9w_;Iuw(m%-U~pxShCan8>guiUGZRwx@+ZY@ zXM}+^dBOl;>4-XJBQ~(hMN#)lFf3Fb7BXfgXojU>)nqKCnqxo05u;JmHCWYTCg=th mY6&He_V(~LxFW93_BBu4FBc_(5rgvp0000dX{5Tnqz2{tWUTd!G?6vlq^U5nj18v%y95*jrxubMsw{38$*f@ z>)fSFmx&>!7XHR|L3e#n-p+2GPIvu-eVp#PIXGOpbUz`_#EP&gMfvMo)R`*Fr8W0M z;_KNz6cn(JZuq4nTfKibE>YYu7+78!D7gQz;U6xhDMD!%Wfn`R<|7A9b$P98v!&$3 zOM!JUEmlwcI4@1anhEew^AC6CX zeA|L$#3QMrbDV0uGsnk9PxoQc2h+gKYmT`xbVXI(9=o)DvKHTJr`LNYU-clK-B2AU zr}8g@x#k2H9bbshlZLp0SBXSTF0Sd5|1$PJWwu@faFI$E_5Qg$z0#tk2n2 z^4}TdWz1HGHvt~ijUV`VYWv(5oBemEB+iw|PgCPLNq^G!T+7%4rKhd^_K^z8l&fS8 zJ@L93`#6bHbZ<50BG0i^C)@VmPnNro-`)yCjPeIMjVB4piyH>?R(7O--{v3pFoGEu zkM}p`h7Qhx-e~TLqaP3l^A7xzAQ=`_(}$oTF*jq@5SyV@T6C?NTlZzY>dTf3RNo{@TPCp~=#sW3z`!)RA_VYHKloe$+ z!mbE!y@AXT7`p5Bl(eik>Shp_OxCDKpglmn){|(k{J4dQ&X^Zh9L1}4EeTQ;HOe+a<_IK+yIGKiMCp9WTxM;`8Foqr_%bhEMp4j0Ip7})QJRRobMS~Iq-K0po&=~%*5o~!;uP+8`AcZ9g(g#KJz9p^n27Mear5ph4$YQ zXR^?vCXwW()O&3|8*E-@RNL{2@bslg?Tu3g3VT{Spz@WsP1~455z8O8klJvw==({_`}sv&b{fR^ zCW)7vBI%E2;gu~{Z&DhNKw-c-x_1>ovm-9t=PX(;gA=+Q?$ zwDZ(wi#x;?UJ{^n0JNyYat~&WdXH28JK)~r1&e|B$^~bc){$c(wVjG<5bk_-EO}w3 zKfbMUXCKqKREy8cGgTu2! zsmGKrRNJ~DdLEVyqcojE;>sy`e@>aSb;D4n8I|~jWV&)i8$tAu6?QzYEYdn$ARs+e zaq9KPP2Qi6rZOiGJgx{Itn!ZHM3Fo`mhnH3L7hkj{b>< z$UbpxEC`SV75iZ*VoGHmKbIg{N-0L!c*xOxQ}}|4H-0!G(NqS@(MLNwFot31+yeE^ z#92!?y005*Q}f0z8PUP{v2(6LS-|+Uyj^14%o(wBS-T9pXnQVCLUtdMq=KWu4N6|7 z)k`fHG21fvK!wMYMQowj<$_?M)Z}k4VCZ-z1E+O#w-dTS&C9gOpj`O^_8z6VasMG@ z(fu1angmzuXMxZeOF(Lw(KLPw`x5B?FM~!coxIHoxI1Ut2Y}#4mUTMaOy>l5@oG?Z zD^0*q-Th1wv)y!nH1~cO^AgTf-DO>5fFfDLk-LZnSIEj>mDlSweVJ6K!i2G8&WyeL3d!k#bM;Fo7m8nITydQ%5kg3@B>{ePe(-o&nYEN+WvLaS|ezBTR(ApCSq?@9@+@vg<@DzVRA#V z)Ulp4oJT|jMSUS~PySP)niWQOC;c zlk1pe9Sr%*_uo}+yD||axhj%UpFnq|Fd}9VZN%Bo*@g5;=d8Z1C8&Mytjf29^H&VF zDjAw6x9lmwF>0L$bkeXL$e{JQm;c~MBGXEU$tC^H_Y}AM?QS}`k%zR-Hz@W{2co2EupuQsUWU(Y`Zo1{OvdFor8qq;1nq8&p~8}n*P#PDwif}Szm?R(=q z%sZ9SPRJvzn#P>yH#vb(IAJsVcIUr~pENSJS$4cD>6=G5xymo^6~ciFl)lZNwbiS( zW{&He**bGddYWmHW*Y+oS|*E4*i!C%V{M{z5D7|f8Oh(#s8|B5=_4esr_dnve#`=0JT_U2tNS!aT%UxM@AY zsbnLQD&Xv`H}(3t>VRwqtO6g=)S@rkk+bObPyGP8dG1q(Y1CKF6C1o-3#_7KfuF#{ z(Y4Ov5r{R^R*i5?A7$e?ma)mU5}YtfI;2ck4W05pVht5Yy^Hr)Il8ZS$Th(#a@2!% z89B6@VrX2Qfwrp$#>^b#E8*Fef)hi}uj6*^u{KWI{E(}U1=?6DaIZm7!5n0^TbVlq z`7%u$j7t2CL8hn^= z@I7BLGnrG?)v#mz_dG4KZlcgyVvVP63O0o2n}AN%oZ_QOyO)MfuE-E`3L(ea6Wd8c zL21*7UD1MomI!$Fu3wU>sVqL$P$-gx&9K$6T_(@j+zaysBs2CC#k0l&55 zSYmC2QEmOlI9|JL#GV+4C#$)>oC|FXU#P&bkrGf)KOpQruVgXZ7MHAQ;azdFPzm6J zqE}WTKZKCIl0D3@hC-aC%&&(`KoGLPX)-=(!BAs9$a*1}B zwC$!QRwl7rR0!)P{S6spp5|CqdS6+2WIaR2-R0$KURANJb05=dTreCRoeE23DxXX_ zn=Hvdz$S}rF(P2Qc~OlnXqj%T92qp^7z^^W5|qt##DP4AOtEjgu%plC(ACg6^hzJ# zjrM|K03Ac;+jL+xv-;l?<|4GHDEKOcX_TQdvt7JXS++e+q-?>%#FKNf zJMC3HX=YW8dnAeGGet{-X9ZN;ESDl zkzjT)H?4BK=hhxP=cV_tsEaG+A|WCPE6&)t1qZ$vvgG%40m)bQTv*9xZp1i-Sfg7z ze13IpL-m>L8p3h0hOA`YL~}E|wFjw`E70d<9y+7~xM9*J8Pz`Bkk{!iTJ#-mDlrUY zwp*~;u-{FCW_tXLG7QB^9RygFTjR_qPm`(Cjpa#(^jHR6VJbjcU3!?;|JojBNDuhr z>|c*~VrWc9Udrd2(1fs^Z+t7w41Q=#m#Q*O&`>o+KhZAlPlsSYMLeP!Y#6FlBjAw$ z>7+rqYWBY;5aEP~#pctkscNel7H%c|i6YGyDh*)-gw4c5blGz>3uNRN!X+K%rEeZ~Y^fgdARP!;3Pj5~SpY!8s*f>2FKk;OSw5&D^FuA^T(Miw7l+h-n-QEbUi!&fqAc*c%3$ z!sa3=)_Rtn_ga5Oxr7jHi0o}n5k=Z9mrg?cdqoIkJD; z^nUAf*DP19t#hUytx3R9Q4X|o!H;IczDQF zGIXW~?uLTxJe@j)1HRWPe4}sc_j(tUyKlVf*+C98%AFOYa=`P&_upPVlGc-pR{qs? z@iYB<=tzwV2m!|i|>?>^snSeSf$#0yF6 zb}(Gs$_kQ0yJAQE>eG7z&vfCMD0^Y>uAau*d!-V;&)A{%|{E-PAQeGI}&3HX5Vtd zRrTt#_AHj=EAErjs29b??VDA(y~`H<^ywe#GRkJezR^!oo(AUc1A_vo5w&d1oYb)C zLi=@!pFPF{Kl}fr&yUCHk6M83I77m^GillA2}dFxvN2|l%aQ}Uw;3O@RTaBVY zC4Qd9_Zao%p)Kl>6to<&Pu^*T?-VV+K08(r<#=3|BlI0>JyRF^2JR6)$ms4B&0d!6 zuHBODL2&!wRR^un4+*f`Qx~gh`1pJdvHpO2pKa&~M&{Q?LAwFbPP6dkNs5VK(8c{e zqqADPjXqI;b8%miT6N7RuF6zd;Ya(`0QWF21OIprv;>~gs`dk*4%Ypx5IUeVvs*VJqB`PVc{99^vjaxNaKZ?*Ld)8oWS1bvEqyj|M)8!-B zy=2*T#oxnS2MoVkVKXl;vj*#ol?6vW3dUa*D3R&X3m+|S9rlNW4w|dr*c}tUoI6uJ zvxUsO9I&xVwO3ty9NerJ3+|%k+BGcj@38+hT4_trU-dY?q8B!USa}3T523DNV*k{> zXB9Uqbz9oF#|09Z5`X3tbjLS=FW`c{cYeHJC(~_Ar|fAY-5uh?Zw}0>!_OfsmfO-v z!Go(IG#qII>vJ%0H`BPdZ@PLncK@oaeKsO%i>c-NzXP7exx3-B$5r)%;DM@%>XGN_ zigWt%-ApF?p82YSaz@zwPp8h`3tP|+Or;G>RW~GqNCV+!+hch10^9K47Qlu`Ej(6c zTG6&pv%2B_V9frC43Bx*<;{!O%Q+`=rRI}=(oIbp+^35)%k%d4p@~F%X}n;_t3{i& z7J14J^RWpO>2gx@!Xt@^*H%roRtitv2}0(2V^p0Q$4xT^! zGGou?-nZxPRML$~lGC6$4*RPRwQa3%)QW;=wkguEBVF>`p$Xw#a@k?k@J=AcjHo~s zJN@?DX{QFKmzmDvlWx#*e+il>tqCa;2g|g+tCc*5D{O;>6_((#Md~>!8=DbpTDx8! zz4y3Q`11u#?o`{lL>*U4n^9CXE!_MoClb_7FESf!7 zD5>!F1AJ;%=85P2o+{w`z-!4Zs%8hAfy(i$8wNk{DV|pDF|F<|#^FYuTUWU9!FLxA zWFp+#)E&Hwo1PM2;rd^_dCvL6du%%bB0k-GbgI;gEgG`eB~H+X4_#5ESnp|x6-=@6 zcyaGXq8!R8`MX}tXytEbrD^wR4pWNAW}Ab}#B+qu4EdUa)4SD(&tX9vY1AD?V@y+T z2d2ZiR{K}omY$e9@Xn5tY*%ebsEQpw;$y{rtU)cl_6=E1ZCf`7y^ME#s*3c()>xLo z&d!<=Wz8`Bt=-C=rh-?IKKO!Qe3!oI<6WDbE}q-J4Iz_~zMX-(q>3{BkorYTH7pY7LTr83|Tf|4Pdq z*VHoU(7&m6=#$zJm}YkRW-fSmod0KKY&3B!D15FaZG`4tLruzngnv_dhLtmrD%K|0 zXK1P{7l}sWyT2G5L!Bnp?VCa)S+lFBLc+%(A?OF?#p@zLO;uFt}`6qYHI!^o) zEcZt)GVo!2V+b1am}yeyV*j@Mp)bAzRSMgu`SCglA@(zvnO69m@z2VQAL(NR1BKqc zpC8YEc2-k(4c*J#z2Zk>Ue{FLHu)Td*so`K+O+8k7t_nzRRbmz4ui~*=9w$&6FZgp z-k|2N#qveR`w?4S8*J@V`G=vB=4PbbpOHNGCI~DcHY>Wo1jjL`wfU_3Zb=;3K>8}wZ}r*-gJcWCD(%}uKeH(}17In*jeRZ6)#*SdmA znp)n0yPD>nr&K(}YzjABv`w=Hh#?BZ76m=^%U)C+s}22u)kW+ z+5eobls?b@d(y?zw2D@8N(eButNL6*Z}?{n}~E?teVnOPsV^ zMz8ELRZbfHes7{bS`4Z0OS3-6Q7hNO>Yq*zON||Qo^U@f@g8p-G)aGaV0T#e!4(ed z{e0)zMl)5WnY<9PNied_u7+OPEX}jcJNj}eq?RyU!tca0QDxB%b%l_E0Il*JJ2=G6 zH#cdk3@Uju6bC0(nihK0Lb00eszqXAz>55ul8NO$bNU$ z8voi%cZD$3b}wS>F_U*tq1KxZHx}$KP7wqg8~1Rsn*p-`JRmPAL_<*@)gaS41L8k^ z>)oI5I+Nqbu1Tb0K70aFHp@dIhA=zTbvb35K%f#|e1k+w*b|RT?-6TKc7oDxto2N} zm0eWb*)>B(Myy!bdR+JqF!R^vm<{2I(?Y^V&eQa}^Ak^GN2Hd|wgM{E9S$wee9;A@ zSqi7dg=dPh2aVcE*3yVQ-tj6?-EH226nrKf0TPflkG|Tw4kc| zb}f{?Z05bJ$xvgADol<8-n4DZLguCW!pdUlT-odS5pP~&8y<4HGkMR=Xsj3liDQvK z(9Au_JC(Qa&O=yjw&btq@K5ub#}9^Ko#94GaA4A(n|*JT=vO!!D78qZ^s6YM?Z?Ts zW(-tNxTkQJRy0#_<6FYz@E@nU)87AdMEs%vVOg-SI9M6P*)RzS?3iXg@iw(A+7tca zyp=|;@lXB*=YrPbg!7QBmN=Fa9*i zYzqz*XJz6|Yd$x)+cFEtY-P6BJgrVVc7G&q9#flawS5^r^tx;5>`b;Cs8H$svM4B) z@W*xyN`c{a_eFJ`Ba^J~7S)Mg5klGcAq%okG^I~`bI@`{~)BcnN~!_ z8nYjHDd0pudb$Ls=fR{Jc}yk;!N+?$P~^!S!c@)u0h5T{Z@BeWt{6FE^8%hTlNq~I4Q&x!_GuALmHv|Pl&iLh4w+-$G1Yo zhTD(|cbV>)@I|&)>lu|@2;HeKj|KNt8_U`Hhom2?T9yf$hg$r_;0bJt=+4@Hoa=-u z6*t3kJV2<7Lu`v}q$9Q?ik@O`f6teTmF~Uxm2Tiv2Sutt=>qdJ-QZ|B0?|MiQ6?Mm zvrh|>wf@VtT9dTaQ;^rz3&rqRBU20;U~blj5%7}fm3;#lBjLzjZR2*Bv6e{3ttstKTi^rvYw#hh?f zJE$y!isEe#t}&OKde~^BfM5G`Olo-)o8LDSE*G(_>2m#r$OKSC7QCv*l*oP!RO@Lf z-7ARr;m9dU0HsrPiYNV{k8OW>9#M23Yy5VEqQvj50~$P_GQWfwvnduX0h;mUT0htZ?8ApHTc}>@A63#kWF4Z{0w85--*VHkr17VaB zEE7Ma1TPZCN;kb1EJ+!hl9YWp=#L%it2Sbe#jyKvp0FhZrlPf^-!qletHb|x;q`{> zY6@fEfW)zD1UvRDgs5tj*uNYVM!@8iyfFVkFI{$Ra0jxQg|u4bLq}_!jZQt*EwN*+ z<07)LY6I~Gc*l8)sFl8Wl87Kj0#zAh0&kOU)0oa2Xdbi67|k!U5jg55E0`@P8?COF zV3y-J|6~0x#zI(qe9yyibdS_0BhnaFyx!|qrwyH+l24UXCW*IxIN zVZCRKK@65pHu`d0yg?m4)@wJDdOkzsh0EN)+1%_Gjgpxy3ewmtyu0y~x+_KGg{tZ# zXr5p39hHW|R#4tLszkb5c0S|3PEncj^JiI`G^tTNqnn{W5{8H8XtX<|xUk0eKZp%U z88fPM9iw}aLpw*{3Bv>gZSQmInMRlhsODIp1(N!o`oz9u}3ns-C4ur02 zAN%asQ6gGQafWop$N?!h+?GMa^4Vt8&c|tzu^6U zT2{7LqxnrZ$VHMzDkh!-Od}_5BWdibkR(?4Zo zwt`J)uG>dq6wgL>gaU~Viqw|DYFt0^wO{y0j_#~=wp5x&1)(P*{h4%Ts7OM=rkKVPzGYMcpZnoG_A6&#rcyrn`ap|+zlvuyxNF#owSud#=WC8;6%(8{H z%d+ziwhYzqHap`7KwjXHU&Bg^Ueae6Mz$t)G#Bx_RlQbL>9y_(6NT(3?;QZ}pM>?~yR#Acc*&vVFWd;ux?!@G}{tVk!oGNMnT)$+orR_f6hrl zghsQnzbddI+$X=7lLd+wLRiE=iicom2uU%zW+#)!yfl*N1{6GmOdLCP8Wg)lv_5w% zR^slH)d6!@MVw;>jIDj`TFo>P)V`|@$#!gK84_pQacpF<`?jGtudemkwqv4NCp4#& ziDaN$>+Swf_<_P5(7~X1hy76bt zl>hYV1Cy#eRY|o%6}YVBFpDz#mJDJ@styhyXk!5{V@sPs?u0-~Ax| z@!cB{l@`q9S+Bo4X)MD0fZPR!<=(lOO#Fm?JK=F{V!(6QF%XyAu_yD&h=*_U`RtI6 z>IUb5X~X91;?raiW8^nti}$QdMTf|7Au4{Eygd{vmy#z@11Z} z>*Dm_FTfDo&h19`jCvwKkIh7GC70g+izz_Ug{nJ5lMQh=D)a zpu{iX*}2TsSmQ5YHAhT-vdJ;0!a$(%!4KI|$hLb74^FRBuVs@D^4GWN-jo}ZoQD57 z(1Lew`D0i^W7}l2v^|Y0V(m{6pm@XXh`^v?@9(Xzv)}vo1`|q#XH9_ug862s%ch@tfGST6m%>R+J_30K$}Q*9`IpWL=2XGQFey4Z zIfxA|ME2bB--#Zb<>VW5EkgoR5~x*5Xlb?>RJ&h6V6GzhAL zSyTAW@joIj^!8sFsQ&-A8Ib?#WApah2nJpVeJS;7(^2OEz`;$fTh>HhW(annIEtLp zA1#7MT2M%og8!gygzY@%LYgdOyQoz@LThs}VGeA}tPiUPJ6sVpOGlHYK8fGwq z5659Lld^fDe>dK4lcM7wmTj{)vBd#a;!J$0R2>0zsh;{65VY)-#8mZ@{{T~7$5XQG zn!SOIq4cV6X$Vho46NPE5HSU>Q3c)PW!j}nN(G*GTYDD;(S}v?Dg+d)+LVNy3DBK!QO-csMTu{{kja<=2E`(2&L* z)EWSE4~LW(G(+r{LhXr%Wj^F&0T!SuhazogY-VLb_W_fJaL<*v$%kd~A&W>7z&nxf zYq6C}sZ3X10HLKq6k0SB9Nq7-e|?^_ra@Vfdf`oL~t(d`C{h!CO*<0umECEi#n~7JBS?>cU^;W-us0W)Lpmk4hRzPJ$-PL)fa=SwGiwXLl5AQ&KIqnFv*Ubg9Q1kvQf~eWa zK~kEF)leZQ3`C;k@W&T=T@Vf9iyJ*)WDT=>qM6W{BA3 zC^)(gZFB1BQC0iQ%X^K-pAZ`V3brVqi6fxe12otUr&``k;y|aF>{rRj$jl$j)|9K3 z2Og4>`d}8Y10Q=`XB6Rf=hHJkRtt5oJlJ8It^ifQ(1X9oJv49-meIltMSM=p0C;VP z4aNw29k3bLL6E(U%xdGB&d`$smpl>3(djX8rV-GTS6c3#0!Vk3ht$JODURY!JxfZP z-*P&MOl^8RX~Fr}dW#(qHM;P_X2mm! z4HHi+y@t}n{0f`$MW9DpDQq@R57JZP+h9~6P1O0*94p$JMV7S9lkS0t~1g~sK#I)i-^;eKcOzA@u05CC5q%IzuOLK@SH1UlkZ6l3D5xFf306 zU1lvQ6TGn0dER-v&{>c`+Po)b`kU1SWs&dVCS$u}2`}_J=ry2yx%sp{6~rr>zW`TT z7m{bkq!}3_NJDf18JRhv=$^XaX`3xNO-!Axu6WZdSGn?hzJ@Coz0&e)GY(9exv@KG zNGW%VJ71Jh<2&4D)!KYl9wbs$7N(ypG@n{z;)n@gmy8VdF{D>8*BWo2)vkyyrtkeE`ThIZjxI|@#rtBf*B*A-*Ec3FezCBc z8mHluc|3pO@zt7V_dMr(_cRe|;1iwMkj1#BpKS6S8>&PO`NgeI)s5qi?9Ag z+n!z45CG%nO&Va!Bz;hwds$3*Qy^vANx5Z~EH8gcr$b2kz3}wgPFiO->R6C);X~)= z+D1>qqjFXsdW|k7oXH zyt)512&;d>L+#O#OIO9qb<-zJD?i3GlWFAKVMZlACS}-->#ty=5-$m%gz*3D0Rc)|?);6T71V&U&-=kKKCfN}y3m%vhB zDG6z?gp{nQl!6jiR!JHxCMBgLCDq=+p7DQk@bY$aa}NH0cNqCxBnmhP{_O$y35t?~ zw@)z2&BfLKl7aW#{}sgV2KYJMbw)Wkc?OqfAH4)Tc>gaCM<+iAl$(#gn>X^3pRu;a gT_{9TURqIJUIHvBZC*X64H#d7LJS@fG@iWtKfab<$N&HU literal 62695 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 Date: Fri, 12 Nov 2021 10:43:07 +0100 Subject: [PATCH 400/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20usernam?= =?UTF-8?q?ehw.errorlens=20to=203.4.0=20(#350)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 8e0ddf0..9bcbe72 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -6,4 +6,4 @@ lukas-tr.materialdesignicons-intellisense#3.3.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#7.5.0 redhat.vscode-yaml#0.18.0 -usernamehw.errorlens#3.3.0 +usernamehw.errorlens#3.4.0 From 43001dc15d52c5b9ab92ee2432d51dd0d8bc4a3a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 12 Nov 2021 10:55:25 +0100 Subject: [PATCH 401/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20oderwat?= =?UTF-8?q?.indent-rainbow=20to=208.2.2=20(#351)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 9bcbe72..c46284b 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -4,6 +4,6 @@ ESPHome.esphome-vscode#0.22.0 keesschollaart.vscode-home-assistant#1.22.0 lukas-tr.materialdesignicons-intellisense#3.3.0 netcorext.uuid-generator#0.0.4 -oderwat.indent-rainbow#7.5.0 +oderwat.indent-rainbow#8.2.2 redhat.vscode-yaml#0.18.0 usernamehw.errorlens#3.4.0 From b11fe4cedfa1f5c3cd54746d0c7cc14626d18738 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 12 Nov 2021 11:13:46 +0100 Subject: [PATCH 402/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20redhat.?= =?UTF-8?q?vscode-yaml=20to=201.2.0=20(#352)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index c46284b..654046f 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -5,5 +5,5 @@ keesschollaart.vscode-home-assistant#1.22.0 lukas-tr.materialdesignicons-intellisense#3.3.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#8.2.2 -redhat.vscode-yaml#0.18.0 +redhat.vscode-yaml#1.2.0 usernamehw.errorlens#3.4.0 From c35162dd4cb25daeb102fb6532fb6a52d0a6e779 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 15 Dec 2021 19:53:31 +0100 Subject: [PATCH 403/778] :rocket: Update CI to latest version (#358) --- .github/workflows/ci.yaml | 2 -- .github/workflows/deploy.yaml | 1 - .github/workflows/labels.yaml | 2 -- .github/workflows/lock.yaml | 2 -- .github/workflows/pr-labels.yaml | 2 -- .github/workflows/release-drafter.yaml | 2 -- .github/workflows/stale.yaml | 2 -- 7 files changed, 13 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index adf12e4..60ce9a5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,5 +14,3 @@ on: jobs: workflows: uses: hassio-addons/workflows/.github/workflows/addon-ci.yaml@main - secrets: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 208af26..21b20da 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -17,4 +17,3 @@ jobs: uses: hassio-addons/workflows/.github/workflows/addon-deploy.yaml@main secrets: DISPATCH_TOKEN: ${{ secrets.DISPATCH_TOKEN }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/labels.yaml b/.github/workflows/labels.yaml index 23a272f..8691ec9 100644 --- a/.github/workflows/labels.yaml +++ b/.github/workflows/labels.yaml @@ -10,5 +10,3 @@ on: jobs: workflows: uses: hassio-addons/workflows/.github/workflows/labels.yaml@main - secrets: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/lock.yaml b/.github/workflows/lock.yaml index 1d278d1..1d4303c 100644 --- a/.github/workflows/lock.yaml +++ b/.github/workflows/lock.yaml @@ -10,5 +10,3 @@ on: jobs: workflows: uses: hassio-addons/workflows/.github/workflows/lock.yaml@main - secrets: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/pr-labels.yaml b/.github/workflows/pr-labels.yaml index bc96029..393617b 100644 --- a/.github/workflows/pr-labels.yaml +++ b/.github/workflows/pr-labels.yaml @@ -13,5 +13,3 @@ on: jobs: workflows: uses: hassio-addons/workflows/.github/workflows/pr-labels.yaml@main - secrets: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release-drafter.yaml b/.github/workflows/release-drafter.yaml index ce377ad..5769e10 100644 --- a/.github/workflows/release-drafter.yaml +++ b/.github/workflows/release-drafter.yaml @@ -10,5 +10,3 @@ on: jobs: workflows: uses: hassio-addons/workflows/.github/workflows/release-drafter.yaml@main - secrets: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml index a063b17..31e1542 100644 --- a/.github/workflows/stale.yaml +++ b/.github/workflows/stale.yaml @@ -10,5 +10,3 @@ on: jobs: workflows: uses: hassio-addons/workflows/.github/workflows/stale.yaml@main - secrets: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From c014344d719540280cd95598095c6ab347ec88ea Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 7 Jan 2022 21:56:36 +0100 Subject: [PATCH 404/778] :fireworks: Updates maintenance/license year to 2022 (#361) --- LICENSE.md | 2 +- README.md | 4 ++-- vscode/.README.j2 | 2 +- vscode/DOCS.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index e9a1271..f538997 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # MIT License -Copyright (c) 2019-2021 Franck Nijhof +Copyright (c) 2019-2022 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 fa20232..982ad79 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ our [GitHub Repository][repository]. MIT License -Copyright (c) 2019-2021 Franck Nijhof +Copyright (c) 2019-2022 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/2021.svg +[maintenance-shield]: https://img.shields.io/maintenance/yes/2022.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 37536a2..90e3e28 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/2021.svg +[maintenance-shield]: https://img.shields.io/maintenance/yes/2022.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 fd2e5b8..ea6c11d 100644 --- a/vscode/DOCS.md +++ b/vscode/DOCS.md @@ -186,7 +186,7 @@ check [the contributor's page][contributors]. MIT License -Copyright (c) 2019-2021 Franck Nijhof +Copyright (c) 2019-2022 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 From 6517149742ce0fb1e8605ae170480e960a76d17a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 7 Jan 2022 22:10:01 +0100 Subject: [PATCH 405/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=205.2.3=20(#362)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index a65c4c1..caa8de4 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.2.2 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.2.3 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index 39bf093..22a00db 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,4 +1,4 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.2.2 - amd64: ghcr.io/hassio-addons/debian-base/amd64:5.2.2 + aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.2.3 + amd64: ghcr.io/hassio-addons/debian-base/amd64:5.2.3 From c959dfc4059aa7faffb527357b72a7e1a037bea7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 7 Jan 2022 22:16:54 +0100 Subject: [PATCH 406/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20Home=20?= =?UTF-8?q?Assistant=20CLI=20to=20v4.15.1=20(#363)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index caa8de4..a0b6d01 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -86,7 +86,7 @@ RUN \ && ls -la /root/.code-server/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ - "https://github.com/home-assistant/cli/releases/download/4.14.0/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.15.1/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From 30082aa406720a227c025ab528462ad15eff6a50 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 7 Jan 2022 22:25:22 +0100 Subject: [PATCH 407/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20lukas-t?= =?UTF-8?q?r.materialdesignicons-intellisense=20to=204.0.0=20(#364)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 654046f..d13ee34 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -2,7 +2,7 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#9.0.0 ESPHome.esphome-vscode#0.22.0 keesschollaart.vscode-home-assistant#1.22.0 -lukas-tr.materialdesignicons-intellisense#3.3.0 +lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#8.2.2 redhat.vscode-yaml#1.2.0 From ee7e42df2d41734bc971cc1c5fb50750fb24197a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 7 Jan 2022 22:29:38 +0100 Subject: [PATCH 408/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20usernam?= =?UTF-8?q?ehw.errorlens=20to=203.4.1=20(#365)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index d13ee34..008ea17 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -6,4 +6,4 @@ lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#8.2.2 redhat.vscode-yaml#1.2.0 -usernamehw.errorlens#3.4.0 +usernamehw.errorlens#3.4.1 From 2a8fe32d6673bfb6a638e624962021117886ec37 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 7 Jan 2022 22:51:20 +0100 Subject: [PATCH 409/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=204.0.1=20(#366)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 8 ++++---- vscode/rootfs/etc/services.d/code/run | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index a0b6d01..d7d7b9a 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -53,7 +53,7 @@ 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/v3.12.0/code-server-3.12.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v4.0.1/code-server-4.0.1-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ @@ -77,13 +77,13 @@ RUN \ -H "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36" \ -H "x-market-user-id: ${uuid}" \ "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${vendor}/vsextensions/${slug}/${version}/vspackage"; \ - mkdir -p "/root/.code-server/extensions/${extention}-${version}"; \ + mkdir -p "/usr/local/lib/code-server/vendor/modules/code-oss-dev/extensions/${extention}-${version}"; \ bsdtar --strip-components=1 -xf "/tmp/${extention}-${version}.vsix" \ - -C "/root/.code-server/extensions/${extention}-${version}" extension; \ + -C "/usr/local/lib/code-server/vendor/modules/code-oss-dev/extensions/${extention}-${version}" extension; \ [ $? -ne 0 ] && exit 1; \ sleep 1; \ done < /root/vscode.extensions \ - && ls -la /root/.code-server/extensions/ \ + && ls -la /usr/local/lib/code-server/vendor/modules/code-oss-dev/extensions/ \ \ && curl -L -s -o /usr/bin/ha \ "https://github.com/home-assistant/cli/releases/download/4.15.1/ha_${BUILD_ARCH}" \ diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run index 09f5501..eb16520 100644 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -15,7 +15,6 @@ fi options+=(--port 1337) options+=(--user-data-dir "/data/vscode") -options+=(--extra-builtin-extensions-dir "/root/.code-server/extensions/") options+=(--extensions-dir "/data/vscode/extensions") options+=(--host 0.0.0.0) options+=(--disable-telemetry) From f441690886d1a851179b2ae25e7444a2d68e88ce Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 7 Jan 2022 22:55:08 +0100 Subject: [PATCH 410/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20esbenp.?= =?UTF-8?q?prettier-vscode=20to=209.1.0=20(#367)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 008ea17..0acaec5 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.11.0 -esbenp.prettier-vscode#9.0.0 +esbenp.prettier-vscode#9.1.0 ESPHome.esphome-vscode#0.22.0 keesschollaart.vscode-home-assistant#1.22.0 lukas-tr.materialdesignicons-intellisense#4.0.0 From 038d0681e8b6dea087ffed8795e2ef094b01e919 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 12 Jan 2022 15:35:20 +0100 Subject: [PATCH 411/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.23.0=20(#370)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 0acaec5..f06f940 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#9.1.0 ESPHome.esphome-vscode#0.22.0 -keesschollaart.vscode-home-assistant#1.22.0 +keesschollaart.vscode-home-assistant#1.23.0 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#8.2.2 From ec8d0410a31332362ed3593bad71e53ae65282c0 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 16 Jan 2022 14:18:17 +0100 Subject: [PATCH 412/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.24.0=20(#373)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index f06f940..0fe7e02 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.11.0 esbenp.prettier-vscode#9.1.0 ESPHome.esphome-vscode#0.22.0 -keesschollaart.vscode-home-assistant#1.23.0 +keesschollaart.vscode-home-assistant#1.24.0 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.4 oderwat.indent-rainbow#8.2.2 From a4585bd7f77ce29970b31308b7a49c8e059f0f3e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 7 Feb 2022 11:40:36 +0100 Subject: [PATCH 413/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20esbenp.?= =?UTF-8?q?prettier-vscode=20to=209.2.0=20(#388)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 0fe7e02..16a76f4 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.11.0 -esbenp.prettier-vscode#9.1.0 +esbenp.prettier-vscode#9.2.0 ESPHome.esphome-vscode#0.22.0 keesschollaart.vscode-home-assistant#1.24.0 lukas-tr.materialdesignicons-intellisense#4.0.0 From e4bd525da3f80b26029ef5c534de2f445407156c Mon Sep 17 00:00:00 2001 From: Casper Date: Fri, 4 Mar 2022 09:00:15 +0100 Subject: [PATCH 414/778] Fix typo (#394) --- vscode/DOCS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/DOCS.md b/vscode/DOCS.md index ea6c11d..5cb437d 100644 --- a/vscode/DOCS.md +++ b/vscode/DOCS.md @@ -88,7 +88,7 @@ might be destructive. However, in case you changed some things, but want to return to the defaults as delivered by this add-on, do the following: 1. Open the Visual Studio Code editor. -1. Click on `Terminal` in the top menu bar and clik on `New Terminal`. +1. Click on `Terminal` in the top menu bar and click on `New Terminal`. 1. Execute the following command in the terminal window: `reset-settings`. 1. Done! From de835ce655a65b1e4b64ec6a893b5daca5f4cfc2 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 22 Mar 2022 21:15:46 +0100 Subject: [PATCH 415/778] :ambulance: Use https instead of git protocol to fetch sources (#404) --- vscode/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index d7d7b9a..ef5cbc2 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -90,13 +90,13 @@ RUN \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ - "git://github.com/robbyrussell/oh-my-zsh.git" ~/.oh-my-zsh \ + "https://github.com/robbyrussell/oh-my-zsh.git" ~/.oh-my-zsh \ \ && git clone --branch master --single-branch --depth 1 \ - "git://github.com/zsh-users/zsh-autosuggestions" \ + "https://github.com/zsh-users/zsh-autosuggestions" \ ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions \ && git clone --branch master --single-branch --depth 1 \ - "git://github.com/zsh-users/zsh-syntax-highlighting.git" \ + "https://github.com/zsh-users/zsh-syntax-highlighting.git" \ ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting \ \ && sed -i -e "s#bin/bash#bin/zsh#" /etc/passwd \ From 5e7f3dff4acd1b16e7647ab046a9797313bab2f2 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 22 Mar 2022 21:34:04 +0100 Subject: [PATCH 416/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=205.3.0=20(#403)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 6 +++--- vscode/build.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ef5cbc2..79cfd3b 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.2.3 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.3.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -41,9 +41,9 @@ RUN \ python3=3.9.2-3 \ unzip=6.0-26 \ uuid-runtime=2.36.1-8 \ - wget>=1.21-1 \ + wget=1.21-1+deb11u1 \ zip=3.0-12 \ - zsh=5.8-6+b2 \ + zsh>=5.8-6 \ \ && 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 22a00db..e0201d1 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,4 +1,4 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.2.3 - amd64: ghcr.io/hassio-addons/debian-base/amd64:5.2.3 + aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.3.0 + amd64: ghcr.io/hassio-addons/debian-base/amd64:5.3.0 From 7276fdf020dfb397cda1eb978225497154ec2922 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 23 Mar 2022 09:25:39 +0100 Subject: [PATCH 417/778] :lock: Sign add-on with Codenotary Community Attestation Service (CAS) (#405) --- .github/workflows/deploy.yaml | 1 + vscode/build.yaml | 3 +++ vscode/config.yaml | 1 + 3 files changed, 5 insertions(+) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 21b20da..9b224a5 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -16,4 +16,5 @@ 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/vscode/build.yaml b/vscode/build.yaml index e0201d1..5d49373 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -2,3 +2,6 @@ build_from: aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.3.0 amd64: ghcr.io/hassio-addons/debian-base/amd64:5.3.0 +codenotary: + base_image: codenotary@frenck.dev + signer: codenotary@frenck.dev diff --git a/vscode/config.yaml b/vscode/config.yaml index 0a95662..a680dc1 100644 --- a/vscode/config.yaml +++ b/vscode/config.yaml @@ -4,6 +4,7 @@ version: dev slug: vscode description: Fully featured Visual Studio Code (VSCode) experience integrated in the Home Assistant frontend. url: https://github.com/hassio-addons/addon-vscode +codenotary: codenotary@frenck.dev ingress: true ingress_port: 1337 ingress_stream: true From d2230a32da06734d9dcde9ef42345d7acdb75fd4 Mon Sep 17 00:00:00 2001 From: Felipe Santos Date: Wed, 23 Mar 2022 05:39:11 -0300 Subject: [PATCH 418/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=204.2.0=20(#406)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 79cfd3b..1c8c77a 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -53,7 +53,7 @@ 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.0.1/code-server-4.0.1-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v4.2.0/code-server-4.2.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From d8dc297525fe1ff682f80bed3de2836a403c5725 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 23 Mar 2022 10:12:37 +0100 Subject: [PATCH 419/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20emilast?= =?UTF-8?q?.LogFileHighlighter=20to=202.15.0=20(#407)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 16a76f4..b2aba1d 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#2.11.0 +emilast.LogFileHighlighter#2.15.0 esbenp.prettier-vscode#9.2.0 ESPHome.esphome-vscode#0.22.0 keesschollaart.vscode-home-assistant#1.24.0 From 599a224b737786455786ec66e03a0a8de8a4d55f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 23 Mar 2022 10:20:41 +0100 Subject: [PATCH 420/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20netcore?= =?UTF-8?q?xt.uuid-generator=20to=200.0.5=20(#408)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index b2aba1d..ed0fdbc 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -3,7 +3,7 @@ esbenp.prettier-vscode#9.2.0 ESPHome.esphome-vscode#0.22.0 keesschollaart.vscode-home-assistant#1.24.0 lukas-tr.materialdesignicons-intellisense#4.0.0 -netcorext.uuid-generator#0.0.4 +netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.2.2 redhat.vscode-yaml#1.2.0 usernamehw.errorlens#3.4.1 From e6b3d1a95f549d47dfd7d9617a197c44dbb82410 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 23 Mar 2022 10:50:31 +0100 Subject: [PATCH 421/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20esbenp.?= =?UTF-8?q?prettier-vscode=20to=209.3.0=20(#409)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index ed0fdbc..b8edda8 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.15.0 -esbenp.prettier-vscode#9.2.0 +esbenp.prettier-vscode#9.3.0 ESPHome.esphome-vscode#0.22.0 keesschollaart.vscode-home-assistant#1.24.0 lukas-tr.materialdesignicons-intellisense#4.0.0 From 58e319ddc83f9a3d81bca9d018356e17b3347b76 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 23 Mar 2022 10:54:07 +0100 Subject: [PATCH 422/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20usernam?= =?UTF-8?q?ehw.errorlens=20to=203.4.2=20(#410)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index b8edda8..2492683 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -6,4 +6,4 @@ lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.2.2 redhat.vscode-yaml#1.2.0 -usernamehw.errorlens#3.4.1 +usernamehw.errorlens#3.4.2 From f842ed3bf7180aed55f14f769ad8246893144193 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 23 Mar 2022 11:19:59 +0100 Subject: [PATCH 423/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20redhat.?= =?UTF-8?q?vscode-yaml=20to=201.5.1=20(#411)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 2492683..0c0df2c 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -5,5 +5,5 @@ keesschollaart.vscode-home-assistant#1.24.0 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.2.2 -redhat.vscode-yaml#1.2.0 +redhat.vscode-yaml#1.5.1 usernamehw.errorlens#3.4.2 From 8405cfe79025cdfcfa98bf17e217af1a62c5c839 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 23 Mar 2022 12:53:13 +0100 Subject: [PATCH 424/778] :ambulance: Fix build-in extensions path (#412) * :ambulance: Fix build-in extensions path * Copy pasta is hard... --- vscode/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 1c8c77a..0808670 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -77,13 +77,13 @@ RUN \ -H "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36" \ -H "x-market-user-id: ${uuid}" \ "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${vendor}/vsextensions/${slug}/${version}/vspackage"; \ - mkdir -p "/usr/local/lib/code-server/vendor/modules/code-oss-dev/extensions/${extention}-${version}"; \ + mkdir -p "/usr/local/lib/code-server/lib/vscode/extensions/${extention}-${version}"; \ bsdtar --strip-components=1 -xf "/tmp/${extention}-${version}.vsix" \ - -C "/usr/local/lib/code-server/vendor/modules/code-oss-dev/extensions/${extention}-${version}" extension; \ + -C "/usr/local/lib/code-server/lib/vscode/extensions/${extention}-${version}" extension; \ [ $? -ne 0 ] && exit 1; \ sleep 1; \ done < /root/vscode.extensions \ - && ls -la /usr/local/lib/code-server/vendor/modules/code-oss-dev/extensions/ \ + && 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.15.1/ha_${BUILD_ARCH}" \ From ab7fe720be6ef1653e1c46a7cc710d9ef6162be3 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 23 Mar 2022 19:38:03 +0100 Subject: [PATCH 425/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.27.0=20(#413)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 0c0df2c..2f94da2 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.15.0 esbenp.prettier-vscode#9.3.0 ESPHome.esphome-vscode#0.22.0 -keesschollaart.vscode-home-assistant#1.24.0 +keesschollaart.vscode-home-assistant#1.27.0 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.2.2 From d15d981aa907dcc3b66c26c5d32ed6046ebf7580 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 23 Mar 2022 19:45:01 +0100 Subject: [PATCH 426/778] :books: Add My buttons to documentation (#414) --- vscode/DOCS.md | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/vscode/DOCS.md b/vscode/DOCS.md index 5cb437d..bc0d5ab 100644 --- a/vscode/DOCS.md +++ b/vscode/DOCS.md @@ -14,13 +14,23 @@ instantly, without the need for configuring anything. The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on. -1. Search for the "Studio Code Server" add-on in the Supervisor add-on store - and install it. +1. Click the Home Assistant My button below to open the add-on on your Home + Assistant instance. + + [![Open this add-on in your Home Assistant instance.][addon-badge]][addon] + +1. Click the "Install" button to install the add-on. 1. Start the "Studio Code Server" add-on. 1. Check the logs of the "Studio Code Server" add-on to see if everything went well. 1. Click the "OPEN WEB UI" button to open Studio Code Server. +Home Assistant, by default, ships with the Community Add-ons store installed. +However, if it is missing (for any reason), you can add it by clicking the +button My button below. + +[![Add repository to your Home Assitant instance.][repository-badge]][repository] + ## Configuration **Note**: _Remember to restart the add-on when the configuration is changed._ @@ -206,6 +216,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +[addon-badge]: https://my.home-assistant.io/badges/supervisor_addon.svg +[addon]: https://my.home-assistant.io/redirect/supervisor_addon/?addon=a0d7b954_vscode [contributors]: https://github.com/hassio-addons/addon-vscode/graphs/contributors [discord-ha]: https://discord.gg/c5DvZ4e [discord]: https://discord.me/hassioaddons @@ -214,5 +226,7 @@ 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 +[repository-badge]: https://my.home-assistant.io/badges/supervisor_add_addon_repository.svg +[repository]: https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Fhassio-addons%2Frepository [semver]: http://semver.org/spec/v2.0.0 [ubuntu-packages]: https://packages.ubuntu.com From 90f1c539502447b658c2b36397dc961c3938615c Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 19 Apr 2022 18:37:26 +0200 Subject: [PATCH 427/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20locales?= =?UTF-8?q?=20to=202.31-13+deb11u3=20(#422)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 0808670..b09b4d6 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -30,7 +30,7 @@ RUN \ colordiff=1.0.18-1.1 \ git=1:2.30.2-1 \ iputils-ping=3:20210202-1 \ - locales=2.31-13+deb11u2 \ + locales=2.31-13+deb11u3 \ mariadb-client=1:10.5.12-0+deb11u1 \ mosquitto-clients=2.0.11-1 \ net-tools=1.60+git20181103.0eebece-1 \ From 3ffa8feb2398ce54fb501673dfdf3c3a377140e7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 19 Apr 2022 18:38:59 +0200 Subject: [PATCH 428/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20libarch?= =?UTF-8?q?ive-tools=20to=203.4.3-2+deb11u1=20(#423)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index b09b4d6..f604b76 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -25,7 +25,7 @@ RUN \ \ && apt-get install -y --no-install-recommends \ ack=3.4.0-1 \ - libarchive-tools=3.4.3-2+b1 \ + libarchive-tools=3.4.3-2+deb11u1 \ build-essential=12.9 \ colordiff=1.0.18-1.1 \ git=1:2.30.2-1 \ From 79e377cdf3e828de007c9c539ef90d27834a081f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 19 Apr 2022 18:40:20 +0200 Subject: [PATCH 429/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20openssl?= =?UTF-8?q?=20to=201.1.1n-0+deb11u1=20(#424)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index f604b76..30b4230 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -36,7 +36,7 @@ RUN \ net-tools=1.60+git20181103.0eebece-1 \ nmap=7.91+dfsg1+really7.80+dfsg1-2 \ openssh-client=1:8.4p1-5 \ - openssl=1.1.1k-1+deb11u1 \ + openssl=1.1.1n-0+deb11u1 \ python3-dev=3.9.2-3 \ python3=3.9.2-3 \ unzip=6.0-26 \ From f75756674a1a57e4b2f89117328379846b72de4d Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 19 Apr 2022 18:41:36 +0200 Subject: [PATCH 430/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20mariadb?= =?UTF-8?q?-client=20to=201:10.5.15-0+deb11u1=20(#425)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 30b4230..1b95071 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -31,7 +31,7 @@ RUN \ git=1:2.30.2-1 \ iputils-ping=3:20210202-1 \ locales=2.31-13+deb11u3 \ - mariadb-client=1:10.5.12-0+deb11u1 \ + mariadb-client=1:10.5.15-0+deb11u1 \ mosquitto-clients=2.0.11-1 \ net-tools=1.60+git20181103.0eebece-1 \ nmap=7.91+dfsg1+really7.80+dfsg1-2 \ From d3acfa49167009c8f343045a4cfbfa47b97cde02 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 19 Apr 2022 19:32:34 +0200 Subject: [PATCH 431/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20uuid-ru?= =?UTF-8?q?ntime=20to=202.36.1-8+deb11u1=20(#426)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 1b95071..ef5a22a 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -40,7 +40,7 @@ RUN \ python3-dev=3.9.2-3 \ python3=3.9.2-3 \ unzip=6.0-26 \ - uuid-runtime=2.36.1-8 \ + uuid-runtime=2.36.1-8+deb11u1 \ wget=1.21-1+deb11u1 \ zip=3.0-12 \ zsh>=5.8-6 \ From 67d284742fcb2d02dd97667f15e45c790cfe4de1 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 19 Apr 2022 20:04:26 +0200 Subject: [PATCH 432/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20esbenp.?= =?UTF-8?q?prettier-vscode=20to=209.5.0=20(#420)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 2f94da2..35fa590 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.15.0 -esbenp.prettier-vscode#9.3.0 +esbenp.prettier-vscode#9.5.0 ESPHome.esphome-vscode#0.22.0 keesschollaart.vscode-home-assistant#1.27.0 lukas-tr.materialdesignicons-intellisense#4.0.0 From 88f8ef62e1484f448f9f9cad8f6bbef51135112e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 19 Apr 2022 20:57:08 +0200 Subject: [PATCH 433/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=205.3.1=20(#427)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 4 ++-- vscode/build.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ef5a22a..36dd0b6 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.3.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.3.1 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -43,7 +43,7 @@ RUN \ uuid-runtime=2.36.1-8+deb11u1 \ wget=1.21-1+deb11u1 \ zip=3.0-12 \ - zsh>=5.8-6 \ + zsh=5.8-6+deb11u1 \ \ && 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 5d49373..f47c58f 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.3.0 - amd64: ghcr.io/hassio-addons/debian-base/amd64:5.3.0 + aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.3.1 + amd64: ghcr.io/hassio-addons/debian-base/amd64:5.3.1 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 5db71af219af7a91a7e4280494b9f6a4c311e3df Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 19 Apr 2022 21:35:39 +0200 Subject: [PATCH 434/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20ESPHome?= =?UTF-8?q?.esphome-vscode=20to=202.0.0=20(#428)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 35fa590..75ffcc9 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.15.0 esbenp.prettier-vscode#9.5.0 -ESPHome.esphome-vscode#0.22.0 +ESPHome.esphome-vscode#2.0.0 keesschollaart.vscode-home-assistant#1.27.0 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 From a2b009c7feb3ed581a0091e11229b821bac69cdc Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 19 Apr 2022 22:21:47 +0200 Subject: [PATCH 435/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20oderwat?= =?UTF-8?q?.indent-rainbow=20to=208.3.1=20(#429)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 75ffcc9..37cf56b 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -4,6 +4,6 @@ ESPHome.esphome-vscode#2.0.0 keesschollaart.vscode-home-assistant#1.27.0 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 -oderwat.indent-rainbow#8.2.2 +oderwat.indent-rainbow#8.3.1 redhat.vscode-yaml#1.5.1 usernamehw.errorlens#3.4.2 From 7ed810c1e4b9f13a3ddd94cf3222818d90d3a526 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Apr 2022 13:49:12 +0200 Subject: [PATCH 436/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=204.3.0=20(#430)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 36dd0b6..ce8a640 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -53,7 +53,7 @@ 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.2.0/code-server-4.2.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v4.3.0/code-server-4.3.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From a37285f2a77a9595009b1ea523edae5e4a4f7c90 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Apr 2022 17:05:09 +0200 Subject: [PATCH 437/778] Cleanup .zshrc configuration --- vscode/rootfs/root/.zshrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/vscode/rootfs/root/.zshrc b/vscode/rootfs/root/.zshrc index f33bab2..de1f56d 100755 --- a/vscode/rootfs/root/.zshrc +++ b/vscode/rootfs/root/.zshrc @@ -96,9 +96,6 @@ source $ZSH/oh-my-zsh.sh # alias ohmyzsh="mate ~/.oh-my-zsh" alias reset-settings="cp /root/.code-server/settings.json /data/vscode/User/settings.json && echo 'Setting restored!'" -# Home Assistant Core CLI -eval "$(_HASS_CLI_COMPLETE=source_zsh hass-cli)" - # Home Assistant CLI source <(ha completion --zsh) From 9dad405a2fbe1bc730eff9a5b13586542ac27742 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Apr 2022 17:05:41 +0200 Subject: [PATCH 438/778] :fire: Remove Home Assistant CLI (#432) --- vscode/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index f9e68f0..0150d1b 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1 @@ -homeassistant_cli==0.9.1 yamllint==1.26.3 From 73abc010d7fe306b766df006ea84a850cede9eef Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Apr 2022 17:46:10 +0200 Subject: [PATCH 439/778] Embed ESPHome (#433) * Embed ESPHome * Set local ESPHome validator --- vscode/requirements.txt | 1 + vscode/rootfs/etc/cont-init.d/code-server.sh | 1 + vscode/rootfs/root/.code-server/settings.json | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 0150d1b..40adda1 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1 +1,2 @@ +esphome==2022.3.2 yamllint==1.26.3 diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index bc58dab..00c2e7e 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -17,6 +17,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( 08d86c84a0d80720b22712e878963e90cbb34b659330dad8a823f3c5c7f0ae043d197a5e3020dd7ab4fda3625e17f794675ec074984951e7107db2488898a8d0 5243d7664d30b5aa0c45fbe1089cccdf85c5ade17cddd97e21b3a29ccb37b20d20bdfecc141ad6e1a7aa5ea8ee61695a79a43140a2d53f9f91687bc61f7e496c e5106aaaff5f67a693fd49deb7dd52f1cc0f7ba542b33c99c0099bf58f1a33c789d1c5e3803dea2942540c07c734f3ca317c3cc91673aff388cb79ee7112db0b + b28a299111ac74cc9498f76ce2cb437b2cf5e8e7bb9388d9929347e2948bd56591bd499d5de04638553f6e12fa77c53320a046e96cffce9fa4f8c924d5c91581 ) if bashio::config.has_value 'config_path'; then diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index 84d952e..2b82ed0 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -81,8 +81,7 @@ "editor.formatOnPaste": true }, "editor.renderWhitespace": "boundary", - "esphome.dashboardUri": "15ef4d2f-esphome.local.hass.io:6052", - "esphome.validator": "dashboard", + "esphome.validator": "local", "telemetry.enableTelemetry": false, "terminal.integrated.copyOnSelection": true, "terminal.integrated.shell.linux": "/usr/bin/zsh", From 43f99ee621949aa31a945858b073a1b7779ef977 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Apr 2022 17:57:26 +0200 Subject: [PATCH 440/778] :broom: Clean up some build cache (#431) --- vscode/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ce8a640..34acc3e 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -118,6 +118,7 @@ RUN \ -exec rm -rf '{}' + \ \ && rm -fr \ + /root/.cache \ /tmp/* \ /var/{cache,log}/* \ /var/lib/apt/lists/* From cabb3fdbc0e1cc5710fc612a0e384821a5c7b938 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Apr 2022 17:59:35 +0200 Subject: [PATCH 441/778] :broom: Remove workarounds no longer needed (#434) --- vscode/rootfs/etc/cont-init.d/code-server.sh | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index 00c2e7e..eee73ef 100644 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -56,18 +56,3 @@ current=$(sha512sum /data/vscode/User/settings.json|cut -d " " -f 1) if [[ " ${PREVIOUS_DEFAULT_CONFIG_HASHES[*]} " == *" ${current} "* ]]; then cp /root/.code-server/settings.json /data/vscode/User/settings.json fi - -# Workaround workspace bug for code-server. -# https://github.com/codercom/code-server/issues/121 -if ! bashio::fs.file_exists '/data/vscode/Backups/workspaces.json'; then - mkdir -p /data/vscode/Backups \ - || bashio::exit.nok "Could not create persistent storage folder." - cp /root/.code-server/workspaces.json /data/vscode/Backups/workspaces.json -fi - -# Workaround workspace bug for code-server (same as above, part 2). -# https://github.com/codercom/code-server/issues/121 -if ! bashio::fs.file_exists '/data/vscode/User/workspaceStorage'; then - mkdir -p /data/vscode/User/workspaceStorage \ - || bashio::exit.nok "Could not create persistent storage folder." -fi From 57a2fc021fe3e9fc20772923e2a421fd85e677d7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Apr 2022 18:05:21 +0200 Subject: [PATCH 442/778] :fire: Remove hassio command compatibility layer (#435) --- vscode/rootfs/usr/bin/hassio | 3 --- 1 file changed, 3 deletions(-) delete mode 100755 vscode/rootfs/usr/bin/hassio diff --git a/vscode/rootfs/usr/bin/hassio b/vscode/rootfs/usr/bin/hassio deleted file mode 100755 index e38eb86..0000000 --- a/vscode/rootfs/usr/bin/hassio +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bashio -bashio::log.yellow "The 'hassio' command is deprecated, please use 'ha' instead!" -ha "$@" From c6b2612f1e8d287141c92f8b41a12c5316a3f46e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Apr 2022 21:33:44 +0200 Subject: [PATCH 443/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.28.0=20(#436)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 37cf56b..cbe2093 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.15.0 esbenp.prettier-vscode#9.5.0 ESPHome.esphome-vscode#2.0.0 -keesschollaart.vscode-home-assistant#1.27.0 +keesschollaart.vscode-home-assistant#1.28.0 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From d8f4b7d254aa72dd26e3385eda9c3e0e8acd62e7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Apr 2022 21:52:42 +0200 Subject: [PATCH 444/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20ESPHome?= =?UTF-8?q?=20to=202022.4.0=20(#437)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 40adda1..ec08d1f 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.3.2 +esphome==2022.4.0 yamllint==1.26.3 From 1cffa300890d6ab2a0bbf10e925e12e5a2797c75 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 28 Apr 2022 13:42:55 +0200 Subject: [PATCH 445/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.29.0=20(#439)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index cbe2093..784dea5 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.15.0 esbenp.prettier-vscode#9.5.0 ESPHome.esphome-vscode#2.0.0 -keesschollaart.vscode-home-assistant#1.28.0 +keesschollaart.vscode-home-assistant#1.29.0 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From 4582687ae70f90137e3e065fac5bd15c3c9fd213 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 28 Apr 2022 16:30:29 +0200 Subject: [PATCH 446/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20ESPHome?= =?UTF-8?q?.esphome-vscode=20to=202022.4.0=20(#440)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 784dea5..7d82f14 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.15.0 esbenp.prettier-vscode#9.5.0 -ESPHome.esphome-vscode#2.0.0 +ESPHome.esphome-vscode#2022.4.0 keesschollaart.vscode-home-assistant#1.29.0 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 From b334a09afab92fae708e3a507074e0a7fbacc08c Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 28 Apr 2022 16:32:25 +0200 Subject: [PATCH 447/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20Home=20?= =?UTF-8?q?Assistant=20CLI=20to=20v4.16.1=20(#441)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 34acc3e..1e3d171 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -86,7 +86,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.15.1/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.16.1/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From a800abca2deb1b4c428a19eff6066646ac2a858b Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 2 May 2022 12:38:06 +0200 Subject: [PATCH 448/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20Home=20?= =?UTF-8?q?Assistant=20CLI=20to=20v4.17.0=20(#444)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 1e3d171..eebc699 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -86,7 +86,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.16.1/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.17.0/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From 65ed867d17d086ad3044b850560de4ac99391266 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 16 May 2022 18:52:31 +0200 Subject: [PATCH 449/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=204.4.0=20(#448)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index eebc699..f6e4bfc 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -53,7 +53,7 @@ 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.3.0/code-server-4.3.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v4.4.0/code-server-4.4.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 0cbb51f2f7cac5858241a85a456754aeb6ec8837 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 16 May 2022 20:02:50 +0200 Subject: [PATCH 450/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.29.1=20(#449)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 7d82f14..130290f 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.15.0 esbenp.prettier-vscode#9.5.0 ESPHome.esphome-vscode#2022.4.0 -keesschollaart.vscode-home-assistant#1.29.0 +keesschollaart.vscode-home-assistant#1.29.1 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From eedf8dafe7df38c8b6f9bb756c2421bafd792e7f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 16 May 2022 22:32:27 +0200 Subject: [PATCH 451/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.29.2=20(#450)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 130290f..28215d7 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.15.0 esbenp.prettier-vscode#9.5.0 ESPHome.esphome-vscode#2022.4.0 -keesschollaart.vscode-home-assistant#1.29.1 +keesschollaart.vscode-home-assistant#1.29.2 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From 32c3877ad6757539dac3e692d530a107a1655349 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 18 May 2022 09:16:11 +0200 Subject: [PATCH 452/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20ESPHome?= =?UTF-8?q?=20to=202022.5.0=20(#452)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index ec08d1f..332e153 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.4.0 +esphome==2022.5.0 yamllint==1.26.3 From fe5c52b7b51ecc69a572445f1b07ad248b3c34d0 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 18 May 2022 09:16:36 +0200 Subject: [PATCH 453/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20ESPHome?= =?UTF-8?q?.esphome-vscode=20to=202022.5.0=20(#453)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 28215d7..286dd2d 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.15.0 esbenp.prettier-vscode#9.5.0 -ESPHome.esphome-vscode#2022.4.0 +ESPHome.esphome-vscode#2022.5.0 keesschollaart.vscode-home-assistant#1.29.2 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 From f258c0d8d7262b5703680e43b175672e22ab64b8 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 18 May 2022 09:36:28 +0200 Subject: [PATCH 454/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.29.3=20(#454)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 286dd2d..a979d3c 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.15.0 esbenp.prettier-vscode#9.5.0 ESPHome.esphome-vscode#2022.5.0 -keesschollaart.vscode-home-assistant#1.29.2 +keesschollaart.vscode-home-assistant#1.29.3 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From a58e61f91befe2b0020ec0862b942f15a480c23d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 May 2022 08:51:53 +0200 Subject: [PATCH 455/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20esphome=20f?= =?UTF-8?q?rom=202022.5.0=20to=202022.5.1=20in=20/vscode=20(#458)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 332e153..63e9b49 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.5.0 +esphome==2022.5.1 yamllint==1.26.3 From afb0547175cf58d53fe74585cae20f5f133f9c33 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 30 May 2022 16:05:46 +0200 Subject: [PATCH 456/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.30.0=20(#459)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index a979d3c..6d12ac1 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.15.0 esbenp.prettier-vscode#9.5.0 ESPHome.esphome-vscode#2022.5.0 -keesschollaart.vscode-home-assistant#1.29.3 +keesschollaart.vscode-home-assistant#1.30.0 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From 4bb501018192813bd8e25a271bb466e788d5a095 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 30 May 2022 16:33:30 +0200 Subject: [PATCH 457/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20ESPHome?= =?UTF-8?q?.esphome-vscode=20to=202022.5.3=20(#460)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 6d12ac1..edb00d5 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.15.0 esbenp.prettier-vscode#9.5.0 -ESPHome.esphome-vscode#2022.5.0 +ESPHome.esphome-vscode#2022.5.3 keesschollaart.vscode-home-assistant#1.30.0 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 From 46994e7b50de1595e15dcf1fa8a22b496de0ced2 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 2 Jun 2022 16:25:01 +0200 Subject: [PATCH 458/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20Home=20?= =?UTF-8?q?Assistant=20CLI=20to=20v4.18.0=20(#462)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index f6e4bfc..6671db3 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -86,7 +86,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.17.0/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.18.0/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From 02e6895ef8b6f479c89aa4faee6cad3ba05d4cae Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 2 Jun 2022 16:44:33 +0200 Subject: [PATCH 459/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.30.1=20(#463)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index edb00d5..17b616d 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.15.0 esbenp.prettier-vscode#9.5.0 ESPHome.esphome-vscode#2022.5.3 -keesschollaart.vscode-home-assistant#1.30.0 +keesschollaart.vscode-home-assistant#1.30.1 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From 63eb05ccd8b893f72e062dfbdaac8eb0e357e918 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 2 Jun 2022 20:04:16 +0200 Subject: [PATCH 460/778] :books: Documentation cleanup (#464) --- vscode/DOCS.md | 46 +--------------------------------------------- 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/vscode/DOCS.md b/vscode/DOCS.md index bc0d5ab..6b58411 100644 --- a/vscode/DOCS.md +++ b/vscode/DOCS.md @@ -25,12 +25,6 @@ comparison to installing any other Home Assistant add-on. well. 1. Click the "OPEN WEB UI" button to open Studio Code Server. -Home Assistant, by default, ships with the Community Add-ons store installed. -However, if it is missing (for any reason), you can add it by clicking the -button My button below. - -[![Add repository to your Home Assitant instance.][repository-badge]][repository] - ## Configuration **Note**: _Remember to restart the add-on when the configuration is changed._ @@ -102,37 +96,6 @@ return to the defaults as delivered by this add-on, do the following: 1. Execute the following command in the terminal window: `reset-settings`. 1. Done! -## Using with ESPHome - -The add-on has support for ESPHome (and its vscode extension), built-in! -It has been installed and pre-configured for you, however, it might need -an adjustment to your ESPHome add-on in order to function. - -1. Go to the ESPHome add-on configuration in your Supervisor panel. -1. Add the `leave_front_door_open` option, since the vscode extension of - ESPHome does not support authentication yet. The ESPHome add-on - configuration would look like this: - - ```yaml - leave_front_door_open: true - ``` - -1. Save the add-on configuration. -1. Enable direct access to the ESPHome add-on, by enabling the network port. - This option can be found on the ESPHome add-on settings page, in the - "Network" section. In the "Host" field (that is now showing disabled), - enter `6052` and hit save. -1. Restart the ESPHome add-on. - -And you're set! - -No changes to the vscode add-on are needed, since it has been pre-configured. - -**Please note!** This opens up ESPHome for access within your network -without authentication! Currently, this is how ESPHome advises how to -set up your system, but it surely has security risks. We hope ESPHome -will come up with a better solution for this soon. - ## Known issues and limitations - Can this add-on run on a Raspberry Pi? Yes, but only if you run a 64 bits @@ -141,11 +104,6 @@ will come up with a better solution for this soon. Although we support ARM devices, please be aware, that this add-on is quite heavy to run, and requires quite a bit of RAM. We do not recommended to run it on devices with less than 4Gb of memory. -- If you get a blank screen (and it worked before), it could be that you changed - your workspace. Reinstalling the add-on will not help since it keeps the data - in your browser. To remove it (in Chrome) open up developer tools (F12), - then go to the application tab and click "clear storage". - Now refresh the page and you're back in action. - "Visual Studio Code is unable to watch for file changes in this large workspace" (error ENOSPC) @@ -217,7 +175,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. [addon-badge]: https://my.home-assistant.io/badges/supervisor_addon.svg -[addon]: https://my.home-assistant.io/redirect/supervisor_addon/?addon=a0d7b954_vscode +[addon]: https://my.home-assistant.io/redirect/supervisor_addon/?addon=a0d7b954_vscode&repository_url=https%3A%2F%2Fgithub.com%2Fhassio-addons%2Frepository [contributors]: https://github.com/hassio-addons/addon-vscode/graphs/contributors [discord-ha]: https://discord.gg/c5DvZ4e [discord]: https://discord.me/hassioaddons @@ -226,7 +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 -[repository-badge]: https://my.home-assistant.io/badges/supervisor_add_addon_repository.svg -[repository]: https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Fhassio-addons%2Frepository [semver]: http://semver.org/spec/v2.0.0 [ubuntu-packages]: https://packages.ubuntu.com From 8f29272815f923e8f96c1da54b9bee9070c1cb66 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 9 Jun 2022 13:34:48 +0200 Subject: [PATCH 461/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=206.0.0=20(#466)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ⬆️ Upgrades add-on base image to 6.0.0 * Bump openssl --- vscode/Dockerfile | 4 ++-- vscode/build.yaml | 4 ++-- vscode/rootfs/etc/cont-init.d/code-server.sh | 2 +- vscode/rootfs/etc/cont-init.d/mosquitto.sh | 2 +- vscode/rootfs/etc/cont-init.d/mysql.sh | 2 +- vscode/rootfs/etc/cont-init.d/user.sh | 2 +- vscode/rootfs/etc/services.d/code/finish | 10 ++++++---- vscode/rootfs/etc/services.d/code/run | 2 +- 8 files changed, 15 insertions(+), 13 deletions(-) mode change 100644 => 100755 vscode/rootfs/etc/cont-init.d/code-server.sh mode change 100644 => 100755 vscode/rootfs/etc/cont-init.d/mosquitto.sh mode change 100644 => 100755 vscode/rootfs/etc/cont-init.d/mysql.sh mode change 100644 => 100755 vscode/rootfs/etc/cont-init.d/user.sh mode change 100644 => 100755 vscode/rootfs/etc/services.d/code/finish mode change 100644 => 100755 vscode/rootfs/etc/services.d/code/run diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 6671db3..ec2d96f 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.3.1 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:6.0.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -36,7 +36,7 @@ RUN \ net-tools=1.60+git20181103.0eebece-1 \ nmap=7.91+dfsg1+really7.80+dfsg1-2 \ openssh-client=1:8.4p1-5 \ - openssl=1.1.1n-0+deb11u1 \ + openssl=1.1.1n-0+deb11u2 \ python3-dev=3.9.2-3 \ python3=3.9.2-3 \ unzip=6.0-26 \ diff --git a/vscode/build.yaml b/vscode/build.yaml index f47c58f..aac540e 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base/aarch64:5.3.1 - amd64: ghcr.io/hassio-addons/debian-base/amd64:5.3.1 + aarch64: ghcr.io/hassio-addons/debian-base/aarch64:6.0.0 + amd64: ghcr.io/hassio-addons/debian-base/amd64:6.0.0 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh old mode 100644 new mode 100755 index eee73ef..0bc2e5b --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/command/with-contenv bashio # ============================================================================== # Home Assistant Community Add-on: Studio Code Server # Sets up code-server. diff --git a/vscode/rootfs/etc/cont-init.d/mosquitto.sh b/vscode/rootfs/etc/cont-init.d/mosquitto.sh old mode 100644 new mode 100755 index d89061a..c3aef0e --- a/vscode/rootfs/etc/cont-init.d/mosquitto.sh +++ b/vscode/rootfs/etc/cont-init.d/mosquitto.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/command/with-contenv bashio # ============================================================================== # Home Assistant Community Add-on: Studio Code Server # Pre-configures the Mosquitto clients, if the service is available diff --git a/vscode/rootfs/etc/cont-init.d/mysql.sh b/vscode/rootfs/etc/cont-init.d/mysql.sh old mode 100644 new mode 100755 index 03ce621..00a323b --- a/vscode/rootfs/etc/cont-init.d/mysql.sh +++ b/vscode/rootfs/etc/cont-init.d/mysql.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/command/with-contenv bashio # ============================================================================== # Home Assistant Community Add-on: Studio Code Server # Pre-configures the MySQL clients, if the service is available diff --git a/vscode/rootfs/etc/cont-init.d/user.sh b/vscode/rootfs/etc/cont-init.d/user.sh old mode 100644 new mode 100755 index b9b58bd..5f0b883 --- a/vscode/rootfs/etc/cont-init.d/user.sh +++ b/vscode/rootfs/etc/cont-init.d/user.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/command/with-contenv bashio # ============================================================================== # Home Assistant Community Add-on: Studio Code Server # Persists user settings and installs custom user packages. diff --git a/vscode/rootfs/etc/services.d/code/finish b/vscode/rootfs/etc/services.d/code/finish old mode 100644 new mode 100755 index 91b7c3e..d83da7d --- a/vscode/rootfs/etc/services.d/code/finish +++ b/vscode/rootfs/etc/services.d/code/finish @@ -1,9 +1,11 @@ -#!/usr/bin/execlineb -S0 +#!/command/with-contenv bashio # ============================================================================== # Home Assistant Community Add-on: Studio Code Server # Take down the S6 supervision tree when the code server fails # ============================================================================== -if { s6-test ${1} -ne 0 } -if { s6-test ${1} -ne 256 } +if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then + bashio::log.warning "code-server crashed, halting add-on" + /run/s6/basedir/bin/halt +fi -s6-svscanctl -t /var/run/s6/services +bashio::log.info "code-server stopped, restarting..." diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/services.d/code/run old mode 100644 new mode 100755 index eb16520..230d865 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/services.d/code/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/command/with-contenv bashio # ============================================================================== # Home Assistant Community Add-on: Studio Code Server # Runs the code server From 664e44ef5c19d8fe7a9d4199ca58afb08b1a242d Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 12 Jun 2022 21:04:56 +0200 Subject: [PATCH 462/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20emilast?= =?UTF-8?q?.LogFileHighlighter=20to=202.16.0=20(#467)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 17b616d..1e59a70 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#2.15.0 +emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#9.5.0 ESPHome.esphome-vscode#2022.5.3 keesschollaart.vscode-home-assistant#1.30.1 From 9ac928d83c585ae64e41daf64fa2117cf42a1745 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Jun 2022 09:00:06 +0200 Subject: [PATCH 463/778] :arrow_up: Bump esphome from 2022.5.1 to 2022.6.0 in /vscode (#468) Bumps [esphome](https://github.com/esphome/esphome) from 2022.5.1 to 2022.6.0. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2022.5.1...2022.6.0) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 63e9b49..31de978 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.5.1 +esphome==2022.6.0 yamllint==1.26.3 From 9f94f783185461428645fc027506372413b5a665 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 08:40:52 +0200 Subject: [PATCH 464/778] Bump esphome from 2022.6.0 to 2022.6.1 in /vscode (#470) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 31de978..62f2538 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.6.0 +esphome==2022.6.1 yamllint==1.26.3 From d78e1572ddbd6d3964ac2403ba12cd75977bb958 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 20 Jun 2022 09:38:21 +0200 Subject: [PATCH 465/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20ESPHome?= =?UTF-8?q?.esphome-vscode=20to=202022.6.1=20(#471)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 1e59a70..78d07ba 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#9.5.0 -ESPHome.esphome-vscode#2022.5.3 +ESPHome.esphome-vscode#2022.6.1 keesschollaart.vscode-home-assistant#1.30.1 lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 From 1c5bbbff579cc2beca504b16d4826a27f2746b10 Mon Sep 17 00:00:00 2001 From: Felipe Santos Date: Mon, 20 Jun 2022 04:53:05 -0300 Subject: [PATCH 466/778] Add `less` command (#469) --- vscode/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ec2d96f..113ff5f 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -44,6 +44,7 @@ RUN \ wget=1.21-1+deb11u1 \ zip=3.0-12 \ zsh=5.8-6+deb11u1 \ + less=551-2 \ \ && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \ && locale-gen \ From ffb13c6d1bd2469491fbf1c7534a5d79c1c0e319 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Jun 2022 11:26:23 +0200 Subject: [PATCH 467/778] Bump esphome from 2022.6.1 to 2022.6.2 in /vscode (#472) Bumps [esphome](https://github.com/esphome/esphome) from 2022.6.1 to 2022.6.2. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2022.6.1...2022.6.2) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 62f2538..ab7abeb 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.6.1 +esphome==2022.6.2 yamllint==1.26.3 From cd286cf474fd9ad5c56c1f805e812afc389f7fa9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jul 2022 09:05:28 +0200 Subject: [PATCH 468/778] Bump yamllint from 1.26.3 to 1.27.1 in /vscode (#473) Bumps [yamllint](https://github.com/adrienverge/yamllint) from 1.26.3 to 1.27.1. - [Release notes](https://github.com/adrienverge/yamllint/releases) - [Changelog](https://github.com/adrienverge/yamllint/blob/master/CHANGELOG.rst) - [Commits](https://github.com/adrienverge/yamllint/compare/v1.26.3...v1.27.1) --- updated-dependencies: - dependency-name: yamllint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index ab7abeb..2438a2f 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ esphome==2022.6.2 -yamllint==1.26.3 +yamllint==1.27.1 From ff3af32124db6a378468cd1a0ff222023ba1c05f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Jul 2022 10:24:43 +0200 Subject: [PATCH 469/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=206.1.0=20(#477)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ⬆️ Upgrades add-on base image to 6.1.0 * Fix halt in finish script --- vscode/Dockerfile | 6 +++--- vscode/build.yaml | 4 ++-- vscode/rootfs/etc/services.d/code/finish | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 113ff5f..1ad34e1 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:6.0.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.1.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -35,8 +35,8 @@ RUN \ 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 \ - openssl=1.1.1n-0+deb11u2 \ + 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 \ diff --git a/vscode/build.yaml b/vscode/build.yaml index aac540e..ed0005d 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base/aarch64:6.0.0 - amd64: ghcr.io/hassio-addons/debian-base/amd64:6.0.0 + aarch64: ghcr.io/hassio-addons/debian-base:6.1.0 + amd64: ghcr.io/hassio-addons/debian-base:6.1.0 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev diff --git a/vscode/rootfs/etc/services.d/code/finish b/vscode/rootfs/etc/services.d/code/finish index d83da7d..147ff6e 100755 --- a/vscode/rootfs/etc/services.d/code/finish +++ b/vscode/rootfs/etc/services.d/code/finish @@ -5,7 +5,7 @@ # ============================================================================== if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then bashio::log.warning "code-server crashed, halting add-on" - /run/s6/basedir/bin/halt + exec /run/s6/basedir/bin/halt fi bashio::log.info "code-server stopped, restarting..." From 8eeacf82177f83bc92ca3462538dfae85a99d17e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 20 Jul 2022 11:04:59 +0200 Subject: [PATCH 470/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=204.5.1=20(#478)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 1ad34e1..73ecf0a 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -54,7 +54,7 @@ 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.4.0/code-server-4.4.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v4.5.1/code-server-4.5.1-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From c92592fdc84b42faeea536cf1769b2f2d07e7d03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Aug 2022 12:02:25 +0200 Subject: [PATCH 471/778] Bump esphome from 2022.6.2 to 2022.6.3 in /vscode (#479) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 2438a2f..b69e247 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.6.2 +esphome==2022.6.3 yamllint==1.27.1 From 2bc8194e3ece9364d0f7198c0398e61164039064 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 9 Aug 2022 10:50:33 +0200 Subject: [PATCH 472/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20usernam?= =?UTF-8?q?ehw.errorlens=20to=203.6.0=20(#481)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 78d07ba..ee8b3ae 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -6,4 +6,4 @@ lukas-tr.materialdesignicons-intellisense#4.0.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 redhat.vscode-yaml#1.5.1 -usernamehw.errorlens#3.4.2 +usernamehw.errorlens#3.6.0 From e301d80abdd44731d9c2653954c34c20e0cae484 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 10 Aug 2022 16:31:13 +0200 Subject: [PATCH 473/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20lukas-t?= =?UTF-8?q?r.materialdesignicons-intellisense=20to=204.1.0=20(#482)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index ee8b3ae..3c0a8fd 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -2,7 +2,7 @@ emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#9.5.0 ESPHome.esphome-vscode#2022.6.1 keesschollaart.vscode-home-assistant#1.30.1 -lukas-tr.materialdesignicons-intellisense#4.0.0 +lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 redhat.vscode-yaml#1.5.1 From 46b70ef2e9cc57cdeb7da0a04b9258e3771b7fbb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Aug 2022 08:46:06 +0200 Subject: [PATCH 474/778] Bump esphome from 2022.6.3 to 2022.8.0 in /vscode (#483) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index b69e247..16e64ef 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.6.3 +esphome==2022.8.0 yamllint==1.27.1 From 5b40182589aeba99316d30eee898b93474d44372 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 17 Aug 2022 09:57:26 +0200 Subject: [PATCH 475/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=204.5.2=20(#484)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 73ecf0a..41cd646 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -54,7 +54,7 @@ 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.5.1/code-server-4.5.1-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v4.5.2/code-server-4.5.2-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 2d65e533183f8b5f5022d60b258e3fba202fe853 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 17 Aug 2022 10:00:56 +0200 Subject: [PATCH 476/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20Home=20?= =?UTF-8?q?Assistant=20CLI=20to=20v4.19.0=20(#485)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 41cd646..a5b0194 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -87,7 +87,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.18.0/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.19.0/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From ff6f0a6f741d196ecba7bedbf3d53c584d49d511 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 20 Aug 2022 08:17:36 +0200 Subject: [PATCH 477/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=206.1.1=20(#486)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index a5b0194..baff03f 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.1.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.1.1 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index ed0005d..36d4682 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:6.1.0 - amd64: ghcr.io/hassio-addons/debian-base:6.1.0 + aarch64: ghcr.io/hassio-addons/debian-base:6.1.1 + amd64: ghcr.io/hassio-addons/debian-base:6.1.1 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 369d3f074cd751a8a0946e64844904cbee1d182e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 20 Aug 2022 08:19:36 +0200 Subject: [PATCH 478/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=204.6.0=20(#487)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index baff03f..95fb562 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -54,7 +54,7 @@ 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.5.2/code-server-4.5.2-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v4.6.0/code-server-4.6.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 005cfcdcc737f923ad82932754c605b8a7ac6488 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 21 Aug 2022 19:09:13 +0200 Subject: [PATCH 479/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20esbenp.?= =?UTF-8?q?prettier-vscode=20to=209.8.0=20(#488)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 3c0a8fd..2c7896a 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.16.0 -esbenp.prettier-vscode#9.5.0 +esbenp.prettier-vscode#9.8.0 ESPHome.esphome-vscode#2022.6.1 keesschollaart.vscode-home-assistant#1.30.1 lukas-tr.materialdesignicons-intellisense#4.1.0 From 86ca93f38b7d82903887993e3778fbb0b19b1572 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Sep 2022 20:12:22 +0200 Subject: [PATCH 480/778] Bump esphome from 2022.8.0 to 2022.8.2 in /vscode (#492) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 16e64ef..8e5dd9d 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.8.0 +esphome==2022.8.2 yamllint==1.27.1 From 6b962b1992f3757aab7df0348e3a22138d5b5f61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 19:03:16 +0200 Subject: [PATCH 481/778] Bump esphome from 2022.8.2 to 2022.8.3 in /vscode (#493) Bumps [esphome](https://github.com/esphome/esphome) from 2022.8.2 to 2022.8.3. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2022.8.2...2022.8.3) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 8e5dd9d..ebe46bd 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.8.2 +esphome==2022.8.3 yamllint==1.27.1 From 666473d9ac6217f75142b5dee660b1fed357282a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 16 Sep 2022 15:41:40 +0200 Subject: [PATCH 482/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=206.1.2=20(#499)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 6 +++--- vscode/build.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 95fb562..d436155 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.1.1 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.1.2 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -30,7 +30,7 @@ RUN \ colordiff=1.0.18-1.1 \ git=1:2.30.2-1 \ iputils-ping=3:20210202-1 \ - locales=2.31-13+deb11u3 \ + locales=2.31-13+deb11u4 \ mariadb-client=1:10.5.15-0+deb11u1 \ mosquitto-clients=2.0.11-1 \ net-tools=1.60+git20181103.0eebece-1 \ @@ -39,7 +39,7 @@ RUN \ openssl=1.1.1n-0+deb11u3 \ python3-dev=3.9.2-3 \ python3=3.9.2-3 \ - unzip=6.0-26 \ + unzip=6.0-26+deb11u1 \ uuid-runtime=2.36.1-8+deb11u1 \ wget=1.21-1+deb11u1 \ zip=3.0-12 \ diff --git a/vscode/build.yaml b/vscode/build.yaml index 36d4682..d34e823 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:6.1.1 - amd64: ghcr.io/hassio-addons/debian-base:6.1.1 + aarch64: ghcr.io/hassio-addons/debian-base:6.1.2 + amd64: ghcr.io/hassio-addons/debian-base:6.1.2 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From c0eec33acc9c1b941e5bd6156d2797aab5288080 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 16 Sep 2022 16:01:23 +0200 Subject: [PATCH 483/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=204.7.0=20(#500)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index d436155..7f9a193 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -54,7 +54,7 @@ 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.6.0/code-server-4.6.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v4.7.0/code-server-4.7.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 62f1c8eb85da8fb94d047cb72cd40579ddf4f1b4 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 16 Sep 2022 16:02:09 +0200 Subject: [PATCH 484/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20Home=20?= =?UTF-8?q?Assistant=20CLI=20to=20v4.21.0=20(#501)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 7f9a193..449930c 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -87,7 +87,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.19.0/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.21.0/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From e46f2a1abc07993d8eb32360c8644a640250aa3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Sep 2022 16:02:23 +0200 Subject: [PATCH 485/778] Bump yamllint from 1.27.1 to 1.28.0 in /vscode (#497) Bumps [yamllint](https://github.com/adrienverge/yamllint) from 1.27.1 to 1.28.0. - [Release notes](https://github.com/adrienverge/yamllint/releases) - [Changelog](https://github.com/adrienverge/yamllint/blob/master/CHANGELOG.rst) - [Commits](https://github.com/adrienverge/yamllint/compare/v1.27.1...v1.28.0) --- updated-dependencies: - dependency-name: yamllint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index ebe46bd..f63ac79 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ esphome==2022.8.3 -yamllint==1.27.1 +yamllint==1.28.0 From 1048d5ed430aab6154ca909695d2c089c4ff4980 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 16 Sep 2022 16:29:37 +0200 Subject: [PATCH 486/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20ESPHome?= =?UTF-8?q?.esphome-vscode=20to=202022.8.3=20(#502)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 2c7896a..cb3e9fe 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#9.8.0 -ESPHome.esphome-vscode#2022.6.1 +ESPHome.esphome-vscode#2022.8.3 keesschollaart.vscode-home-assistant#1.30.1 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 From 02bd38eebe27a5a800b5c29c39afeede1099acd6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Sep 2022 10:19:51 +0200 Subject: [PATCH 487/778] Bump esphome from 2022.8.3 to 2022.9.0 (#504) Bumps [esphome](https://github.com/esphome/esphome) from 2022.8.3 to 2022.9.0. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2022.8.3...2022.9.0) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index f63ac79..0a565db 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.8.3 +esphome==2022.9.0 yamllint==1.28.0 From 364315871b5c36c8d23ef496bfc0e55c79506523 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Sep 2022 09:11:44 +0200 Subject: [PATCH 488/778] Bump esphome from 2022.9.0 to 2022.9.1 (#505) Bumps [esphome](https://github.com/esphome/esphome) from 2022.9.0 to 2022.9.1. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2022.9.0...2022.9.1) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 0a565db..1be9195 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.9.0 +esphome==2022.9.1 yamllint==1.28.0 From f2f3c2fb324e1bfc8ca83a983bf24c01205d9301 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Sep 2022 09:41:15 +0200 Subject: [PATCH 489/778] Bump esphome from 2022.9.1 to 2022.9.2 in /vscode (#506) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 1be9195..09f5952 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.9.1 +esphome==2022.9.2 yamllint==1.28.0 From 9d6f6aa2307f69d92718d3611da26d5277c128a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Oct 2022 20:11:50 +0200 Subject: [PATCH 490/778] Bump esphome from 2022.9.2 to 2022.9.3 (#507) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 09f5952..4cbbf19 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.9.2 +esphome==2022.9.3 yamllint==1.28.0 From f0648d11eb8711dc4e4acd2b44f68e1b30f26751 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 18:24:29 +0200 Subject: [PATCH 491/778] Bump esphome from 2022.9.3 to 2022.10.0 in /vscode (#513) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 4cbbf19..1f47740 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.9.3 +esphome==2022.10.0 yamllint==1.28.0 From db171736388811b5f935d5212c4b18003da7d7ce Mon Sep 17 00:00:00 2001 From: Guillermo Ruffino Date: Fri, 21 Oct 2022 08:31:07 -0300 Subject: [PATCH 492/778] Upgrades ESPHome.esphome-vscode to 2022.10.0 (#514) --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index cb3e9fe..4772ad3 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#9.8.0 -ESPHome.esphome-vscode#2022.8.3 +ESPHome.esphome-vscode#2022.10.0 keesschollaart.vscode-home-assistant#1.30.1 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 From d005849c99d240dc62993c79ce06e7147c5995a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Oct 2022 10:02:09 +0200 Subject: [PATCH 493/778] Bump esphome from 2022.10.0 to 2022.10.1 in /vscode (#515) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 1f47740..bfe00be 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.10.0 +esphome==2022.10.1 yamllint==1.28.0 From 758bfe57f112cbf64ce7260cf09abb13cca07503 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 27 Oct 2022 13:40:00 +0200 Subject: [PATCH 494/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=204.8.0=20(#516)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 449930c..0941454 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -54,7 +54,7 @@ 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.7.0/code-server-4.7.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v4.8.0/code-server-4.8.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From c3effeb6f9e0ce6708cfd26101aeb3b8ba8fb50d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Nov 2022 11:32:43 +0100 Subject: [PATCH 495/778] Bump esphome from 2022.10.1 to 2022.10.2 in /vscode (#519) Bumps [esphome](https://github.com/esphome/esphome) from 2022.10.1 to 2022.10.2. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2022.10.1...2022.10.2) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index bfe00be..5f182d4 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.10.1 +esphome==2022.10.2 yamllint==1.28.0 From 2e71ab1dc5b887501a6001371e6c64f413f6639e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 3 Nov 2022 13:20:20 +0100 Subject: [PATCH 496/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=206.1.3=20(#520)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 0941454..4ece811 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.1.2 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.1.3 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index d34e823..0611372 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:6.1.2 - amd64: ghcr.io/hassio-addons/debian-base:6.1.2 + aarch64: ghcr.io/hassio-addons/debian-base:6.1.3 + amd64: ghcr.io/hassio-addons/debian-base:6.1.3 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From a964e3a38974a7a6fd0d0b6eae34010ac4635239 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 3 Nov 2022 14:31:52 +0100 Subject: [PATCH 497/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=204.8.2=20(#521)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 4ece811..7283d1c 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -54,7 +54,7 @@ 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.8.0/code-server-4.8.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v4.8.2/code-server-4.8.2-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 65f429739daaa71b7050ee63998555a55ef54f72 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 3 Nov 2022 15:40:31 +0100 Subject: [PATCH 498/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20Home=20?= =?UTF-8?q?Assistant=20CLI=20to=20v4.22.0=20(#522)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- vscode/rootfs/root/.zshrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 7283d1c..0612d25 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -87,7 +87,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.21.0/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.22.0/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ diff --git a/vscode/rootfs/root/.zshrc b/vscode/rootfs/root/.zshrc index de1f56d..63fd50c 100755 --- a/vscode/rootfs/root/.zshrc +++ b/vscode/rootfs/root/.zshrc @@ -97,7 +97,7 @@ source $ZSH/oh-my-zsh.sh alias reset-settings="cp /root/.code-server/settings.json /data/vscode/User/settings.json && echo 'Setting restored!'" # Home Assistant CLI -source <(ha completion --zsh) +source <(ha completion zsh) && compdef _ha ha # Show motd on start cat /etc/motd From bbf3320d51e69ce4b5cb7bcc1716f62032ab351b Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 9 Nov 2022 15:17:39 +0100 Subject: [PATCH 499/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=204.8.3=20(#523)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 0612d25..4f1f0a0 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -54,7 +54,7 @@ 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.8.2/code-server-4.8.2-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v4.8.3/code-server-4.8.3-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 3b1171ba550e35ace6e381c2b5d7dc4106edd7d8 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 9 Nov 2022 15:19:00 +0100 Subject: [PATCH 500/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20Home=20?= =?UTF-8?q?Assistant=20CLI=20to=20v4.23.0=20(#524)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 4f1f0a0..343b0de 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -87,7 +87,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.22.0/ha_${BUILD_ARCH}" \ + "https://github.com/home-assistant/cli/releases/download/4.23.0/ha_${BUILD_ARCH}" \ && chmod a+x /usr/bin/ha \ \ && git clone --branch master --single-branch --depth 1 \ From 5ef94785ff413087d45876d7d776660a3a7bf97b Mon Sep 17 00:00:00 2001 From: myztillx <33730898+myztillx@users.noreply.github.com> Date: Wed, 9 Nov 2022 09:39:06 -0500 Subject: [PATCH 501/778] Added ESPHome Subfolders to ESPHome Language Association (#512) Co-authored-by: Franck Nijhof --- vscode/rootfs/etc/cont-init.d/code-server.sh | 1 + vscode/rootfs/root/.code-server/settings.json | 1 + 2 files changed, 2 insertions(+) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index 0bc2e5b..f22ff17 100755 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -18,6 +18,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( 5243d7664d30b5aa0c45fbe1089cccdf85c5ade17cddd97e21b3a29ccb37b20d20bdfecc141ad6e1a7aa5ea8ee61695a79a43140a2d53f9f91687bc61f7e496c e5106aaaff5f67a693fd49deb7dd52f1cc0f7ba542b33c99c0099bf58f1a33c789d1c5e3803dea2942540c07c734f3ca317c3cc91673aff388cb79ee7112db0b b28a299111ac74cc9498f76ce2cb437b2cf5e8e7bb9388d9929347e2948bd56591bd499d5de04638553f6e12fa77c53320a046e96cffce9fa4f8c924d5c91581 + dbe905f0935b2fea8bb5ba379bff78db9d056ea6d0965c68aa9b07938a52cbbf117186452b2b6c766aa4cf93cc3494ad91b763e8500e515e41d8cde31a3821ae ) if bashio::config.has_value 'config_path'; then diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index 2b82ed0..b833220 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -2,6 +2,7 @@ "files.associations": { "*.dash": "yaml", "**/esphome/*.yaml": "esphome", + "**/esphome/**/*.yaml": "esphome", "*.yaml": "home-assistant" }, "files.watcherExclude": { From b5a57dedc9c4d7eb3ff94d4af842daecb45e2b21 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 9 Nov 2022 16:15:45 +0100 Subject: [PATCH 502/778] Exclude node_modules by default (#525) --- vscode/rootfs/etc/cont-init.d/code-server.sh | 1 + vscode/rootfs/root/.code-server/settings.json | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh index f22ff17..674406a 100755 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/cont-init.d/code-server.sh @@ -19,6 +19,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=( e5106aaaff5f67a693fd49deb7dd52f1cc0f7ba542b33c99c0099bf58f1a33c789d1c5e3803dea2942540c07c734f3ca317c3cc91673aff388cb79ee7112db0b b28a299111ac74cc9498f76ce2cb437b2cf5e8e7bb9388d9929347e2948bd56591bd499d5de04638553f6e12fa77c53320a046e96cffce9fa4f8c924d5c91581 dbe905f0935b2fea8bb5ba379bff78db9d056ea6d0965c68aa9b07938a52cbbf117186452b2b6c766aa4cf93cc3494ad91b763e8500e515e41d8cde31a3821ae + 2212babaa9dc46d38ba239052c9c05151abe517cc8b493d0d351a96bf70c1efa4f7479f6ed0b75811429ba649906eb5657d73b0732b460e718a5c66603dcdbda ) if bashio::config.has_value 'config_path'; then diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json index b833220..b93fdae 100644 --- a/vscode/rootfs/root/.code-server/settings.json +++ b/vscode/rootfs/root/.code-server/settings.json @@ -20,6 +20,7 @@ "**/*.db": true, "**/*.log": true, "**/deps/**": true, + "**/node_modules": true, "**/OZW_Log.txt": true, "**/pyozw.sqlite": true }, @@ -38,6 +39,7 @@ "**/*.db": true, "**/*.log": true, "**/deps/**": true, + "**/node_modules": true, "**/OZW_Log.txt": true, "**/pyozw.sqlite": true }, @@ -52,7 +54,8 @@ "**/*.db-shm": true, "**/*.db-wal": true, "**/*.db": true, - "**/deps/**": true + "**/deps/**": true, + "**/node_modules": true }, "yaml.customTags": [ "!env_var scalar", From b12a0a1ac2e999d58f24a4acd29e20e9769f493a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 9 Nov 2022 16:42:11 +0100 Subject: [PATCH 503/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20esbenp.?= =?UTF-8?q?prettier-vscode=20to=209.9.0=20(#526)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 4772ad3..5445a6b 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.16.0 -esbenp.prettier-vscode#9.8.0 +esbenp.prettier-vscode#9.9.0 ESPHome.esphome-vscode#2022.10.0 keesschollaart.vscode-home-assistant#1.30.1 lukas-tr.materialdesignicons-intellisense#4.1.0 From bc69e124370d86495e974f146d2b3276a589d7e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 09:00:09 +0100 Subject: [PATCH 504/778] Bump esphome from 2022.10.2 to 2022.11.1 (#529) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 5f182d4..2d8b090 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.10.2 +esphome==2022.11.1 yamllint==1.28.0 From e40162cf00f491bb061cb46bfca450ece6a63fa1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Nov 2022 10:05:56 +0100 Subject: [PATCH 505/778] Bump esphome from 2022.11.1 to 2022.11.2 in /vscode (#531) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 2d8b090..3513e5b 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.11.1 +esphome==2022.11.2 yamllint==1.28.0 From 5374bbccf575c0c1917ec63edbd5c7fbdea3ba7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Dec 2022 09:29:15 +0100 Subject: [PATCH 506/778] Bump esphome from 2022.11.2 to 2022.11.4 (#535) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 3513e5b..15438ce 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.11.2 +esphome==2022.11.4 yamllint==1.28.0 From 3109ee0205313aaed2bffdfac8991b0228fcc837 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 08:51:14 +0100 Subject: [PATCH 507/778] Bump esphome from 2022.11.4 to 2022.11.5 in /vscode (#537) Bumps [esphome](https://github.com/esphome/esphome) from 2022.11.4 to 2022.11.5. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2022.11.4...2022.11.5) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 15438ce..80667f3 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.11.4 +esphome==2022.11.5 yamllint==1.28.0 From 508d0d489a20445d2ad6aa7b99586cf099a65fe7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 13 Dec 2022 15:46:51 +0100 Subject: [PATCH 508/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=206.2.0=20(#542)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 343b0de..f492ec0 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.1.3 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.2.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index 0611372..73f6c5b 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:6.1.3 - amd64: ghcr.io/hassio-addons/debian-base:6.1.3 + aarch64: ghcr.io/hassio-addons/debian-base:6.2.0 + amd64: ghcr.io/hassio-addons/debian-base:6.2.0 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 0bdcfd888a137d7603c58c07c809650e2aa5ec72 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 13 Dec 2022 17:39:54 +0100 Subject: [PATCH 509/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20ESPHome?= =?UTF-8?q?.esphome-vscode=20to=202022.11.0=20(#544)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 5445a6b..a53d6b2 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#9.9.0 -ESPHome.esphome-vscode#2022.10.0 +ESPHome.esphome-vscode#2022.11.0 keesschollaart.vscode-home-assistant#1.30.1 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 From 02199860fe7bee5fc17ec06217e960fbe3202202 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 13 Dec 2022 17:40:29 +0100 Subject: [PATCH 510/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=204.9.0=20(#543)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index f492ec0..a30b00b 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -54,7 +54,7 @@ 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.8.3/code-server-4.8.3-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v4.9.0/code-server-4.9.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From dc9c456ac79f8065974ae52c800ff6c93513448f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 13 Dec 2022 18:10:39 +0100 Subject: [PATCH 511/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20redhat.?= =?UTF-8?q?vscode-yaml=20to=201.11.10112022=20(#545)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index a53d6b2..5571d64 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -5,5 +5,5 @@ keesschollaart.vscode-home-assistant#1.30.1 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 -redhat.vscode-yaml#1.5.1 +redhat.vscode-yaml#1.11.10112022 usernamehw.errorlens#3.6.0 From c7235275529cd6d05058ec7e673df7a8b659a10e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 13 Dec 2022 21:43:12 +0100 Subject: [PATCH 512/778] :hammer: Migrate old-style base scripts s6-rc (#546) --- .../dependencies.d/init-code-server | 0 .../code-server/dependencies.d/init-user | 0 .../etc/s6-overlay/s6-rc.d/code-server/finish | 27 +++++++++++++++++++ .../s6-rc.d/code-server}/run | 5 ++-- .../etc/s6-overlay/s6-rc.d/code-server/type | 1 + .../init-code-server/dependencies.d/base | 0 .../s6-rc.d/init-code-server/run} | 1 + .../s6-overlay/s6-rc.d/init-code-server/type | 1 + .../s6-overlay/s6-rc.d/init-code-server/up | 1 + .../init-mosquitto/dependencies.d/base | 0 .../s6-rc.d/init-mosquitto/run} | 1 + .../s6-overlay/s6-rc.d/init-mosquitto/type | 1 + .../etc/s6-overlay/s6-rc.d/init-mosquitto/up | 1 + .../s6-rc.d/init-mysql/dependencies.d/base | 0 .../s6-rc.d/init-mysql/run} | 1 + .../etc/s6-overlay/s6-rc.d/init-mysql/type | 1 + .../etc/s6-overlay/s6-rc.d/init-mysql/up | 1 + .../s6-rc.d/init-user/dependencies.d/base | 0 .../s6-rc.d/init-user/run} | 1 + .../etc/s6-overlay/s6-rc.d/init-user/type | 1 + .../etc/s6-overlay/s6-rc.d/init-user/up | 1 + .../s6-rc.d/user/contents.d/code-server | 0 .../s6-rc.d/user/contents.d/init-code-server | 0 .../s6-rc.d/user/contents.d/init-mosquitto | 0 .../s6-rc.d/user/contents.d/init-mysql | 0 .../s6-rc.d/user/contents.d/init-user | 0 vscode/rootfs/etc/services.d/code/finish | 11 -------- 27 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-code-server create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-user create mode 100755 vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/finish rename vscode/rootfs/etc/{services.d/code => s6-overlay/s6-rc.d/code-server}/run (91%) create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/type create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/dependencies.d/base rename vscode/rootfs/etc/{cont-init.d/code-server.sh => s6-overlay/s6-rc.d/init-code-server/run} (99%) create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/type create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/up create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/dependencies.d/base rename vscode/rootfs/etc/{cont-init.d/mosquitto.sh => s6-overlay/s6-rc.d/init-mosquitto/run} (97%) create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/type create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/up create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/dependencies.d/base rename vscode/rootfs/etc/{cont-init.d/mysql.sh => s6-overlay/s6-rc.d/init-mysql/run} (97%) create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/type create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/up create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/dependencies.d/base rename vscode/rootfs/etc/{cont-init.d/user.sh => s6-overlay/s6-rc.d/init-user/run} (99%) create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/type create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/up create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/code-server create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-code-server create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-mosquitto create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-mysql create mode 100644 vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-user delete mode 100755 vscode/rootfs/etc/services.d/code/finish diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-code-server b/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-code-server new file mode 100644 index 0000000..e69de29 diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-user b/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-user new file mode 100644 index 0000000..e69de29 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 new file mode 100755 index 0000000..fc23311 --- /dev/null +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/finish @@ -0,0 +1,27 @@ +#!/command/with-contenv bashio +# shellcheck shell=bash +# ============================================================================== +# 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 + fi + [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt +elif [[ "${exit_code_service}" -ne 0 ]]; then + if [[ "${exit_code_container}" -eq 0 ]]; then + echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode + fi + exec /run/s6/basedir/bin/halt +fi diff --git a/vscode/rootfs/etc/services.d/code/run b/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run similarity index 91% rename from vscode/rootfs/etc/services.d/code/run rename to vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run index 230d865..dbc0af2 100755 --- a/vscode/rootfs/etc/services.d/code/run +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run @@ -1,12 +1,13 @@ #!/command/with-contenv bashio +# shellcheck shell=bash # ============================================================================== # Home Assistant Community Add-on: Studio Code Server -# Runs the code server +# Runs the code-server # ============================================================================== declare -a options declare config_path -bashio::log.info 'Starting the code server...' +bashio::log.info 'Starting code-server...' config_path="/config" if bashio::config.has_value 'config_path'; then diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/type b/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/type @@ -0,0 +1 @@ +longrun diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/dependencies.d/base b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/dependencies.d/base new file mode 100644 index 0000000..e69de29 diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run similarity index 99% rename from vscode/rootfs/etc/cont-init.d/code-server.sh rename to vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run index 674406a..d49fc52 100755 --- a/vscode/rootfs/etc/cont-init.d/code-server.sh +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run @@ -1,4 +1,5 @@ #!/command/with-contenv bashio +# shellcheck shell=bash # ============================================================================== # Home Assistant Community Add-on: Studio Code Server # Sets up code-server. diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/type b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/type @@ -0,0 +1 @@ +oneshot diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/up b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/up new file mode 100644 index 0000000..3b22ac9 --- /dev/null +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-code-server/run diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/dependencies.d/base b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/dependencies.d/base new file mode 100644 index 0000000..e69de29 diff --git a/vscode/rootfs/etc/cont-init.d/mosquitto.sh b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/run similarity index 97% rename from vscode/rootfs/etc/cont-init.d/mosquitto.sh rename to vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/run index c3aef0e..5148c3e 100755 --- a/vscode/rootfs/etc/cont-init.d/mosquitto.sh +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/run @@ -1,4 +1,5 @@ #!/command/with-contenv bashio +# shellcheck shell=bash # ============================================================================== # Home Assistant Community Add-on: Studio Code Server # Pre-configures the Mosquitto clients, if the service is available diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/type b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/type @@ -0,0 +1 @@ +oneshot diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/up b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/up new file mode 100644 index 0000000..b662c5d --- /dev/null +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mosquitto/run diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/dependencies.d/base b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/dependencies.d/base new file mode 100644 index 0000000..e69de29 diff --git a/vscode/rootfs/etc/cont-init.d/mysql.sh b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/run similarity index 97% rename from vscode/rootfs/etc/cont-init.d/mysql.sh rename to vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/run index 00a323b..0894a8a 100755 --- a/vscode/rootfs/etc/cont-init.d/mysql.sh +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/run @@ -1,4 +1,5 @@ #!/command/with-contenv bashio +# shellcheck shell=bash # ============================================================================== # Home Assistant Community Add-on: Studio Code Server # Pre-configures the MySQL clients, if the service is available diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/type b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/type @@ -0,0 +1 @@ +oneshot diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/up b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/up new file mode 100644 index 0000000..feb7e01 --- /dev/null +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mysql/run diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/dependencies.d/base b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/dependencies.d/base new file mode 100644 index 0000000..e69de29 diff --git a/vscode/rootfs/etc/cont-init.d/user.sh b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run similarity index 99% rename from vscode/rootfs/etc/cont-init.d/user.sh rename to vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run index 5f0b883..f476a2a 100755 --- a/vscode/rootfs/etc/cont-init.d/user.sh +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run @@ -1,4 +1,5 @@ #!/command/with-contenv bashio +# shellcheck shell=bash # ============================================================================== # Home Assistant Community Add-on: Studio Code Server # Persists user settings and installs custom user packages. diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/type b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/type @@ -0,0 +1 @@ +oneshot diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/up b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/up new file mode 100644 index 0000000..b977248 --- /dev/null +++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-user/run diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/code-server b/vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/code-server new file mode 100644 index 0000000..e69de29 diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-code-server b/vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-code-server new file mode 100644 index 0000000..e69de29 diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-mosquitto b/vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-mosquitto new file mode 100644 index 0000000..e69de29 diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-mysql b/vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-mysql new file mode 100644 index 0000000..e69de29 diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-user b/vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-user new file mode 100644 index 0000000..e69de29 diff --git a/vscode/rootfs/etc/services.d/code/finish b/vscode/rootfs/etc/services.d/code/finish deleted file mode 100755 index 147ff6e..0000000 --- a/vscode/rootfs/etc/services.d/code/finish +++ /dev/null @@ -1,11 +0,0 @@ -#!/command/with-contenv bashio -# ============================================================================== -# Home Assistant Community Add-on: Studio Code Server -# Take down the S6 supervision tree when the code server fails -# ============================================================================== -if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then - bashio::log.warning "code-server crashed, halting add-on" - exec /run/s6/basedir/bin/halt -fi - -bashio::log.info "code-server stopped, restarting..." From e60340795f996c317201adb1a738b562976f319e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 14 Dec 2022 10:12:56 +0100 Subject: [PATCH 513/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.31.0=20(#548)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 5571d64..6858896 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#9.9.0 ESPHome.esphome-vscode#2022.11.0 -keesschollaart.vscode-home-assistant#1.30.1 +keesschollaart.vscode-home-assistant#1.31.0 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From 61566be57ea55c169b29c1364c56035477345a9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Dec 2022 10:29:28 +0100 Subject: [PATCH 514/778] Bump esphome from 2022.11.5 to 2022.12.0 (#547) Bumps [esphome](https://github.com/esphome/esphome) from 2022.11.5 to 2022.12.0. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2022.11.5...2022.12.0) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 80667f3..f5d684f 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.11.5 +esphome==2022.12.0 yamllint==1.28.0 From 4657de9411f5d48e63159e13cef18bcc3ddace04 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Wed, 14 Dec 2022 10:41:51 +0100 Subject: [PATCH 515/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20esbenp.?= =?UTF-8?q?prettier-vscode=20to=209.10.3=20(#549)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 6858896..e409d2c 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.16.0 -esbenp.prettier-vscode#9.9.0 +esbenp.prettier-vscode#9.10.3 ESPHome.esphome-vscode#2022.11.0 keesschollaart.vscode-home-assistant#1.31.0 lukas-tr.materialdesignicons-intellisense#4.1.0 From 039d4113bce2ba010a79889c15a3b5e862d62996 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Dec 2022 09:31:09 +0100 Subject: [PATCH 516/778] Bump esphome from 2022.12.0 to 2022.12.1 in /vscode (#552) Bumps [esphome](https://github.com/esphome/esphome) from 2022.12.0 to 2022.12.1. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2022.12.0...2022.12.1) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index f5d684f..15c3e5f 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.12.0 +esphome==2022.12.1 yamllint==1.28.0 From 42c2808ae8cae9ac002aae122ad407089615a285 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 19 Dec 2022 14:05:28 +0100 Subject: [PATCH 517/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20locales?= =?UTF-8?q?=20to=202.31-13+deb11u5=20(#555)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index a30b00b..8a0b7ba 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -30,7 +30,7 @@ RUN \ colordiff=1.0.18-1.1 \ git=1:2.30.2-1 \ iputils-ping=3:20210202-1 \ - locales=2.31-13+deb11u4 \ + locales=2.31-13+deb11u5 \ mariadb-client=1:10.5.15-0+deb11u1 \ mosquitto-clients=2.0.11-1 \ net-tools=1.60+git20181103.0eebece-1 \ From dd9591c661655eb107c3883ed0a4d13dfff20b4a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 19 Dec 2022 14:40:17 +0100 Subject: [PATCH 518/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20mariadb?= =?UTF-8?q?-client=20to=201:10.5.18-0+deb11u1=20(#556)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 8a0b7ba..1338bc3 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -31,7 +31,7 @@ RUN \ git=1:2.30.2-1 \ iputils-ping=3:20210202-1 \ locales=2.31-13+deb11u5 \ - mariadb-client=1:10.5.15-0+deb11u1 \ + 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 \ From 9aed312fd72d20060dcf3a46e9903dba0fd883cd Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 19 Dec 2022 14:59:13 +0100 Subject: [PATCH 519/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=204.9.1=20(#557)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 1338bc3..d4022d6 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -54,7 +54,7 @@ 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.0/code-server-4.9.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v4.9.1/code-server-4.9.1-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 45bb775bed2344aca81027303307b1a5fe5b6bc6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Dec 2022 11:06:47 +0100 Subject: [PATCH 520/778] Bump esphome from 2022.12.1 to 2022.12.2 in /vscode (#558) Bumps [esphome](https://github.com/esphome/esphome) from 2022.12.1 to 2022.12.2. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2022.12.1...2022.12.2) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 15c3e5f..f4f1e75 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.12.1 +esphome==2022.12.2 yamllint==1.28.0 From 024a05edefa1407aae6fcb11bcef70a97f823b44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Dec 2022 08:27:09 +0100 Subject: [PATCH 521/778] Bump esphome to 2022.12.3 (#559) Bumps [esphome](https://github.com/esphome/esphome) from 2022.12.2 to 2022.12.3. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2022.12.2...2022.12.3) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index f4f1e75..94649c7 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.12.2 +esphome==2022.12.3 yamllint==1.28.0 From 211f1604cb789a46ff3346929f0c13e04296aa78 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 29 Dec 2022 14:10:32 +0100 Subject: [PATCH 522/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.32.0=20(#560)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index e409d2c..cbee4f3 100644 --- a/vscode/vscode.extensions +++ b/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.31.0 +keesschollaart.vscode-home-assistant#1.32.0 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From 0f614d835c2133e802c3bfb6e3419bceb1589fc5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Jan 2023 19:51:47 +0100 Subject: [PATCH 523/778] Bump yamllint from 1.28.0 to 1.29.0 in /vscode (#564) Bumps [yamllint](https://github.com/adrienverge/yamllint) from 1.28.0 to 1.29.0. - [Release notes](https://github.com/adrienverge/yamllint/releases) - [Changelog](https://github.com/adrienverge/yamllint/blob/master/CHANGELOG.rst) - [Commits](https://github.com/adrienverge/yamllint/compare/v1.28.0...v1.29.0) --- updated-dependencies: - dependency-name: yamllint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 94649c7..6b32bb0 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ esphome==2022.12.3 -yamllint==1.28.0 +yamllint==1.29.0 From 984e8719b08d2ed988d807c1f5d21dd6e50dfae4 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 22 Jan 2023 18:12:24 +0100 Subject: [PATCH 524/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.33.0=20(#567)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index cbee4f3..5961d9e 100644 --- a/vscode/vscode.extensions +++ b/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 +keesschollaart.vscode-home-assistant#1.33.0 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From 9e6704d793085f9d55e51d5c7ecc74dc47b176bb Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 22 Jan 2023 18:13:04 +0100 Subject: [PATCH 525/778] :fireworks: Updates maintenance/license year to 2023 (#566) --- LICENSE.md | 2 +- README.md | 4 ++-- vscode/.README.j2 | 2 +- vscode/DOCS.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index f538997..95bbdfe 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # MIT License -Copyright (c) 2019-2022 Franck Nijhof +Copyright (c) 2019-2023 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 982ad79..3feedb6 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ our [GitHub Repository][repository]. MIT License -Copyright (c) 2019-2022 Franck Nijhof +Copyright (c) 2019-2023 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/2023.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 90e3e28..dc738ef 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/2022.svg +[maintenance-shield]: https://img.shields.io/maintenance/yes/2023.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 6b58411..052bec7 100644 --- a/vscode/DOCS.md +++ b/vscode/DOCS.md @@ -154,7 +154,7 @@ check [the contributor's page][contributors]. MIT License -Copyright (c) 2019-2022 Franck Nijhof +Copyright (c) 2019-2023 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 From 72b09913e87a0eaa4ffcb9500a3607da420b41e7 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 22 Jan 2023 18:21:57 +0100 Subject: [PATCH 526/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20esbenp.?= =?UTF-8?q?prettier-vscode=20to=209.10.4=20(#568)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 5961d9e..0a3cb09 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.16.0 -esbenp.prettier-vscode#9.10.3 +esbenp.prettier-vscode#9.10.4 ESPHome.esphome-vscode#2022.11.0 keesschollaart.vscode-home-assistant#1.33.0 lukas-tr.materialdesignicons-intellisense#4.1.0 From c9eaf7f8c9f700ae1e7a15d38ba6d296f29e5223 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 08:33:58 +0100 Subject: [PATCH 527/778] Bump esphome from 2022.12.3 to 2022.12.5 in /vscode (#569) Bumps [esphome](https://github.com/esphome/esphome) from 2022.12.3 to 2022.12.5. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2022.12.3...2022.12.5) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 6b32bb0..7de4f46 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.12.3 +esphome==2022.12.5 yamllint==1.29.0 From 7f7b00da518ad885cfef78290f44df530b28cf02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 10:09:38 +0100 Subject: [PATCH 528/778] Bump esphome from 2022.12.5 to 2022.12.7 in /vscode (#571) Bumps [esphome](https://github.com/esphome/esphome) from 2022.12.5 to 2022.12.7. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2022.12.5...2022.12.7) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 7de4f46..94c8e1d 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.12.5 +esphome==2022.12.7 yamllint==1.29.0 From 1185ae57ce442be56da0a19eba36d0a3f04cee8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Jan 2023 11:10:42 +0100 Subject: [PATCH 529/778] Bump esphome from 2022.12.7 to 2022.12.8 in /vscode (#572) Bumps [esphome](https://github.com/esphome/esphome) from 2022.12.7 to 2022.12.8. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2022.12.7...2022.12.8) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 94c8e1d..2398982 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.12.7 +esphome==2022.12.8 yamllint==1.29.0 From 80e648b36a9777e7e1c4283081009dc12008ae90 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 09:41:35 +0100 Subject: [PATCH 530/778] Bump esphome from 2022.12.8 to 2023.2.1 in /vscode (#575) Bumps [esphome](https://github.com/esphome/esphome) from 2022.12.8 to 2023.2.1. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2022.12.8...2023.2.1) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 2398982..e09edab 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2022.12.8 +esphome==2023.2.1 yamllint==1.29.0 From a4752384b90439aede6cab5c34186317300df066 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Feb 2023 16:24:31 +0100 Subject: [PATCH 531/778] Bump esphome from 2023.2.1 to 2023.2.2 in /vscode (#576)Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Bumps [esphome](https://github.com/esphome/esphome) from 2023.2.1 to 2023.2.2. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2023.2.1...2023.2.2) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index e09edab..c162ef2 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.2.1 +esphome==2023.2.2 yamllint==1.29.0 From 0cbdc100d720625607de147e5b16729924a4bcd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 11:28:45 +0100 Subject: [PATCH 532/778] Bump esphome from 2023.2.2 to 2023.2.3 in /vscode (#577)Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Bumps [esphome](https://github.com/esphome/esphome) from 2023.2.2 to 2023.2.3. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2023.2.2...2023.2.3) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index c162ef2..d279a80 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.2.2 +esphome==2023.2.3 yamllint==1.29.0 From fdbf31f4408b24179a98a8b52b4f35a8515a02ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 08:14:15 +0100 Subject: [PATCH 533/778] Bump esphome from 2023.2.3 to 2023.2.4 in /vscode (#578)Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Bumps [esphome](https://github.com/esphome/esphome) from 2023.2.3 to 2023.2.4. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2023.2.3...2023.2.4) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index d279a80..7b77d87 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.2.3 +esphome==2023.2.4 yamllint==1.29.0 From 428b38c68db87b3998b121602a3de1a9c33bba45 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 5 Mar 2023 15:38:47 +0100 Subject: [PATCH 534/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on?= =?UTF-8?q?=20base=20image=20to=206.2.3=20(#581)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 4 ++-- vscode/build.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index d4022d6..7b9eddc 100755 --- a/vscode/Dockerfile +++ b/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:6.2.3 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -36,7 +36,7 @@ RUN \ 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 \ + openssl=1.1.1n-0+deb11u4 \ python3-dev=3.9.2-3 \ python3=3.9.2-3 \ unzip=6.0-26+deb11u1 \ diff --git a/vscode/build.yaml b/vscode/build.yaml index 73f6c5b..feff762 100644 --- a/vscode/build.yaml +++ b/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:6.2.3 + amd64: ghcr.io/hassio-addons/debian-base:6.2.3 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 412f92627b249bbc4e599bff7c2db6b10eb20e1e Mon Sep 17 00:00:00 2001 From: Felipe Santos Date: Sun, 5 Mar 2023 11:40:46 -0300 Subject: [PATCH 535/778] Use shim instead of symlink for code CLI (#580) --- vscode/Dockerfile | 1 - vscode/rootfs/usr/local/bin/code | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100755 vscode/rootfs/usr/local/bin/code diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 7b9eddc..728b46a 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -61,7 +61,6 @@ RUN \ --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) \ diff --git a/vscode/rootfs/usr/local/bin/code b/vscode/rootfs/usr/local/bin/code new file mode 100755 index 0000000..ea03034 --- /dev/null +++ b/vscode/rootfs/usr/local/bin/code @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/local/lib/code-server/bin/code-server "${@}" From 060e80db084e6481b569c28f920021671de0dd2c Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 5 Mar 2023 19:29:33 +0100 Subject: [PATCH 536/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=204.10.1=20(#582)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 728b46a..e2fbb16 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -54,7 +54,7 @@ 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/cdr/code-server/releases/download/v4.10.1/code-server-4.10.1-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 83cb896b919d618890167d4414112abebcde4fb3 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 5 Mar 2023 19:58:28 +0100 Subject: [PATCH 537/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20keessch?= =?UTF-8?q?ollaart.vscode-home-assistant=20to=201.34.0=20(#583)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 0a3cb09..47d4819 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#9.10.4 ESPHome.esphome-vscode#2022.11.0 -keesschollaart.vscode-home-assistant#1.33.0 +keesschollaart.vscode-home-assistant#1.34.0 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From 7720390a379ae4797132138ea5ab4152d3efcaec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 08:18:42 +0100 Subject: [PATCH 538/778] Bump esphome from 2023.2.4 to 2023.3.0 in /vscode (#587) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 7b77d87..3364298 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.2.4 +esphome==2023.3.0 yamllint==1.29.0 From 887eebe749408ea42f65418e9675d4f046092572 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 17 Mar 2023 10:11:18 +0100 Subject: [PATCH 539/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20code-se?= =?UTF-8?q?rver=20to=204.11.0=20(#588)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index e2fbb16..34e70ee 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -54,7 +54,7 @@ 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.10.1/code-server-4.10.1-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/code-server/releases/download/v4.11.0/code-server-4.11.0-linux-${ARCH}.tar.gz" \ && mkdir -p /usr/local/lib/code-server \ && tar zxvf \ /tmp/code.tar.gz \ From 990bd64529eeab033a560f9fb92d173d3af8330c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Mar 2023 10:43:10 +0100 Subject: [PATCH 540/778] Bump esphome to 2023.3.1 (#590) Bumps [esphome](https://github.com/esphome/esphome) from 2023.3.0 to 2023.3.1. - [Release notes](https://github.com/esphome/esphome/releases) - [Commits](https://github.com/esphome/esphome/compare/2023.3.0...2023.3.1) --- updated-dependencies: - dependency-name: esphome dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 3364298..8e38280 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.3.0 +esphome==2023.3.1 yamllint==1.29.0 From 0e49d1ea50468fc359894177803e1f4697ee52aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Mar 2023 10:08:32 +0100 Subject: [PATCH 541/778] Bump yamllint to 1.30.0 (#591) Bumps [yamllint](https://github.com/adrienverge/yamllint) from 1.29.0 to 1.30.0. - [Release notes](https://github.com/adrienverge/yamllint/releases) - [Changelog](https://github.com/adrienverge/yamllint/blob/master/CHANGELOG.rst) - [Commits](https://github.com/adrienverge/yamllint/compare/v1.29.0...v1.30.0) --- updated-dependencies: - dependency-name: yamllint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 8e38280..623e4ae 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ esphome==2023.3.1 -yamllint==1.29.0 +yamllint==1.30.0 From 17de42d37dc6c35ae2252948e2cade93d5dba999 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 25 Mar 2023 11:08:59 +0100 Subject: [PATCH 542/778] Add Renovate for dependency management (#593) --- .github/dependabot.yaml | 13 ---- .github/renovate.json | 134 ++++++++++++++++++++++++++++++++++++++++ vscode/Dockerfile | 6 +- 3 files changed, 138 insertions(+), 15 deletions(-) delete mode 100644 .github/dependabot.yaml create mode 100644 .github/renovate.json diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml deleted file mode 100644 index 5e06efb..0000000 --- a/.github/dependabot.yaml +++ /dev/null @@ -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" diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 0000000..20c2aca --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,134 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "rebaseWhen": "behind-base-branch", + "dependencyDashboard": true, + "labels": ["dependencies", "no-stale"], + "commitMessagePrefix": "⬆️", + "commitMessageTopic": "{{depName}}", + "regexManagers": [ + { + "fileMatch": ["/Dockerfile$", "/build.yaml$"], + "matchStringsStrategy": "any", + "matchStrings": [ + "ARG BUILD_FROM=(?.*?):(?.*?)\\s+", + "(aarch64|amd64|armhf|armv7|i386):\\s[\"']?(?.*?):(?.*?)[\"']?\\s" + ], + "datasourceTemplate": "docker" + }, + { + "fileMatch": ["/Dockerfile$"], + "matchStringsStrategy": "any", + "matchStrings": [ + "\\s\\s(?[a-z0-9][a-z0-9-]+)=(?[a-z0-9-:_+~.]+)\\s+" + ], + "versioningTemplate": "deb", + "datasourceTemplate": "repology", + "depNameTemplate": "debian_11/{{package}}" + }, + { + "fileMatch": ["/Dockerfile$"], + "matchStrings": [ + "ARG CODE_SERVER_VERSION=[\"']?(?.+?)[\"']?\\s+" + ], + "datasourceTemplate": "github-releases", + "depNameTemplate": "cdr/code-server" + }, + { + "fileMatch": ["/Dockerfile$"], + "matchStrings": [ + "ARG HA_CLI_VERSION=[\"']?(?.+?)[\"']?\\s+" + ], + "datasourceTemplate": "github-releases", + "depNameTemplate": "home-assistant/cli", + "versioningTemplate": "loose" + }, + { + "fileMatch": ["vscode/vscode.extensions$"], + "matchStrings": ["emilast\\.LogFileHighlighter#(?.+)\\s"], + "datasourceTemplate": "github-releases", + "depNameTemplate": "emilast/vscode-logfile-highlighter" + }, + { + "fileMatch": ["vscode/vscode.extensions$"], + "matchStrings": ["esbenp\\.prettier-vscode#(?.+)\\s"], + "datasourceTemplate": "github-releases", + "depNameTemplate": "prettier/prettier-vscode" + }, + { + "fileMatch": ["vscode/vscode.extensions$"], + "matchStrings": ["ESPHome\\.esphome-vscode#(?.+)\\s"], + "datasourceTemplate": "github-releases", + "depNameTemplate": "esphome/esphome-vscode", + "versioningTemplate": "loose" + }, + { + "fileMatch": ["vscode/vscode.extensions$"], + "matchStrings": [ + "keesschollaart\\.vscode-home-assistant#(?.+)\\s" + ], + "datasourceTemplate": "github-releases", + "depNameTemplate": "keesschollaart81/vscode-home-assistant" + }, + { + "fileMatch": ["vscode/vscode.extensions$"], + "matchStrings": [ + "lukas-tr\\.materialdesignicons-intellisense#(?.+)\\s" + ], + "datasourceTemplate": "github-releases", + "depNameTemplate": "lukas-tr/vscode-materialdesignicons-intellisense" + }, + { + "fileMatch": ["vscode/vscode.extensions$"], + "matchStrings": ["netcorext\\.uuid-generator#(?.+)\\s"], + "datasourceTemplate": "github-releases", + "depNameTemplate": "arenchen/vscode-uuid-generator" + }, + { + "fileMatch": ["vscode/vscode.extensions$"], + "matchStrings": ["usernamehw\\.errorlens#(?.+)\\s"], + "datasourceTemplate": "github-releases", + "depNameTemplate": "usernamehw/vscode-error-lens" + } + ], + "packageRules": [ + { + "matchDatasources": ["repology"], + "automerge": true + }, + { + "groupName": "Add-on base image", + "matchDatasources": ["docker"] + }, + { + "groupName": "Add-on base image", + "matchDatasources": ["docker"], + "matchUpdateTypes": ["patch"], + "automerge": true + }, + { + "matchDatasources": ["github-releases"], + "matchDepNames": ["cdr/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 + } + ] +} diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 34e70ee..6ea8de3 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -19,6 +19,8 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 +ARG CODE_SERVER_VERSION="v4.11.0" +ARG HA_CLI_VERSION="4.23.0" # hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ @@ -54,7 +56,7 @@ 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.11.0/code-server-4.11.0-linux-${ARCH}.tar.gz" \ + "https://github.com/cdr/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 \ @@ -86,7 +88,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 \ From 4dd95a5aef73de31279d4295f2dd0b60c631f03f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 25 Mar 2023 11:21:34 +0100 Subject: [PATCH 543/778] Renovate: Match some more packages --- .github/renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index 20c2aca..b58b6a6 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -23,7 +23,7 @@ ], "versioningTemplate": "deb", "datasourceTemplate": "repology", - "depNameTemplate": "debian_11/{{package}}" + "depNameTemplate": "debian_11/{{{ replace 'locale' 'glibc' {{{replace 'uuid-runtime' 'util-linux' {{{replace 'openssh-client' 'openssh' package}}} }}} }}}" }, { "fileMatch": ["/Dockerfile$"], From 66b1ca3d59fa0794237029c3aa1c62dae868bde2 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 25 Mar 2023 11:28:01 +0100 Subject: [PATCH 544/778] Renovate: Match some more packages --- .github/renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index b58b6a6..3c775b4 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -23,7 +23,7 @@ ], "versioningTemplate": "deb", "datasourceTemplate": "repology", - "depNameTemplate": "debian_11/{{{ replace 'locale' 'glibc' {{{replace 'uuid-runtime' 'util-linux' {{{replace 'openssh-client' 'openssh' package}}} }}} }}}" + "depNameTemplate": "debian_11/{{{replace 'openssh-client' 'openssh' package}}}" }, { "fileMatch": ["/Dockerfile$"], From e7c899debd96735b0f34f0f2883ba5d6cf578c30 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 25 Mar 2023 11:37:01 +0100 Subject: [PATCH 545/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?11/git=20to=20v1:2.30.2-1+deb11u2=20(#594)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 6ea8de3..d07c683 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -30,7 +30,7 @@ RUN \ libarchive-tools=3.4.3-2+deb11u1 \ build-essential=12.9 \ colordiff=1.0.18-1.1 \ - git=1:2.30.2-1 \ + git=1:2.30.2-1+deb11u2 \ iputils-ping=3:20210202-1 \ locales=2.31-13+deb11u5 \ mariadb-client=1:10.5.18-0+deb11u1 \ From 7ddeef4f9054d86b3c99eec59fff45a4e0a11aca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 25 Mar 2023 11:58:24 +0100 Subject: [PATCH 546/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v6.2.4=20(#595)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index d07c683..347b75b 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.2.3 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.2.4 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index feff762..2180ebd 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:6.2.3 - amd64: ghcr.io/hassio-addons/debian-base:6.2.3 + aarch64: ghcr.io/hassio-addons/debian-base:6.2.4 + amd64: ghcr.io/hassio-addons/debian-base:6.2.4 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 48dda41e2caafac6665c196d50dd90815e4f976a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 Mar 2023 09:41:34 +0200 Subject: [PATCH 547/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.3.2=20(#600)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 623e4ae..f56b458 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.3.1 +esphome==2023.3.2 yamllint==1.30.0 From 2ac7cc9d4093f7f8e6963669107c87e05d4080d6 Mon Sep 17 00:00:00 2001 From: Sven Serlier <85389871+wrt54g@users.noreply.github.com> Date: Tue, 28 Mar 2023 16:51:40 +0200 Subject: [PATCH 548/778] Update URLs in documentation (#602) --- vscode/DOCS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vscode/DOCS.md b/vscode/DOCS.md index 052bec7..93e13f2 100644 --- a/vscode/DOCS.md +++ b/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. @@ -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 From bb730cbc76821e21ed111d80d335b6fae11dfb14 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 31 Mar 2023 10:55:26 +0200 Subject: [PATCH 549/778] :hammer: Adjust upstream code-server org name (#603) --- .github/renovate.json | 4 ++-- vscode/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 3c775b4..517b066 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -102,12 +102,12 @@ { "groupName": "Add-on base image", "matchDatasources": ["docker"], - "matchUpdateTypes": ["patch"], + "matchUpdateTypes": ["minor", "patch"], "automerge": true }, { "matchDatasources": ["github-releases"], - "matchDepNames": ["cdr/code-server"], + "matchDepNames": ["coder/code-server"], "matchUpdateTypes": ["minor", "patch"], "automerge": true }, diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 347b75b..d9d6d80 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -56,7 +56,7 @@ 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/${CODE_SERVER_VERSION}/code-server-${CODE_SERVER_VERSION#v}-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 \ From e3b84ab004a61bc709e2d1598a57a5bb8a5e0649 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 Mar 2023 11:59:57 +0200 Subject: [PATCH 550/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v6.2.5=20(#604)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index d9d6d80..8d72fee 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.2.4 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.2.5 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index 2180ebd..c07195b 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:6.2.4 - amd64: ghcr.io/hassio-addons/debian-base:6.2.4 + aarch64: ghcr.io/hassio-addons/debian-base:6.2.5 + amd64: ghcr.io/hassio-addons/debian-base:6.2.5 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 8bc451c50b0e2197d3f082cd821d4400d08edde9 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 31 Mar 2023 13:15:52 +0200 Subject: [PATCH 551/778] Renovate: Extract versions from extension versions --- .github/renovate.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 517b066..a8dedc2 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -52,7 +52,8 @@ "fileMatch": ["vscode/vscode.extensions$"], "matchStrings": ["esbenp\\.prettier-vscode#(?.+)\\s"], "datasourceTemplate": "github-releases", - "depNameTemplate": "prettier/prettier-vscode" + "depNameTemplate": "prettier/prettier-vscode", + "extractVersionTemplate": "^v(?.*)$" }, { "fileMatch": ["vscode/vscode.extensions$"], @@ -67,7 +68,8 @@ "keesschollaart\\.vscode-home-assistant#(?.+)\\s" ], "datasourceTemplate": "github-releases", - "depNameTemplate": "keesschollaart81/vscode-home-assistant" + "depNameTemplate": "keesschollaart81/vscode-home-assistant", + "extractVersionTemplate": "^v(?.*)$" }, { "fileMatch": ["vscode/vscode.extensions$"], @@ -75,7 +77,8 @@ "lukas-tr\\.materialdesignicons-intellisense#(?.+)\\s" ], "datasourceTemplate": "github-releases", - "depNameTemplate": "lukas-tr/vscode-materialdesignicons-intellisense" + "depNameTemplate": "lukas-tr/vscode-materialdesignicons-intellisense", + "extractVersionTemplate": "^v(?.*)$" }, { "fileMatch": ["vscode/vscode.extensions$"], @@ -87,7 +90,8 @@ "fileMatch": ["vscode/vscode.extensions$"], "matchStrings": ["usernamehw\\.errorlens#(?.+)\\s"], "datasourceTemplate": "github-releases", - "depNameTemplate": "usernamehw/vscode-error-lens" + "depNameTemplate": "usernamehw/vscode-error-lens", + "extractVersionTemplate": "^v(?.*)$" } ], "packageRules": [ From 860ff7ef6c3eb4c3d32ac69514a34471a532f8d2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 Mar 2023 13:34:25 +0200 Subject: [PATCH 552/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20keesschol?= =?UTF-8?q?laart81/vscode-home-assistant=20to=20v1.35.0=20(#605)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 47d4819..ef035e6 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#9.10.4 ESPHome.esphome-vscode#2022.11.0 -keesschollaart.vscode-home-assistant#1.34.0 +keesschollaart.vscode-home-assistant#1.35.0 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From b133031aaad909f0e558469c8f00a0494570f52e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Apr 2023 13:47:18 +0200 Subject: [PATCH 553/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20keesschol?= =?UTF-8?q?laart81/vscode-home-assistant=20to=20v1.35.1=20(#606)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index ef035e6..4cd8126 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#9.10.4 ESPHome.esphome-vscode#2022.11.0 -keesschollaart.vscode-home-assistant#1.35.0 +keesschollaart.vscode-home-assistant#1.35.1 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From 42ac1cd61b180f191eb0a4adc7c27c84bf124d8e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Apr 2023 10:54:03 +0200 Subject: [PATCH 554/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.4.0=20(#608)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index f56b458..5ca08cc 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.3.2 +esphome==2023.4.0 yamllint==1.30.0 From 00322444ee570a6adaf21c2ad5b65d6cf0819740 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 11:36:54 +0200 Subject: [PATCH 555/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20prettier/?= =?UTF-8?q?prettier-vscode=20to=20v9.12.0=20(#609)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 4cd8126..903fd44 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.16.0 -esbenp.prettier-vscode#9.10.4 +esbenp.prettier-vscode#9.12.0 ESPHome.esphome-vscode#2022.11.0 keesschollaart.vscode-home-assistant#1.35.1 lukas-tr.materialdesignicons-intellisense#4.1.0 From fa0d602a2e60814d6ba6a4f02984c169ce0ae1ca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Apr 2023 12:21:26 +0200 Subject: [PATCH 556/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.12.0=20(#612)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 8d72fee..873fd09 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -19,7 +19,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.11.0" +ARG CODE_SERVER_VERSION="v4.12.0" ARG HA_CLI_VERSION="4.23.0" # hadolint ignore=SC2181, DL3008 RUN \ From 88b33d510cd43d2e625b57e056922fc563a129af Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Apr 2023 12:56:59 +0200 Subject: [PATCH 557/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20yamllint?= =?UTF-8?q?=20to=20v1.31.0=20(#613)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 5ca08cc..77ecdaa 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ esphome==2023.4.0 -yamllint==1.30.0 +yamllint==1.31.0 From 66681f308b50716716be937d05789bd08a50b8c2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 07:26:10 +0200 Subject: [PATCH 558/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.4.1=20(#617)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 77ecdaa..9c3deac 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.4.0 +esphome==2023.4.1 yamllint==1.31.0 From 4ec52d41b19e1655264ec47c7e29f53ce2cbaf1e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 17:08:56 +0200 Subject: [PATCH 559/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.4.2=20(#626)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 9c3deac..48031fa 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.4.1 +esphome==2023.4.2 yamllint==1.31.0 From 45a8f5146b99e8b97ad892df545cabd73ae7e51f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 29 Apr 2023 18:31:13 +0200 Subject: [PATCH 560/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?11/mariadb-client=20to=20v1:10.5.19-0+deb11u2=20(#627)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 873fd09..c748b1c 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -33,7 +33,7 @@ RUN \ git=1:2.30.2-1+deb11u2 \ iputils-ping=3:20210202-1 \ locales=2.31-13+deb11u5 \ - mariadb-client=1:10.5.18-0+deb11u1 \ + mariadb-client=1:10.5.19-0+deb11u2 \ mosquitto-clients=2.0.11-1 \ net-tools=1.60+git20181103.0eebece-1 \ nmap=7.91+dfsg1+really7.80+dfsg1-2 \ From 7e9cc2dbdb3ca092a742df4d2728361fbfc1c68e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 May 2023 08:43:56 +0200 Subject: [PATCH 561/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.4.3=20(#629)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 48031fa..3feaeca 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.4.2 +esphome==2023.4.3 yamllint==1.31.0 From 716e8028b7c2437c4a35c0ddf2bac851102b4627 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 May 2023 07:30:51 +0200 Subject: [PATCH 562/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20home-assi?= =?UTF-8?q?stant/cli=20to=20v4.24.1=20(#628)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index c748b1c..2c1dc1c 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 ARG CODE_SERVER_VERSION="v4.12.0" -ARG HA_CLI_VERSION="4.23.0" +ARG HA_CLI_VERSION="4.24.1" # hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ From f9d28c6dfea80bd8dcfd5deda56da765a8c8d09f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 10:06:52 +0200 Subject: [PATCH 563/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.4.4=20(#631)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 3feaeca..a9b2065 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.4.3 +esphome==2023.4.4 yamllint==1.31.0 From 00274a95c75d7cc1a8ae53587ad7dd7ce93cedd1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 17:11:10 +0200 Subject: [PATCH 564/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v6.2.6=20(#632)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 2c1dc1c..7dbcfb2 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.2.5 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.2.6 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index c07195b..586d569 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:6.2.5 - amd64: ghcr.io/hassio-addons/debian-base:6.2.5 + aarch64: ghcr.io/hassio-addons/debian-base:6.2.6 + amd64: ghcr.io/hassio-addons/debian-base:6.2.6 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From a91659879901fc9e18a69acf9ed5c6860cf571d2 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 7 May 2023 13:13:49 +0200 Subject: [PATCH 565/778] Renovate: Handle ESPHome vscode ext versioning --- .github/renovate.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index a8dedc2..d59de2b 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -60,7 +60,8 @@ "matchStrings": ["ESPHome\\.esphome-vscode#(?.+)\\s"], "datasourceTemplate": "github-releases", "depNameTemplate": "esphome/esphome-vscode", - "versioningTemplate": "loose" + "versioningTemplate": "loose", + "extractVersionTemplate": "^v(?.*)$" }, { "fileMatch": ["vscode/vscode.extensions$"], From 271ce57658e368ecf5fb03221304d34cfac683db Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 7 May 2023 13:36:22 +0200 Subject: [PATCH 566/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome/e?= =?UTF-8?q?sphome-vscode=20to=20v2023=20(#634)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 903fd44..d1d5086 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#9.12.0 -ESPHome.esphome-vscode#2022.11.0 +ESPHome.esphome-vscode#2023.4.1 keesschollaart.vscode-home-assistant#1.35.1 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 From 3e5525abccb246c033d9030ff51f89a8aa935410 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 May 2023 21:37:05 +0200 Subject: [PATCH 567/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v6.2.7=20(#639)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 7dbcfb2..ce18b85 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.2.6 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.2.7 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index 586d569..e1a7f5c 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:6.2.6 - amd64: ghcr.io/hassio-addons/debian-base:6.2.6 + aarch64: ghcr.io/hassio-addons/debian-base:6.2.7 + amd64: ghcr.io/hassio-addons/debian-base:6.2.7 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 6c9f0bb37b6de8bbf8cd5017de05cdf1b628c58d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 May 2023 10:39:19 +0200 Subject: [PATCH 568/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.5.0=20(#640)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index a9b2065..89979de 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.4.4 +esphome==2023.5.0 yamllint==1.31.0 From e7006ddaaae985d799edeecc6e7c34db2c2051ed Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 May 2023 12:41:04 +0200 Subject: [PATCH 569/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.5.1=20(#641)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 89979de..9ee436c 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.5.0 +esphome==2023.5.1 yamllint==1.31.0 From 06d729e7206e350e2800233021accb9f36cb3c16 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 May 2023 12:52:27 +0200 Subject: [PATCH 570/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.13.0=20(#643)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ce18b85..c1493d4 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -19,7 +19,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.12.0" +ARG CODE_SERVER_VERSION="v4.13.0" ARG HA_CLI_VERSION="4.24.1" # hadolint ignore=SC2181, DL3008 RUN \ From c638b7e11846eaf5170e7dde98a7c0e2725c821e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 May 2023 13:20:47 +0200 Subject: [PATCH 571/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20keesschol?= =?UTF-8?q?laart81/vscode-home-assistant=20to=20v1.36.0=20(#645)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index d1d5086..b11eaea 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#9.12.0 ESPHome.esphome-vscode#2023.4.1 -keesschollaart.vscode-home-assistant#1.35.1 +keesschollaart.vscode-home-assistant#1.36.0 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From 2c80cc4072d00737ccb28a31c9b5af33d5c5a720 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 May 2023 16:49:46 +0200 Subject: [PATCH 572/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20home-assi?= =?UTF-8?q?stant/cli=20to=20v4.25.0=20(#646)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index c1493d4..b1fd948 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 ARG CODE_SERVER_VERSION="v4.13.0" -ARG HA_CLI_VERSION="4.24.1" +ARG HA_CLI_VERSION="4.25.0" # hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ From 0d64206b7da4f3967d2318761dc86a89e83d9c69 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 May 2023 09:54:05 +0200 Subject: [PATCH 573/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.5.2=20(#647)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 9ee436c..56a58a8 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.5.1 +esphome==2023.5.2 yamllint==1.31.0 From 54c5c55412444057fae5f44632148e667f3e4b54 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 May 2023 18:41:12 +0200 Subject: [PATCH 574/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20yamllint?= =?UTF-8?q?=20to=20v1.32.0=20(#648)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 56a58a8..d87023e 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ esphome==2023.5.2 -yamllint==1.31.0 +yamllint==1.32.0 From cd092ecfafa363ede5ae14d17d2a893dde2193bf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 May 2023 10:03:41 +0200 Subject: [PATCH 575/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.5.3=20(#649)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index d87023e..5f15933 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.5.2 +esphome==2023.5.3 yamllint==1.32.0 From 85c305af86bd66a028ef5eed6c9d43ea3269c009 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 May 2023 18:14:46 +0200 Subject: [PATCH 576/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20prettier/?= =?UTF-8?q?prettier-vscode=20to=20v9.13.0=20(#650)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index b11eaea..096e5a4 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.16.0 -esbenp.prettier-vscode#9.12.0 +esbenp.prettier-vscode#9.13.0 ESPHome.esphome-vscode#2023.4.1 keesschollaart.vscode-home-assistant#1.36.0 lukas-tr.materialdesignicons-intellisense#4.1.0 From 4e654b8322acee1ec5c8c8aa3abccb0a411a1279 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 May 2023 07:13:06 +0200 Subject: [PATCH 577/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.5.4=20(#651)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 5f15933..9ee93f3 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.5.3 +esphome==2023.5.4 yamllint==1.32.0 From cd11532f22e8decf7d9592082206f09c285404ea Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 29 May 2023 16:11:49 +0200 Subject: [PATCH 578/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20home-assi?= =?UTF-8?q?stant/cli=20to=20v4.26.0=20(#653)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index b1fd948..d9c1f77 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 ARG CODE_SERVER_VERSION="v4.13.0" -ARG HA_CLI_VERSION="4.25.0" +ARG HA_CLI_VERSION="4.26.0" # hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ From 9571f065114835732de636c5fc5f058bd43de734 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 29 May 2023 17:48:35 +0200 Subject: [PATCH 579/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.5.5=20(#652)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 9ee93f3..0ae79aa 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.5.4 +esphome==2023.5.5 yamllint==1.32.0 From 862d561cb5c78f920b3b3c8c73d96640f1391f46 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 31 May 2023 20:38:40 +0200 Subject: [PATCH 580/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?11/openssl=20to=20v1.1.1n-0+deb11u5=20(#654)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index d9c1f77..93dd06f 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -38,7 +38,7 @@ RUN \ 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+deb11u4 \ + openssl=1.1.1n-0+deb11u5 \ python3-dev=3.9.2-3 \ python3=3.9.2-3 \ unzip=6.0-26+deb11u1 \ From 076375bff49ab385ccb1cd38a60ed950dbc6d461 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Jun 2023 08:31:35 +0200 Subject: [PATCH 581/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7=20(#655)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Franck Nijhof --- .github/renovate.json | 2 +- vscode/Dockerfile | 47 ++++++++++++++++++++++--------------------- vscode/build.yaml | 4 ++-- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index d59de2b..46fb1d7 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -23,7 +23,7 @@ ], "versioningTemplate": "deb", "datasourceTemplate": "repology", - "depNameTemplate": "debian_11/{{{replace 'openssh-client' 'openssh' package}}}" + "depNameTemplate": "debian_12/{{{replace 'openssh-client' 'openssh' package}}}" }, { "fileMatch": ["/Dockerfile$"], diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 93dd06f..2d87011 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.2.7 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.0.0 # 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"] @@ -26,27 +27,27 @@ 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 \ build-essential=12.9 \ - colordiff=1.0.18-1.1 \ - git=1:2.30.2-1+deb11u2 \ - iputils-ping=3:20210202-1 \ - locales=2.31-13+deb11u5 \ - mariadb-client=1:10.5.19-0+deb11u2 \ - 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+deb11u5 \ - 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.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 \ + net-tools=2.10-0.1 \ + nmap=7.93+dfsg1-1 \ + openssh-client=1:9.2p1-2 \ + openssl=3.0.9-1 \ + python3-dev=3.11.2-1+b1 \ + python3=3.11.2-1+b1 \ + unzip=6.0-28 \ + uuid-runtime=2.38.1-5+b1 \ + wget>=1.21.3-1+b2 \ + zip=3.0-13 \ + zsh=5.9-4+b2 \ + less=590-2 \ \ && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \ && locale-gen \ @@ -109,8 +110,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 \ \ diff --git a/vscode/build.yaml b/vscode/build.yaml index e1a7f5c..02ed244 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:6.2.7 - amd64: ghcr.io/hassio-addons/debian-base:6.2.7 + aarch64: ghcr.io/hassio-addons/debian-base:7.0.0 + amd64: ghcr.io/hassio-addons/debian-base:7.0.0 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From a872a3076fba51b56a481a659781cfdb8b90d32e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 18 Jun 2023 18:09:53 +0200 Subject: [PATCH 582/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.14.0=20(#657)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 2d87011..2ad6f46 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.13.0" +ARG CODE_SERVER_VERSION="v4.14.0" ARG HA_CLI_VERSION="4.26.0" # hadolint ignore=SC2181, DL3008 RUN \ From 33bc0c0bc9988cce0e508e4cc3b645fa998afd85 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 20 Jun 2023 08:34:57 +0200 Subject: [PATCH 583/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20prettier/?= =?UTF-8?q?prettier-vscode=20to=20v9.14.0=20(#658)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 096e5a4..00ce3fc 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.16.0 -esbenp.prettier-vscode#9.13.0 +esbenp.prettier-vscode#9.14.0 ESPHome.esphome-vscode#2023.4.1 keesschollaart.vscode-home-assistant#1.36.0 lukas-tr.materialdesignicons-intellisense#4.1.0 From 9760469c3afb91939e2eb70a8a284f4c75dab81c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 20 Jun 2023 21:15:34 +0200 Subject: [PATCH 584/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20prettier/?= =?UTF-8?q?prettier-vscode=20to=20v9.15.0=20(#659)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 00ce3fc..5ddb42d 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.16.0 -esbenp.prettier-vscode#9.14.0 +esbenp.prettier-vscode#9.15.0 ESPHome.esphome-vscode#2023.4.1 keesschollaart.vscode-home-assistant#1.36.0 lukas-tr.materialdesignicons-intellisense#4.1.0 From eefb1b2c34a7495ccb0a1a7f1117d26ac42bf70e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 22 Jun 2023 10:57:41 +0200 Subject: [PATCH 585/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.6.0=20(#660)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 0ae79aa..918aef1 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.5.5 +esphome==2023.6.0 yamllint==1.32.0 From f5a1ab171328eb5432c80c7f08cc3efeb7f5658b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 22 Jun 2023 15:58:25 +0200 Subject: [PATCH 586/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20prettier/?= =?UTF-8?q?prettier-vscode=20to=20v9.16.0=20(#661)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 5ddb42d..a2d51ab 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.16.0 -esbenp.prettier-vscode#9.15.0 +esbenp.prettier-vscode#9.16.0 ESPHome.esphome-vscode#2023.4.1 keesschollaart.vscode-home-assistant#1.36.0 lukas-tr.materialdesignicons-intellisense#4.1.0 From 57ac8fbf1591cf2663de3c3ea54beefc65e5451b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 23 Jun 2023 14:25:38 +0200 Subject: [PATCH 587/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.6.2=20(#662)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 918aef1..baf3980 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.6.0 +esphome==2023.6.2 yamllint==1.32.0 From 0ec00c1d7195044504bf4ddd13b860af08262e84 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 15:57:01 +0200 Subject: [PATCH 588/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome/e?= =?UTF-8?q?sphome-vscode=20to=20v2023.6.0=20(#663)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index a2d51ab..a56b6dd 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#9.16.0 -ESPHome.esphome-vscode#2023.4.1 +ESPHome.esphome-vscode#2023.6.0 keesschollaart.vscode-home-assistant#1.36.0 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 From 950cbcea8a56c0b82b20f9a31bde55ee9dd5d476 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 22:00:29 +0200 Subject: [PATCH 589/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.14.1=20(#664)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 2ad6f46..a7821f6 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.14.0" +ARG CODE_SERVER_VERSION="v4.14.1" ARG HA_CLI_VERSION="4.26.0" # hadolint ignore=SC2181, DL3008 RUN \ From 9aea4acbe13637dbf8d96984d31f54d2555d66ae Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 26 Jun 2023 22:29:42 +0200 Subject: [PATCH 590/778] Add healthcheck (#665) --- vscode/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index a7821f6..408d20c 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -129,6 +129,12 @@ RUN \ # Copy root filesystem COPY rootfs / +# Health check +HEALTHCHECK \ + CMD curl --fail http://127.0.0.1:1337/healthz \ + | jq --exit-status '.status == "alive"' \ + || exit 1 + # Build arguments ARG BUILD_ARCH ARG BUILD_DATE From 713ad8c2f9b1950d639aa8e2948250749f2e6a01 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Jul 2023 11:18:45 +0200 Subject: [PATCH 591/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20prettier/?= =?UTF-8?q?prettier-vscode=20to=20v9.19.0=20(#670)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index a56b6dd..591650a 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.16.0 -esbenp.prettier-vscode#9.16.0 +esbenp.prettier-vscode#9.19.0 ESPHome.esphome-vscode#2023.6.0 keesschollaart.vscode-home-assistant#1.36.0 lukas-tr.materialdesignicons-intellisense#4.1.0 From 926e4672b496a972f4bcee96be9954d8d986a534 Mon Sep 17 00:00:00 2001 From: Paul Sinclair <24625998+sinclairpaul@users.noreply.github.com> Date: Mon, 3 Jul 2023 05:55:37 -0400 Subject: [PATCH 592/778] =?UTF-8?q?=F0=9F=9A=91=20Update=20healthcheck=20c?= =?UTF-8?q?ommand=20(#669)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 408d20c..6339919 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -131,9 +131,7 @@ COPY rootfs / # Health check HEALTHCHECK \ - CMD curl --fail http://127.0.0.1:1337/healthz \ - | jq --exit-status '.status == "alive"' \ - || exit 1 + CMD curl --fail http://127.0.0.1:1337/healthz || exit 1 # Build arguments ARG BUILD_ARCH From 58076825408d10a9ad211bf3695c4dc8dcb6d2e4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Jul 2023 14:11:29 +0200 Subject: [PATCH 593/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.6.3=20(#668)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index baf3980..882fe49 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.6.2 +esphome==2023.6.3 yamllint==1.32.0 From 9bb165dc627dcaa99abbf4fbb9859671518d1558 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 08:26:51 +0200 Subject: [PATCH 594/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.6.4=20(#674)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 882fe49..72402d5 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.6.3 +esphome==2023.6.4 yamllint==1.32.0 From 024b10f48d76570d935b11bf926dc8d054b982d3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 08:44:11 +0200 Subject: [PATCH 595/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20home-assi?= =?UTF-8?q?stant/cli=20to=20v4.27.0=20(#675)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 6339919..ce746dc 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -21,7 +21,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 ARG CODE_SERVER_VERSION="v4.14.1" -ARG HA_CLI_VERSION="4.26.0" +ARG HA_CLI_VERSION="4.27.0" # hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ From 3180767c35ac24a7198850880f06bed0d57951a7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 10:03:05 +0200 Subject: [PATCH 596/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.6.5=20(#676)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 72402d5..9961eee 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.6.4 +esphome==2023.6.5 yamllint==1.32.0 From 84ceec71414f1b5b68e80c67417fd5323bee44bc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Jul 2023 08:24:45 +0200 Subject: [PATCH 597/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.7.0=20(#678)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 9961eee..dd12604 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.6.5 +esphome==2023.7.0 yamllint==1.32.0 From d26c55a67d044ceaa7e89aef8c9529b09b29090f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Jul 2023 13:24:13 +0200 Subject: [PATCH 598/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20keesschol?= =?UTF-8?q?laart81/vscode-home-assistant=20to=20v1.37.0=20(#680)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 591650a..f97d004 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#9.19.0 ESPHome.esphome-vscode#2023.6.0 -keesschollaart.vscode-home-assistant#1.36.0 +keesschollaart.vscode-home-assistant#1.37.0 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From 536654c4ee5c37bdb75e7503966cf84d938997a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 11:18:23 +0200 Subject: [PATCH 599/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome/e?= =?UTF-8?q?sphome-vscode=20to=20v2023.7.0=20(#681)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index f97d004..1dbabfd 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#9.19.0 -ESPHome.esphome-vscode#2023.6.0 +ESPHome.esphome-vscode#2023.7.0 keesschollaart.vscode-home-assistant#1.37.0 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 From 56ab1c025a4279b02a6f84b35d5b13b955d3f850 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Jul 2023 11:53:14 +0200 Subject: [PATCH 600/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.15.0=20(#682)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ce746dc..958889e 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.14.1" +ARG CODE_SERVER_VERSION="v4.15.0" ARG HA_CLI_VERSION="4.27.0" # hadolint ignore=SC2181, DL3008 RUN \ From 3e6f1bcdb44e4d2ab4bd20355d570b258d579bd9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 21:09:09 +0200 Subject: [PATCH 601/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7.1.0=20(#683)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Franck Nijhof --- vscode/Dockerfile | 4 ++-- vscode/build.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 958889e..deaddd0 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.1.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -33,7 +33,7 @@ RUN \ colordiff=1.0.20-1 \ git=1:2.39.2-1.1 \ iputils-ping=3:20221126-1 \ - locales=2.36-9 \ + locales=2.36-9+deb12u1 \ mariadb-client=1:10.11.3-1 \ mosquitto-clients=2.0.11-1.2 \ net-tools=2.10-0.1 \ diff --git a/vscode/build.yaml b/vscode/build.yaml index 02ed244..c8b7a9c 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.1.0 + amd64: ghcr.io/hassio-addons/debian-base:7.1.0 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 1f15cdf437470c1bab666b5745c4afe0691200da Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 21:13:17 +0200 Subject: [PATCH 602/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.7.1=20(#688)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index dd12604..3e7904d 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.7.0 +esphome==2023.7.1 yamllint==1.32.0 From cda8a8ee0377ce2f152568cb2082110d01af25bd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 21:14:14 +0200 Subject: [PATCH 603/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20keesschol?= =?UTF-8?q?laart81/vscode-home-assistant=20to=20v1.39.0=20(#684)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 1dbabfd..f47f304 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#9.19.0 ESPHome.esphome-vscode#2023.7.0 -keesschollaart.vscode-home-assistant#1.37.0 +keesschollaart.vscode-home-assistant#1.39.0 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From fc0646bcf24401648cbaac59efbd9225160cf6e3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 21:29:51 +0200 Subject: [PATCH 604/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.16.1=20(#685)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index deaddd0..70a3a22 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.15.0" +ARG CODE_SERVER_VERSION="v4.16.1" ARG HA_CLI_VERSION="4.27.0" # hadolint ignore=SC2181, DL3008 RUN \ From a9b79b1627d0df36f39bc6e3015b1b700977a316 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 21:30:01 +0200 Subject: [PATCH 605/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20prettier/?= =?UTF-8?q?prettier-vscode=20to=20v10=20(#687)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index f47f304..2764d66 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.16.0 -esbenp.prettier-vscode#9.19.0 +esbenp.prettier-vscode#10.1.0 ESPHome.esphome-vscode#2023.7.0 keesschollaart.vscode-home-assistant#1.39.0 lukas-tr.materialdesignicons-intellisense#4.1.0 From 37082d4088beb985c6d53628743d501c081b014a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 17:41:29 +0200 Subject: [PATCH 606/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.8.0=20(#690)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 3e7904d..d216016 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.7.1 +esphome==2023.8.0 yamllint==1.32.0 From c888b92467628d3b81783192c16850ee6485982a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 11:51:20 +0200 Subject: [PATCH 607/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.8.1=20(#691)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index d216016..bc29af6 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.8.0 +esphome==2023.8.1 yamllint==1.32.0 From a34086bec400b4d96d8f105273190d24134dce14 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 10:57:30 +0200 Subject: [PATCH 608/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.8.2=20(#694)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index bc29af6..d0b8db1 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.8.1 +esphome==2023.8.2 yamllint==1.32.0 From 35e0ccf91031c5876cc32a866968b2abd8275005 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 10 Sep 2023 20:55:39 +0200 Subject: [PATCH 609/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.8.3=20(#696)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index d0b8db1..1f1ac42 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.8.2 +esphome==2023.8.3 yamllint==1.32.0 From 16b55d3b684cdaf9b328404c4e5cb14ec5e4ea2c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 Sep 2023 21:59:18 +0200 Subject: [PATCH 610/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.17.0=20(#701)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 70a3a22..ebc92e6 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.16.1" +ARG CODE_SERVER_VERSION="v4.17.0" ARG HA_CLI_VERSION="4.27.0" # hadolint ignore=SC2181, DL3008 RUN \ From b48ac8a00dbc99affdcbabacbb505b367f34c703 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 24 Sep 2023 14:07:48 +0200 Subject: [PATCH 611/778] Ditch CAS --- .github/workflows/deploy.yaml | 1 - 1 file changed, 1 deletion(-) 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 }} From bb5a1a789b0f365ef906134ee129afe1184cc0e5 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 26 Sep 2023 19:42:28 +0200 Subject: [PATCH 612/778] =?UTF-8?q?Revert=20"=E2=AC=86=EF=B8=8F=20Update?= =?UTF-8?q?=20cdr/code-server=20to=20v4.17.0"=20(#702)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ebc92e6..70a3a22 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.17.0" +ARG CODE_SERVER_VERSION="v4.16.1" ARG HA_CLI_VERSION="4.27.0" # hadolint ignore=SC2181, DL3008 RUN \ From a567ca16f89a054e32ce605a0f5138ca396e2e99 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 11:10:44 +0200 Subject: [PATCH 613/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.9.0=20(#704)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 1f1ac42..6c41dad 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.8.3 +esphome==2023.9.0 yamllint==1.32.0 From 1e0c98f7bef555a7b7f27d5383c1c1cc2c701503 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 09:39:56 +0200 Subject: [PATCH 614/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.9.1=20(#705)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 6c41dad..2c36f29 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.9.0 +esphome==2023.9.1 yamllint==1.32.0 From c48fe5bfdc390f960b4b89a1d57b6d84a64931fd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 19:06:57 +0200 Subject: [PATCH 615/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20home-assi?= =?UTF-8?q?stant/cli=20to=20v4.28.0=20(#707)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 70a3a22..d39c8a2 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -21,7 +21,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 ARG CODE_SERVER_VERSION="v4.16.1" -ARG HA_CLI_VERSION="4.27.0" +ARG HA_CLI_VERSION="4.28.0" # hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ From 8149899349d5d5f0f9095b4fb47950d5ad58541e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 Sep 2023 10:38:20 +0200 Subject: [PATCH 616/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.17.1=20(#708)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index d39c8a2..a98381a 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.16.1" +ARG CODE_SERVER_VERSION="v4.17.1" ARG HA_CLI_VERSION="4.28.0" # hadolint ignore=SC2181, DL3008 RUN \ From 14bd670012fd3bec1e754a81de85c98122e4086a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 7 Oct 2023 18:31:24 +0200 Subject: [PATCH 617/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?12/mariadb-client=20to=20v1:10.11.4-1~deb12u1=20(#713)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index a98381a..a7d90a7 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -34,7 +34,7 @@ RUN \ git=1:2.39.2-1.1 \ iputils-ping=3:20221126-1 \ locales=2.36-9+deb12u1 \ - mariadb-client=1:10.11.3-1 \ + mariadb-client=1:10.11.4-1~deb12u1 \ mosquitto-clients=2.0.11-1.2 \ net-tools=2.10-0.1 \ nmap=7.93+dfsg1-1 \ From e9d726dc8fbcbe1e9f86f84be3dd9d0849d4171d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 7 Oct 2023 18:31:34 +0200 Subject: [PATCH 618/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?12/openssh=20to=20v1:9.2p1-2+deb12u1=20(#714)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index a7d90a7..fea877b 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -38,7 +38,7 @@ RUN \ mosquitto-clients=2.0.11-1.2 \ net-tools=2.10-0.1 \ nmap=7.93+dfsg1-1 \ - openssh-client=1:9.2p1-2 \ + openssh-client=1:9.2p1-2+deb12u1 \ openssl=3.0.9-1 \ python3-dev=3.11.2-1+b1 \ python3=3.11.2-1+b1 \ From 28a7fd50de23924fd25d2964a51c1af19c597a81 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 7 Oct 2023 16:54:32 +0000 Subject: [PATCH 619/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?12/openssl=20to=20v3.0.11-1~deb12u1=20(#715)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index fea877b..39568a2 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -39,7 +39,7 @@ RUN \ net-tools=2.10-0.1 \ nmap=7.93+dfsg1-1 \ openssh-client=1:9.2p1-2+deb12u1 \ - openssl=3.0.9-1 \ + openssl=3.0.11-1~deb12u1 \ python3-dev=3.11.2-1+b1 \ python3=3.11.2-1+b1 \ unzip=6.0-28 \ From f6f808d7f7a2b3e6eb1dd77a7b60f58c98ce2b84 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 22:39:46 +0200 Subject: [PATCH 620/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7.2.0=20(#718)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Franck Nijhof --- vscode/Dockerfile | 6 +++--- vscode/build.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 39568a2..62c1f8d 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.1.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.2.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -33,9 +33,9 @@ RUN \ colordiff=1.0.20-1 \ git=1:2.39.2-1.1 \ iputils-ping=3:20221126-1 \ - locales=2.36-9+deb12u1 \ + locales=2.36-9+deb12u3 \ mariadb-client=1:10.11.4-1~deb12u1 \ - mosquitto-clients=2.0.11-1.2 \ + 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+deb12u1 \ diff --git a/vscode/build.yaml b/vscode/build.yaml index c8b7a9c..7608e4f 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.1.0 - amd64: ghcr.io/hassio-addons/debian-base:7.1.0 + aarch64: ghcr.io/hassio-addons/debian-base:7.2.0 + amd64: ghcr.io/hassio-addons/debian-base:7.2.0 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 5cc5199642cd8f61781a7e3161d3117dbd91377e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 23:10:13 +0200 Subject: [PATCH 621/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20home-assi?= =?UTF-8?q?stant/cli=20to=20v4.28.1=20(#711)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 62c1f8d..7d809f4 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -21,7 +21,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 ARG CODE_SERVER_VERSION="v4.17.1" -ARG HA_CLI_VERSION="4.28.0" +ARG HA_CLI_VERSION="4.28.1" # hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ From 18d264cc98af2eb9483df37e4d0d8bdb0117294c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 11:10:24 +0200 Subject: [PATCH 622/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.9.3=20(#709)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 2c36f29..e791a62 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.9.1 +esphome==2023.9.3 yamllint==1.32.0 From d4585afc4f7831a91144cfed03b992aa5944b06d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 21:44:34 +0200 Subject: [PATCH 623/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20home-assi?= =?UTF-8?q?stant/cli=20to=20v4.29.0=20(#720)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 7d809f4..5547896 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -21,7 +21,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 ARG CODE_SERVER_VERSION="v4.17.1" -ARG HA_CLI_VERSION="4.28.1" +ARG HA_CLI_VERSION="4.29.0" # hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ From 14feebe9f1f8cd9f1356b80241d8c5a0c8477337 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 14 Oct 2023 13:27:43 +0200 Subject: [PATCH 624/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome/e?= =?UTF-8?q?sphome-vscode=20to=20v2023.9=20(#717)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Franck Nijhof --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 2764d66..393a6b5 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,6 +1,6 @@ emilast.LogFileHighlighter#2.16.0 esbenp.prettier-vscode#10.1.0 -ESPHome.esphome-vscode#2023.7.0 +ESPHome.esphome-vscode#2023.9.0 keesschollaart.vscode-home-assistant#1.39.0 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 From 4ee5084f205116c7947216053bcbcb93510581dd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 11:10:19 +0200 Subject: [PATCH 625/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.10.0=20(#722)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index e791a62..7dc3bd7 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.9.3 +esphome==2023.10.0 yamllint==1.32.0 From 3793079631a4b247918453b1a8684910067136cf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Oct 2023 07:27:18 +0200 Subject: [PATCH 626/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.10.1=20(#723)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 7dc3bd7..7cb867e 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.10.0 +esphome==2023.10.1 yamllint==1.32.0 From 40a1bf754242b13a23743b7a1a4e7f881c54fcbd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Oct 2023 23:07:57 +0200 Subject: [PATCH 627/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.18.0=20(#725)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 5547896..df3b806 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.17.1" +ARG CODE_SERVER_VERSION="v4.18.0" ARG HA_CLI_VERSION="4.29.0" # hadolint ignore=SC2181, DL3008 RUN \ From 9e70730b2a3cf1b0f2f16eacd0e335e757c98eab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 13:47:50 +0200 Subject: [PATCH 628/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?12/openssl=20to=20v3.0.11-1~deb12u2=20(#726)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index df3b806..fd84a6a 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -39,7 +39,7 @@ RUN \ net-tools=2.10-0.1 \ nmap=7.93+dfsg1-1 \ openssh-client=1:9.2p1-2+deb12u1 \ - openssl=3.0.11-1~deb12u1 \ + openssl=3.0.11-1~deb12u2 \ python3-dev=3.11.2-1+b1 \ python3=3.11.2-1+b1 \ unzip=6.0-28 \ From 1bf139175e77513147bd554e56aba2a9214acf4a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 14:54:03 +0200 Subject: [PATCH 629/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.10.3=20(#727)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 7cb867e..922995b 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.10.1 +esphome==2023.10.3 yamllint==1.32.0 From 45a553e0cc49c26cd2c60e5d7fb9fd39bc611ace Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 18:35:18 +0100 Subject: [PATCH 630/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.10.4=20(#729)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 922995b..d68dd6d 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.10.3 +esphome==2023.10.4 yamllint==1.32.0 From e307a53e31269dc1019aa043fbafc51270318db5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 4 Nov 2023 13:47:38 +0100 Subject: [PATCH 631/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.10.6=20(#730)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index d68dd6d..b8a3d04 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.10.4 +esphome==2023.10.6 yamllint==1.32.0 From 982780c9b2f9772a8ac904d47f1c13cc307c6cc3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 Nov 2023 17:17:29 +0100 Subject: [PATCH 632/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20yamllint?= =?UTF-8?q?=20to=20v1.33.0=20(#731)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index b8a3d04..f639d4e 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ esphome==2023.10.6 -yamllint==1.32.0 +yamllint==1.33.0 From 579652261bc94d3d8b25f365438ac2fa52d80eef Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 10 Nov 2023 10:58:47 +0100 Subject: [PATCH 633/778] Add support for public add-on configuration access (#732) --- vscode/config.yaml | 7 ++++--- vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run | 8 +++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/vscode/config.yaml b/vscode/config.yaml index a680dc1..85bf0c8 100644 --- a/vscode/config.yaml +++ b/vscode/config.yaml @@ -19,12 +19,13 @@ hassio_api: true hassio_role: manager homeassistant_api: true map: - - config:rw - - ssl:rw - addons:rw + - all_addon_configs:rw + - backup:rw + - homeassistant_config:rw - media:rw - share:rw - - backup:rw + - ssl:rw services: - mysql:want - mqtt:want 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 f476a2a..fed40dc 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 @@ -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 @@ -16,6 +16,12 @@ for dir in "${DIRECTORIES[@]}"; do || 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 "/homeassistant" "/config" \ + || bashio::log.warning "Failed linking common directory: ${dir}" +ln -s "/homeassistant" "${HOME}/config" \ + || bashio::log.warning "Failed linking common directory: ${dir} + # Store SSH settings in add-on data folder if ! bashio::fs.directory_exists "${SSH_USER_PATH}"; then mkdir -p "${SSH_USER_PATH}" \ From 28a32ed51a4c9508c04f724e206b7499c5ca37bc Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 10 Nov 2023 11:26:57 +0100 Subject: [PATCH 634/778] Fix init-user script (#734) --- vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fed40dc..f700f28 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 @@ -20,7 +20,7 @@ done ln -s "/homeassistant" "/config" \ || bashio::log.warning "Failed linking common directory: ${dir}" ln -s "/homeassistant" "${HOME}/config" \ - || bashio::log.warning "Failed linking common directory: ${dir} + || bashio::log.warning "Failed linking common directory: ${dir}" # Store SSH settings in add-on data folder if ! bashio::fs.directory_exists "${SSH_USER_PATH}"; then From 9245e790c95552c34b35c01ff9e365b8fd6fa122 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 10 Nov 2023 23:00:25 +0100 Subject: [PATCH 635/778] Fix unbound variable in log warning message (#736) --- vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f700f28..ca0b5e9 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 @@ -18,9 +18,9 @@ done # Some links to old locations, to not mess with the user's muscle memory ln -s "/homeassistant" "/config" \ - || bashio::log.warning "Failed linking common directory: ${dir}" + || bashio::log.warning "Failed linking common directory: /config" ln -s "/homeassistant" "${HOME}/config" \ - || bashio::log.warning "Failed linking common directory: ${dir}" + || bashio::log.warning "Failed linking common directory: ${HOME}/config" # Store SSH settings in add-on data folder if ! bashio::fs.directory_exists "${SSH_USER_PATH}"; then From 7c3aa71c79576de3ff1b70602ae893ac95d05fd2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 09:02:31 +0100 Subject: [PATCH 636/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.11.0=20(#739)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index f639d4e..85afab9 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.10.6 +esphome==2023.11.0 yamllint==1.33.0 From aa5c0a404805a0a794693224132b2379104e2bf1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 13:00:23 +0100 Subject: [PATCH 637/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.11.1=20(#741)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 85afab9..c39dc0c 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.11.0 +esphome==2023.11.1 yamllint==1.33.0 From 05796259549cdd9f641e50bb7bb9c4c6b36fc574 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 08:48:17 +0100 Subject: [PATCH 638/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20emilast/v?= =?UTF-8?q?scode-logfile-highlighter=20to=20v2.17.0=20(#746)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 393a6b5..ddb0478 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#2.16.0 +emilast.LogFileHighlighter#2.17.0 esbenp.prettier-vscode#10.1.0 ESPHome.esphome-vscode#2023.9.0 keesschollaart.vscode-home-assistant#1.39.0 From 1398c21834a976797ad562d43a00658ebc160ac0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 09:15:44 +0100 Subject: [PATCH 639/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.19.0=20(#745)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index fd84a6a..1319ce1 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.18.0" +ARG CODE_SERVER_VERSION="v4.19.0" ARG HA_CLI_VERSION="4.29.0" # hadolint ignore=SC2181, DL3008 RUN \ From d921a5d9c35492678eaceb95edcab2fca49ec343 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 10:06:28 +0100 Subject: [PATCH 640/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.11.2=20(#744)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index c39dc0c..d830a05 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.11.1 +esphome==2023.11.2 yamllint==1.33.0 From 3e83dc35b5549da2f6e887e703ab9e4f364aa667 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Nov 2023 13:13:11 +0100 Subject: [PATCH 641/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.11.3=20(#747)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index d830a05..1d149f9 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.11.2 +esphome==2023.11.3 yamllint==1.33.0 From 5e9c44b388120be353bd7625c41fd68f8c470451 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 Nov 2023 07:20:04 +0100 Subject: [PATCH 642/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.11.4=20(#748)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 1d149f9..4ffb5a5 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.11.3 +esphome==2023.11.4 yamllint==1.33.0 From 23c9f8731efd8f5091ad39560268768a16195ade Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 07:22:59 +0100 Subject: [PATCH 643/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.11.6=20(#750)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 4ffb5a5..239938c 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.11.4 +esphome==2023.11.6 yamllint==1.33.0 From 2f4c5843730c3049cfae11f759a493ea1cc664a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 23:30:09 +0100 Subject: [PATCH 644/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.19.1=20(#751)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 1319ce1..696d873 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.19.0" +ARG CODE_SERVER_VERSION="v4.19.1" ARG HA_CLI_VERSION="4.29.0" # hadolint ignore=SC2181, DL3008 RUN \ From f0c9a6c713ea3a11b5edaccc2fb924472445c419 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 06:54:33 +0100 Subject: [PATCH 645/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.20.0=20(#755)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 696d873..d2fc1ad 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.19.1" +ARG CODE_SERVER_VERSION="v4.20.0" ARG HA_CLI_VERSION="4.29.0" # hadolint ignore=SC2181, DL3008 RUN \ From 2f046b8e08929e31dbde484257fa1cb17f230051 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 Dec 2023 07:43:17 +0100 Subject: [PATCH 646/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?12/openssh=20to=20v1:9.2p1-2+deb12u2=20(#756)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index d2fc1ad..ec8cbc8 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -38,7 +38,7 @@ RUN \ 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+deb12u1 \ + openssh-client=1:9.2p1-2+deb12u2 \ openssl=3.0.11-1~deb12u2 \ python3-dev=3.11.2-1+b1 \ python3=3.11.2-1+b1 \ From 02371b6dd50ca674769b055c080aa139ff9d1d18 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 Dec 2023 07:51:01 +0100 Subject: [PATCH 647/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.12.3=20(#754)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 239938c..cca2066 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.11.6 +esphome==2023.12.3 yamllint==1.33.0 From 478cd5a4ce3d422a46c9cdf9effc142151433c2b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Dec 2023 08:21:01 +0100 Subject: [PATCH 648/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.12.5=20(#759)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index cca2066..9424c88 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.12.3 +esphome==2023.12.5 yamllint==1.33.0 From 1bf3265e48bad30a8a68e56f8fef0cacae7b6056 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Dec 2023 12:58:21 +0100 Subject: [PATCH 649/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7.3.0=20(#757)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ec8cbc8..79027e7 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.2.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.3.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index 7608e4f..eef806c 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.2.0 - amd64: ghcr.io/hassio-addons/debian-base:7.2.0 + aarch64: ghcr.io/hassio-addons/debian-base:7.3.0 + amd64: ghcr.io/hassio-addons/debian-base:7.3.0 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 0752d52e95a71dd3a717a74c273e64325bbf92f3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Dec 2023 15:40:25 +0100 Subject: [PATCH 650/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7.3.1=20(#760)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 79027e7..9cf6b2d 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.3.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.3.1 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index eef806c..c7ade15 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.3.0 - amd64: ghcr.io/hassio-addons/debian-base:7.3.0 + aarch64: ghcr.io/hassio-addons/debian-base:7.3.1 + amd64: ghcr.io/hassio-addons/debian-base:7.3.1 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From e2e05c17858968a637baa6a0c47c1b0f9977a634 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 7 Jan 2024 11:40:22 +0100 Subject: [PATCH 651/778] :fireworks: Updates maintenance/license year to 2024 (#763) --- LICENSE.md | 2 +- README.md | 4 ++-- vscode/.README.j2 | 2 +- vscode/DOCS.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 95bbdfe..6db2d79 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # MIT License -Copyright (c) 2019-2023 Franck Nijhof +Copyright (c) 2019-2024 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..db89a90 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-2024 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/2024.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..dd55865 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/2024.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..9c7f66c 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-2024 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 From 385adbd61728e15569f3c66dceebfc4bec79a78c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 21:16:07 +0100 Subject: [PATCH 652/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20keesschol?= =?UTF-8?q?laart81/vscode-home-assistant=20to=20v1.40.0=20(#764)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index ddb0478..ef330be 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#2.17.0 esbenp.prettier-vscode#10.1.0 ESPHome.esphome-vscode#2023.9.0 -keesschollaart.vscode-home-assistant#1.39.0 +keesschollaart.vscode-home-assistant#1.40.0 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From ef37c9a05a5cea73362b7ba2f61af6d730e44c5c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 07:30:38 +0100 Subject: [PATCH 653/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.12.6=20(#765)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 9424c88..5c77aa9 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.12.5 +esphome==2023.12.6 yamllint==1.33.0 From d7057e92124fedd95f10d2f425154ac89a19b5f7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Jan 2024 07:31:40 +0100 Subject: [PATCH 654/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.12.7=20(#767)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 5c77aa9..9aab610 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.12.6 +esphome==2023.12.7 yamllint==1.33.0 From 6db56e8fcf66d5b52fd1b272dab6eabba2aaa93c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 19:35:10 +0100 Subject: [PATCH 655/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.12.8=20(#768)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 9aab610..5ab41de 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.12.7 +esphome==2023.12.8 yamllint==1.33.0 From d042bcaad94b9146bdd23623680a0770793c7339 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Jan 2024 07:28:38 +0100 Subject: [PATCH 656/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2023.12.9=20(#773)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 5ab41de..2e9336b 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.12.8 +esphome==2023.12.9 yamllint==1.33.0 From e2ed08358b40cff095484db482748fc48878f126 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 28 Jan 2024 20:42:22 +0100 Subject: [PATCH 657/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.20.1=20(#771)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 9cf6b2d..84ab8af 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.20.0" +ARG CODE_SERVER_VERSION="v4.20.1" ARG HA_CLI_VERSION="4.29.0" # hadolint ignore=SC2181, DL3008 RUN \ From 3bb5abd3c390a22d04d5e54c62be0377ad754dcf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 11:07:17 +0100 Subject: [PATCH 658/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20yamllint?= =?UTF-8?q?=20to=20v1.34.0=20(#779)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 2e9336b..1d7471d 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ esphome==2023.12.9 -yamllint==1.33.0 +yamllint==1.34.0 From f2323462bab2e6adec6b7cf12af1069ad360d0fe Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 10:22:43 +0100 Subject: [PATCH 659/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.21.0=20(#778)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 84ab8af..68c173d 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.20.1" +ARG CODE_SERVER_VERSION="v4.21.0" ARG HA_CLI_VERSION="4.29.0" # hadolint ignore=SC2181, DL3008 RUN \ From 322f7362d1d86d183bd29a7db0a3cfe2b5d6833a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Feb 2024 19:19:03 +0100 Subject: [PATCH 660/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?12/mariadb-client=20to=20v1:10.11.6-0+deb12u1=20(#781)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 68c173d..eb6be83 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -34,7 +34,7 @@ RUN \ git=1:2.39.2-1.1 \ iputils-ping=3:20221126-1 \ locales=2.36-9+deb12u3 \ - mariadb-client=1:10.11.4-1~deb12u1 \ + mariadb-client=1:10.11.6-0+deb12u1 \ mosquitto-clients=2.0.11-1.2+deb12u1 \ net-tools=2.10-0.1 \ nmap=7.93+dfsg1-1 \ From ef6cd89bd010efee256845969b146330b439a0a4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 21:23:52 +0100 Subject: [PATCH 661/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7.3.3=20(#783)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Franck Nijhof --- vscode/Dockerfile | 4 ++-- vscode/build.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index eb6be83..bd0b4a2 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.3.1 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.3.3 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -33,7 +33,7 @@ RUN \ colordiff=1.0.20-1 \ git=1:2.39.2-1.1 \ iputils-ping=3:20221126-1 \ - locales=2.36-9+deb12u3 \ + locales=2.36-9+deb12u4 \ mariadb-client=1:10.11.6-0+deb12u1 \ mosquitto-clients=2.0.11-1.2+deb12u1 \ net-tools=2.10-0.1 \ diff --git a/vscode/build.yaml b/vscode/build.yaml index c7ade15..c6823cc 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.3.1 - amd64: ghcr.io/hassio-addons/debian-base:7.3.1 + aarch64: ghcr.io/hassio-addons/debian-base:7.3.3 + amd64: ghcr.io/hassio-addons/debian-base:7.3.3 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From bdc2bba6cff667daf4785e94164fb00d21be5044 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 21:31:32 +0100 Subject: [PATCH 662/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20home-assi?= =?UTF-8?q?stant/cli=20to=20v4.31.0=20(#786)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index bd0b4a2..ba7e37d 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -21,7 +21,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 ARG CODE_SERVER_VERSION="v4.21.0" -ARG HA_CLI_VERSION="4.29.0" +ARG HA_CLI_VERSION="4.31.0" # hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ From 7d01c61933534bdd0a223bb527c7ce23104b693e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 21:46:32 +0100 Subject: [PATCH 663/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024=20[SECURITY]=20(#791)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 1d7471d..69da97f 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2023.12.9 +esphome==2024.2.2 yamllint==1.34.0 From e883c4035c983bf4cfecc6a78aad9f9c836deb3f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 21:46:44 +0100 Subject: [PATCH 664/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20emilast/v?= =?UTF-8?q?scode-logfile-highlighter=20to=20v2.18.0=20(#785)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index ef330be..402b9ba 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#2.17.0 +emilast.LogFileHighlighter#2.18.0 esbenp.prettier-vscode#10.1.0 ESPHome.esphome-vscode#2023.9.0 keesschollaart.vscode-home-assistant#1.40.0 From 6cf8f5c0480308b136f56f1c26b9be86ddb9f9e3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 21:46:56 +0100 Subject: [PATCH 665/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.22.0=20(#780)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ba7e37d..b629f3b 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.21.0" +ARG CODE_SERVER_VERSION="v4.22.0" ARG HA_CLI_VERSION="4.31.0" # hadolint ignore=SC2181, DL3008 RUN \ From e21db7bfc3436394a8d6764335a99f17f3b74672 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 11:40:11 +0100 Subject: [PATCH 666/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20yamllint?= =?UTF-8?q?=20to=20v1.35.1=20(#784)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 69da97f..d42b85a 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ esphome==2024.2.2 -yamllint==1.34.0 +yamllint==1.35.1 From aee6a9c2a9eb1f5e5e2c2e04a228de0c543c7892 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 22:17:40 +0100 Subject: [PATCH 667/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.22.1=20(#794)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index b629f3b..65c9c78 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.22.0" +ARG CODE_SERVER_VERSION="v4.22.1" ARG HA_CLI_VERSION="4.31.0" # hadolint ignore=SC2181, DL3008 RUN \ From 635efbd436f37ea84292674bd2c4946c880a7aab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 08:24:38 +0100 Subject: [PATCH 668/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.3.0=20(#796)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index d42b85a..0e10cd7 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.2.2 +esphome==2024.3.0 yamllint==1.35.1 From eacf5c2bd9909bca0277c867098588f54a21785d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 09:22:26 +0100 Subject: [PATCH 669/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20prettier/?= =?UTF-8?q?prettier-vscode=20to=20v10.3.0=20(#797)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 402b9ba..eff237c 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.18.0 -esbenp.prettier-vscode#10.1.0 +esbenp.prettier-vscode#10.3.0 ESPHome.esphome-vscode#2023.9.0 keesschollaart.vscode-home-assistant#1.40.0 lukas-tr.materialdesignicons-intellisense#4.1.0 From 89c5f5cb8914bc3aaa6faf43dab65e2bd876db02 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 16:32:10 +0100 Subject: [PATCH 670/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20prettier/?= =?UTF-8?q?prettier-vscode=20to=20v10.4.0=20(#798)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index eff237c..6e25d0c 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#2.18.0 -esbenp.prettier-vscode#10.3.0 +esbenp.prettier-vscode#10.4.0 ESPHome.esphome-vscode#2023.9.0 keesschollaart.vscode-home-assistant#1.40.0 lukas-tr.materialdesignicons-intellisense#4.1.0 From a0c15b74227f4691d324a81736db32ac41e5fa80 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 07:14:22 +0100 Subject: [PATCH 671/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.3.1=20(#799)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 0e10cd7..a5a81ac 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.3.0 +esphome==2024.3.1 yamllint==1.35.1 From e8109b0b8099fdaa0fed5fca6dcf3fd03eb3c045 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 7 Apr 2024 20:50:54 +0200 Subject: [PATCH 672/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20home-assi?= =?UTF-8?q?stant/cli=20to=20v4.32.0=20(#801)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 65c9c78..466f8c2 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -21,7 +21,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 ARG CODE_SERVER_VERSION="v4.22.1" -ARG HA_CLI_VERSION="4.31.0" +ARG HA_CLI_VERSION="4.32.0" # hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ From d75fea0643d1528a1de481d18b4d014eb964a44e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:26:14 +0200 Subject: [PATCH 673/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.23.0=20(#804)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 466f8c2..bc102e9 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.22.1" +ARG CODE_SERVER_VERSION="v4.23.0" ARG HA_CLI_VERSION="4.32.0" # hadolint ignore=SC2181, DL3008 RUN \ From b57004915cd86db9d8f0aaa564c26f6d1066ac20 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:40:26 +0200 Subject: [PATCH 674/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.3.2=20(#803)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index a5a81ac..1adff2a 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.3.1 +esphome==2024.3.2 yamllint==1.35.1 From 536a7a1f637f222d5a60797b2c8e4d4f5ebb63e3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 17:48:33 +0200 Subject: [PATCH 675/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20home-assi?= =?UTF-8?q?stant/cli=20to=20v4.33.0=20(#805)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index bc102e9..12a01b4 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -21,7 +21,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 ARG CODE_SERVER_VERSION="v4.23.0" -ARG HA_CLI_VERSION="4.32.0" +ARG HA_CLI_VERSION="4.33.0" # hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ From 9e05ad494924632cd864d70910b263b4814eef3b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 07:10:06 +0200 Subject: [PATCH 676/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.23.1=20(#806)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 12a01b4..eed1660 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.23.0" +ARG CODE_SERVER_VERSION="v4.23.1" ARG HA_CLI_VERSION="4.33.0" # hadolint ignore=SC2181, DL3008 RUN \ From 70151089e5b49191a892e9e8a2fc817396f357ba Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 08:46:10 +0200 Subject: [PATCH 677/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.4.0=20(#807)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 1adff2a..1f02ba7 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.3.2 +esphome==2024.4.0 yamllint==1.35.1 From b76b464952e90bb7d4af8dc21da89cdd356d7015 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 06:59:39 +0200 Subject: [PATCH 678/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.4.1=20(#810)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 1f02ba7..dc6085a 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.4.0 +esphome==2024.4.1 yamllint==1.35.1 From 0e0ac2846cb941df6eb55796047002b8aa8e23de Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 09:20:21 +0200 Subject: [PATCH 679/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.4.2=20(#812)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index dc6085a..9edc982 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.4.1 +esphome==2024.4.2 yamllint==1.35.1 From b63389274f3d9da115f417c08ec5d338fe07e8d5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 4 May 2024 10:22:26 +0200 Subject: [PATCH 680/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?12/less=20to=20v590-2.1~deb12u2=20(#813)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index eed1660..9116ee1 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -47,7 +47,7 @@ RUN \ wget>=1.21.3-1+b2 \ zip=3.0-13 \ zsh=5.9-4+b2 \ - less=590-2 \ + 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 \ From 3e3b9ee72bfbb137b5275dbdbcc3d789e60309c7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 22:39:29 +0200 Subject: [PATCH 681/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20home-assi?= =?UTF-8?q?stant/cli=20to=20v4.34.0=20(#814)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 9116ee1..86c59da 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -21,7 +21,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 ARG CODE_SERVER_VERSION="v4.23.1" -ARG HA_CLI_VERSION="4.33.0" +ARG HA_CLI_VERSION="4.34.0" # hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ From 2d7717c6086c7b376bba9d03a7d1230539b6d9d6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 17:56:53 +0200 Subject: [PATCH 682/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.89.0=20(#815)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 86c59da..4cd253e 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.23.1" +ARG CODE_SERVER_VERSION="v4.89.0" ARG HA_CLI_VERSION="4.34.0" # hadolint ignore=SC2181, DL3008 RUN \ From c2acc02cb6cc4e0ee0202189920ea582a7a492ed Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 08:56:12 +0200 Subject: [PATCH 683/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20emilast/v?= =?UTF-8?q?scode-logfile-highlighter=20to=20v2.19.0=20(#816)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 6e25d0c..d77e6d3 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#2.18.0 +emilast.LogFileHighlighter#2.19.0 esbenp.prettier-vscode#10.4.0 ESPHome.esphome-vscode#2023.9.0 keesschollaart.vscode-home-assistant#1.40.0 From 62c8c440726250ec8941ea5b4ae5af79e3c6500f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 09:16:56 +0200 Subject: [PATCH 684/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.89.1=20(#817)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 4cd253e..ca8469e 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.89.0" +ARG CODE_SERVER_VERSION="v4.89.1" ARG HA_CLI_VERSION="4.34.0" # hadolint ignore=SC2181, DL3008 RUN \ From 4a50976d41c03f5699ae69396f9a5ae2e3eaefb5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 09:31:38 +0200 Subject: [PATCH 685/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.5.0=20(#818)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 9edc982..8a8de25 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.4.2 +esphome==2024.5.0 yamllint==1.35.1 From 056c00f15a537e418628a7001dbc999efa1dde09 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 14:06:19 +0200 Subject: [PATCH 686/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.5.1=20(#819)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 8a8de25..d4b0035 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.5.0 +esphome==2024.5.1 yamllint==1.35.1 From a525b086c4b507426df7d10a2073f97ec7bf8ad7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 07:05:51 +0200 Subject: [PATCH 687/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.5.2=20(#820)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index d4b0035..97b89e8 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.5.1 +esphome==2024.5.2 yamllint==1.35.1 From d66719bd461bd39ddfad76d46c0b31e3a4860438 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 25 May 2024 10:28:25 +0200 Subject: [PATCH 688/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.5.3=20(#821)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 97b89e8..9bbdefe 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.5.2 +esphome==2024.5.3 yamllint==1.35.1 From 0e7b6658b1036674994c609cd5b144f64800bc81 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 08:08:49 +0200 Subject: [PATCH 689/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.5.4=20(#822)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 9bbdefe..a7c5dec 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.5.3 +esphome==2024.5.4 yamllint==1.35.1 From aea2b3281d94ec8bc75d643ffa8c8bd162d5c4bc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2024 13:21:19 +0200 Subject: [PATCH 690/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7.3.4=20(#825)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Franck Nijhof --- vscode/Dockerfile | 4 ++-- vscode/build.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ca8469e..2adf5e0 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.3.3 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.3.4 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -28,7 +28,7 @@ RUN \ \ && apt-get install -y --no-install-recommends \ ack=3.6.0-1 \ - libarchive-tools=3.6.2-1 \ + libarchive-tools=3.6.2-1+deb12u1 \ build-essential=12.9 \ colordiff=1.0.20-1 \ git=1:2.39.2-1.1 \ diff --git a/vscode/build.yaml b/vscode/build.yaml index c6823cc..8ca1038 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.3.3 - amd64: ghcr.io/hassio-addons/debian-base:7.3.3 + aarch64: ghcr.io/hassio-addons/debian-base:7.3.4 + amd64: ghcr.io/hassio-addons/debian-base:7.3.4 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 64539ae56451c54c6b37f63783a59ac3ce2ed84b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2024 13:36:30 +0200 Subject: [PATCH 691/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.90.3=20(#826)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 2adf5e0..adb3b94 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.89.1" +ARG CODE_SERVER_VERSION="v4.90.3" ARG HA_CLI_VERSION="4.34.0" # hadolint ignore=SC2181, DL3008 RUN \ From 5d0fd221e08974a506f86c87a74d2589f1e42e42 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2024 14:43:26 +0200 Subject: [PATCH 692/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20home-assi?= =?UTF-8?q?stant/cli=20to=20v4.35.0=20(#827)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index adb3b94..6eed2ff 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -21,7 +21,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 ARG CODE_SERVER_VERSION="v4.90.3" -ARG HA_CLI_VERSION="4.34.0" +ARG HA_CLI_VERSION="4.35.0" # hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ From 56b46fb99d1e7891114780bae1d29cf12651b48d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2024 15:33:45 +0200 Subject: [PATCH 693/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20emilast/v?= =?UTF-8?q?scode-logfile-highlighter=20to=20v3=20(#828)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index d77e6d3..d3a9a73 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#2.19.0 +emilast.LogFileHighlighter#3.0.3 esbenp.prettier-vscode#10.4.0 ESPHome.esphome-vscode#2023.9.0 keesschollaart.vscode-home-assistant#1.40.0 From dba3c42a090d0b00e77299324e2c40809800bbb4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 22 Jun 2024 15:54:18 +0200 Subject: [PATCH 694/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.6.1=20(#824)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index a7c5dec..7aceff2 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.5.4 +esphome==2024.6.1 yamllint==1.35.1 From d259c80a019b8ea9bdc5cb28dc9c039a03b43819 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 08:28:41 +0200 Subject: [PATCH 695/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20emilast/v?= =?UTF-8?q?scode-logfile-highlighter=20to=20v3.1.0=20(#830)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index d3a9a73..a27aca8 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#3.0.3 +emilast.LogFileHighlighter#3.1.0 esbenp.prettier-vscode#10.4.0 ESPHome.esphome-vscode#2023.9.0 keesschollaart.vscode-home-assistant#1.40.0 From aea4bfbc40948b8ca4f6340908dac655847386a2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 13:15:25 +0200 Subject: [PATCH 696/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.6.2=20(#829)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 7aceff2..b265e8b 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.6.1 +esphome==2024.6.2 yamllint==1.35.1 From f32bff5f7d4b8c56ed43345a04d2a0a77aa7abde Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 15:30:10 +0200 Subject: [PATCH 697/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.6.3=20(#831)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index b265e8b..5f41e21 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.6.2 +esphome==2024.6.3 yamllint==1.35.1 From bdf51b99a225cc106e94bd26819c2251b6d4e469 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2024 07:26:21 +0200 Subject: [PATCH 698/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.6.4=20(#833)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 5f41e21..e9159ca 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.6.3 +esphome==2024.6.4 yamllint==1.35.1 From 6a87c2323fd3ea2a638179018df8682fb92074e0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 21:08:08 +0200 Subject: [PATCH 699/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7.4.0=20(#837)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Franck Nijhof --- vscode/Dockerfile | 12 ++++++------ vscode/build.yaml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 6eed2ff..fd65ce0 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.3.4 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.4.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -33,20 +33,20 @@ RUN \ colordiff=1.0.20-1 \ git=1:2.39.2-1.1 \ iputils-ping=3:20221126-1 \ - locales=2.36-9+deb12u4 \ + locales=2.36-9+deb12u7 \ mariadb-client=1:10.11.6-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+deb12u2 \ - openssl=3.0.11-1~deb12u2 \ + openssh-client=1:9.2p1-2+deb12u3 \ + openssl=3.0.13-1~deb12u1 \ python3-dev=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 \ + 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 \ diff --git a/vscode/build.yaml b/vscode/build.yaml index 8ca1038..bb4a9c1 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.3.4 - amd64: ghcr.io/hassio-addons/debian-base:7.3.4 + aarch64: ghcr.io/hassio-addons/debian-base:7.4.0 + amd64: ghcr.io/hassio-addons/debian-base:7.4.0 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 532128ebb1f7b9b71d222f5e45e9d7bd6116f243 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 21:37:34 +0200 Subject: [PATCH 700/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20emilast/v?= =?UTF-8?q?scode-logfile-highlighter=20to=20v3.2.0=20(#838)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index a27aca8..868eda7 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#3.1.0 +emilast.LogFileHighlighter#3.2.0 esbenp.prettier-vscode#10.4.0 ESPHome.esphome-vscode#2023.9.0 keesschollaart.vscode-home-assistant#1.40.0 From 04a8fdfa07b18de0697198b72227d1bb80e623af Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 22:38:31 +0200 Subject: [PATCH 701/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.6.6=20(#836)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index e9159ca..a3ef611 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.6.4 +esphome==2024.6.6 yamllint==1.35.1 From 8be8236728b8b728a1cb155a297427f6c2f6959e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 09:02:27 +0200 Subject: [PATCH 702/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.91.0=20(#839)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index fd65ce0..7edbd29 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.90.3" +ARG CODE_SERVER_VERSION="v4.91.0" ARG HA_CLI_VERSION="4.35.0" # hadolint ignore=SC2181, DL3008 RUN \ From 2e13d1839ff50dafacd359051b040bf64ac9cd85 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 12:30:23 +0200 Subject: [PATCH 703/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.91.1=20(#841)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 7edbd29..d0d58cd 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.91.0" +ARG CODE_SERVER_VERSION="v4.91.1" ARG HA_CLI_VERSION="4.35.0" # hadolint ignore=SC2181, DL3008 RUN \ From 2831df9bf2e01e849746c7eb8c7b81191c9e99f3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 12:54:24 +0200 Subject: [PATCH 704/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20emilast/v?= =?UTF-8?q?scode-logfile-highlighter=20to=20v3.3.0=20(#842)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 868eda7..cd5e12b 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#3.2.0 +emilast.LogFileHighlighter#3.3.0 esbenp.prettier-vscode#10.4.0 ESPHome.esphome-vscode#2023.9.0 keesschollaart.vscode-home-assistant#1.40.0 From 09b0a7276ed41b20b43811d3ce77178fe8a3ca41 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 12:57:35 +0200 Subject: [PATCH 705/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.7.3=20(#843)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index a3ef611..7573e26 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.6.6 +esphome==2024.7.3 yamllint==1.35.1 From ccf3acf81badc6a1c74ca04fe19ff02b46fa3359 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 12:50:47 +0200 Subject: [PATCH 706/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20prettier/?= =?UTF-8?q?prettier-vscode=20to=20v11=20(#846)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index cd5e12b..1856f42 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,5 +1,5 @@ emilast.LogFileHighlighter#3.3.0 -esbenp.prettier-vscode#10.4.0 +esbenp.prettier-vscode#11.0.0 ESPHome.esphome-vscode#2023.9.0 keesschollaart.vscode-home-assistant#1.40.0 lukas-tr.materialdesignicons-intellisense#4.1.0 From b52686dda5a354728f94cf9daed8bdc6207f8b66 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 08:16:19 +0200 Subject: [PATCH 707/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.8.0=20(#849)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 7573e26..d39b8c8 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.7.3 +esphome==2024.8.0 yamllint==1.35.1 From 84ff58742af8f69acb57ba80b4f8f0818c7bf4f9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 08:30:19 +0200 Subject: [PATCH 708/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.92.2=20(#848)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index d0d58cd..ccd28db 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.91.1" +ARG CODE_SERVER_VERSION="v4.92.2" ARG HA_CLI_VERSION="4.35.0" # hadolint ignore=SC2181, DL3008 RUN \ From e0b97746a8c6f374584506097646968fba1f8500 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 08:42:31 +0200 Subject: [PATCH 709/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20emilast/v?= =?UTF-8?q?scode-logfile-highlighter=20to=20v3.3.2=20(#847)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 1856f42..86d2758 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#3.3.0 +emilast.LogFileHighlighter#3.3.2 esbenp.prettier-vscode#11.0.0 ESPHome.esphome-vscode#2023.9.0 keesschollaart.vscode-home-assistant#1.40.0 From df1e3a076506f8582240a2d9d2773cee48ce4bda Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 17:29:35 +0200 Subject: [PATCH 710/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.8.1=20(#850)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index d39b8c8..b48967b 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.8.0 +esphome==2024.8.1 yamllint==1.35.1 From 1c24b970b131aaa5a27e04cd546b9f4f65552f0c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 12:38:50 +0200 Subject: [PATCH 711/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?12/openssl=20to=20v3.0.14-1~deb12u2=20(#851)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ccd28db..aa7aa6e 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -39,7 +39,7 @@ RUN \ net-tools=2.10-0.1 \ nmap=7.93+dfsg1-1 \ openssh-client=1:9.2p1-2+deb12u3 \ - openssl=3.0.13-1~deb12u1 \ + openssl=3.0.14-1~deb12u2 \ python3-dev=3.11.2-1+b1 \ python3=3.11.2-1+b1 \ unzip=6.0-28 \ From 1b3db6ba129b28495fa65fd3110762780ee2e16a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 12:57:59 +0200 Subject: [PATCH 712/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.8.3=20(#852)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index b48967b..6817b62 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.8.1 +esphome==2024.8.3 yamllint==1.35.1 From cce04afa947a987ba4df6f53479e90c87f3a31ba Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 16:57:35 +0200 Subject: [PATCH 713/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7.5.0=20(#855)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index aa7aa6e..2d583c6 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.4.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.5.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index bb4a9c1..a6992dc 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.4.0 - amd64: ghcr.io/hassio-addons/debian-base:7.4.0 + aarch64: ghcr.io/hassio-addons/debian-base:7.5.0 + amd64: ghcr.io/hassio-addons/debian-base:7.5.0 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 773f8adbbc624b63d6ec279775e2a3b2313b1848 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 07:12:16 +0200 Subject: [PATCH 714/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?12/git=20to=20v1:2.39.5-0+deb12u1=20(#857)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 2d583c6..e7b5f92 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -31,7 +31,7 @@ RUN \ libarchive-tools=3.6.2-1+deb12u1 \ build-essential=12.9 \ colordiff=1.0.20-1 \ - git=1:2.39.2-1.1 \ + git=1:2.39.5-0+deb12u1 \ iputils-ping=3:20221126-1 \ locales=2.36-9+deb12u7 \ mariadb-client=1:10.11.6-0+deb12u1 \ From d5bb6953308b513e86b6debb747a88ca443bbd72 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 10:27:58 +0200 Subject: [PATCH 715/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.9.0=20(#858)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 6817b62..7f1b02a 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.8.3 +esphome==2024.9.0 yamllint==1.35.1 From 2de0da49e5375c993a801cae24360c202c873282 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 09:45:06 +0200 Subject: [PATCH 716/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20emilast/v?= =?UTF-8?q?scode-logfile-highlighter=20to=20v3.3.3=20(#859)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 86d2758..528ef5d 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#3.3.2 +emilast.LogFileHighlighter#3.3.3 esbenp.prettier-vscode#11.0.0 ESPHome.esphome-vscode#2023.9.0 keesschollaart.vscode-home-assistant#1.40.0 From 227068299e3889ffc3082af23bee17e88aa35987 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 06:38:18 +0200 Subject: [PATCH 717/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.9.1=20(#860)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 7f1b02a..dacbd03 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.9.0 +esphome==2024.9.1 yamllint==1.35.1 From 4cbfcf50ec5129ae7f9358084f12a293148867fa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:31:05 +0200 Subject: [PATCH 718/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20home-assi?= =?UTF-8?q?stant/cli=20to=20v4.36.0=20(#862)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index e7b5f92..88a83eb 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -21,7 +21,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 ARG CODE_SERVER_VERSION="v4.92.2" -ARG HA_CLI_VERSION="4.35.0" +ARG HA_CLI_VERSION="4.36.0" # hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ From 5c90b34fd686eb89b5a8a2759e8616604c13d495 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:39:14 +0200 Subject: [PATCH 719/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.93.1=20(#861)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 88a83eb..e9bb378 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.92.2" +ARG CODE_SERVER_VERSION="v4.93.1" ARG HA_CLI_VERSION="4.36.0" # hadolint ignore=SC2181, DL3008 RUN \ From e3e285969c8c410c2d5f1c05d16f0fb527b0c601 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 27 Sep 2024 22:18:46 +0200 Subject: [PATCH 720/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20keesschol?= =?UTF-8?q?laart81/vscode-home-assistant=20to=20v1.40.2=20(#863)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 528ef5d..791a4d1 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#3.3.3 esbenp.prettier-vscode#11.0.0 ESPHome.esphome-vscode#2023.9.0 -keesschollaart.vscode-home-assistant#1.40.0 +keesschollaart.vscode-home-assistant#1.40.2 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From 269cdae8699ea949f0bea5a0788143c9d6abccea Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 27 Sep 2024 23:52:34 +0200 Subject: [PATCH 721/778] =?UTF-8?q?=F0=9F=94=A7=20Update=20add-on=20paths,?= =?UTF-8?q?=20map=20directly=20to=20/config=20(#864)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/config.yaml | 22 +++++++++++++------ .../etc/s6-overlay/s6-rc.d/code-server/finish | 1 - .../etc/s6-overlay/s6-rc.d/init-user/run | 4 +--- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/vscode/config.yaml b/vscode/config.yaml index 85bf0c8..0921ef8 100644 --- a/vscode/config.yaml +++ b/vscode/config.yaml @@ -19,13 +19,21 @@ hassio_api: true hassio_role: manager homeassistant_api: true map: - - addons:rw - - all_addon_configs:rw - - backup:rw - - homeassistant_config:rw - - media:rw - - share:rw - - ssl: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/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=$( Date: Sat, 28 Sep 2024 15:19:47 +0200 Subject: [PATCH 722/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20keesschol?= =?UTF-8?q?laart81/vscode-home-assistant=20to=20v1.41.0=20(#865)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 791a4d1..f1196b1 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#3.3.3 esbenp.prettier-vscode#11.0.0 ESPHome.esphome-vscode#2023.9.0 -keesschollaart.vscode-home-assistant#1.40.2 +keesschollaart.vscode-home-assistant#1.41.0 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From 05aa2182f20070e9ff17289a419539eec76b48f9 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 28 Sep 2024 16:25:22 +0200 Subject: [PATCH 723/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20keesschol?= =?UTF-8?q?laart81/vscode-home-assistant=20to=20v1.41.1=20(#866)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index f1196b1..4b970ae 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#3.3.3 esbenp.prettier-vscode#11.0.0 ESPHome.esphome-vscode#2023.9.0 -keesschollaart.vscode-home-assistant#1.41.0 +keesschollaart.vscode-home-assistant#1.41.1 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From cd0435aa4d97322d88b9d5ef1ce9fc12d871ab06 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Mon, 30 Sep 2024 20:21:40 +0200 Subject: [PATCH 724/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20keesschol?= =?UTF-8?q?laart81/vscode-home-assistant=20to=20v1.41.2=20(#869)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 4b970ae..df3a7c2 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#3.3.3 esbenp.prettier-vscode#11.0.0 ESPHome.esphome-vscode#2023.9.0 -keesschollaart.vscode-home-assistant#1.41.1 +keesschollaart.vscode-home-assistant#1.41.2 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From 503b2b2e8da9cd0e3a2d9fd834d52ab2553eda23 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 16:05:53 +0200 Subject: [PATCH 725/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.9.2=20(#871)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index dacbd03..da590d4 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.9.1 +esphome==2024.9.2 yamllint==1.35.1 From 66d3c2b4d053f821ba209d185af11507995cfe5d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 18:03:32 +0200 Subject: [PATCH 726/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20keesschol?= =?UTF-8?q?laart81/vscode-home-assistant=20to=20v1.41.3=20(#872)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index df3a7c2..7063cc4 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#3.3.3 esbenp.prettier-vscode#11.0.0 ESPHome.esphome-vscode#2023.9.0 -keesschollaart.vscode-home-assistant#1.41.2 +keesschollaart.vscode-home-assistant#1.41.3 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From 553f214871b7c9f4b1fb327d7be0501b3b165e9f Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 1 Oct 2024 22:02:39 +0200 Subject: [PATCH 727/778] Add back symbolic link to /homeassistant for customized workspaces (#874) --- vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run | 2 ++ 1 file changed, 2 insertions(+) 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 e95fdb3..6e560fc 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 @@ -19,6 +19,8 @@ done # Some links to old locations, to not mess with the user's muscle memory ln -s "/config" "${HOME}/config" \ || bashio::log.warning "Failed linking common directory: ${HOME}/config" +ln -s "/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 From 39ec0537fdacd26fb19357b80256c8a6d4cc73e2 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 4 Oct 2024 20:45:53 +0200 Subject: [PATCH 728/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20keesschol?= =?UTF-8?q?laart81/vscode-home-assistant=20to=20v1.42.0=20(#877)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 7063cc4..dc7324f 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#3.3.3 esbenp.prettier-vscode#11.0.0 ESPHome.esphome-vscode#2023.9.0 -keesschollaart.vscode-home-assistant#1.41.3 +keesschollaart.vscode-home-assistant#1.42.0 lukas-tr.materialdesignicons-intellisense#4.1.0 netcorext.uuid-generator#0.0.5 oderwat.indent-rainbow#8.3.1 From 07661a0f0a8c0c74014122bf43822e664748610a Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 5 Oct 2024 12:02:52 +0200 Subject: [PATCH 729/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20keesschol?= =?UTF-8?q?laart81/vscode-home-assistant=20to=20v1.43.0=20(#881)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index dc7324f..561e1c5 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,7 +1,7 @@ emilast.LogFileHighlighter#3.3.3 esbenp.prettier-vscode#11.0.0 ESPHome.esphome-vscode#2023.9.0 -keesschollaart.vscode-home-assistant#1.42.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 From a8ecf3c94ae9f6c242d2fc2a44d635b60dd30640 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 12:15:07 +0200 Subject: [PATCH 730/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20emilast/v?= =?UTF-8?q?scode-logfile-highlighter=20to=20v3.3.4=20(#878)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions index 561e1c5..79b84e8 100644 --- a/vscode/vscode.extensions +++ b/vscode/vscode.extensions @@ -1,4 +1,4 @@ -emilast.LogFileHighlighter#3.3.3 +emilast.LogFileHighlighter#3.3.4 esbenp.prettier-vscode#11.0.0 ESPHome.esphome-vscode#2023.9.0 keesschollaart.vscode-home-assistant#1.43.0 From 3c30451ee8b23dd803150765e5894147aac0961f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 12 Oct 2024 10:48:02 +0200 Subject: [PATCH 731/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7.5.1=20(#885)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index e9bb378..12f09e9 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.5.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.5.1 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index a6992dc..1198a3e 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.5.0 - amd64: ghcr.io/hassio-addons/debian-base:7.5.0 + aarch64: ghcr.io/hassio-addons/debian-base:7.5.1 + amd64: ghcr.io/hassio-addons/debian-base:7.5.1 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 073761022bb25b6ed019c346c972f00e409809b1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 09:25:24 +0200 Subject: [PATCH 732/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.10.0=20(#887)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index da590d4..b249a30 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.9.2 +esphome==2024.10.0 yamllint==1.35.1 From d53e4e46e517560123fc691c61a1464800597ad8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 07:10:41 +0200 Subject: [PATCH 733/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.10.1=20(#889)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index b249a30..1658f2b 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.10.0 +esphome==2024.10.1 yamllint==1.35.1 From 2f103e759c9abc5e75d9e9ba7da7366cd842dd5e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 22:47:41 +0200 Subject: [PATCH 734/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.10.2=20(#890)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 1658f2b..84620b2 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.10.1 +esphome==2024.10.2 yamllint==1.35.1 From c3774adba7d49e1909e8befcb8e7680746224cec Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 00:52:52 +0100 Subject: [PATCH 735/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.95.1=20(#893)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 12f09e9..cb6dce7 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.93.1" +ARG CODE_SERVER_VERSION="v4.95.1" ARG HA_CLI_VERSION="4.36.0" # hadolint ignore=SC2181, DL3008 RUN \ From 18882c98a9d37349a816629ceb6c0b5c80bfcdf8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 16:07:02 +0100 Subject: [PATCH 736/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.10.3=20(#895)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 84620b2..457ca71 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.10.2 +esphome==2024.10.3 yamllint==1.35.1 From 1ec7770b6fab1007efdc0654b35e9ee4d9e69c89 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 9 Nov 2024 16:10:53 +0100 Subject: [PATCH 737/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?12/openssl=20to=20v3.0.15-1~deb12u1=20(#897)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index cb6dce7..0bdbd63 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -39,7 +39,7 @@ RUN \ net-tools=2.10-0.1 \ nmap=7.93+dfsg1-1 \ openssh-client=1:9.2p1-2+deb12u3 \ - openssl=3.0.14-1~deb12u2 \ + openssl=3.0.15-1~deb12u1 \ python3-dev=3.11.2-1+b1 \ python3=3.11.2-1+b1 \ unzip=6.0-28 \ From 65c039b1a2695e3a2c1a107609fd6cd0b8bbea9a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 9 Nov 2024 16:40:54 +0100 Subject: [PATCH 738/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?12/iputils-ping=20to=20v3:20221126-1+deb12u1=20(#896)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 0bdbd63..55c48e4 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -32,7 +32,7 @@ RUN \ build-essential=12.9 \ colordiff=1.0.20-1 \ git=1:2.39.5-0+deb12u1 \ - iputils-ping=3:20221126-1 \ + iputils-ping=3:20221126-1+deb12u1 \ locales=2.36-9+deb12u7 \ mariadb-client=1:10.11.6-0+deb12u1 \ mosquitto-clients=2.0.11-1.2+deb12u1 \ From 7dd24e5568f972910cbf8962978c9807bcd486d3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 10 Nov 2024 12:03:27 +0100 Subject: [PATCH 739/778] Migrate renovate config (#899) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] --- .github/renovate.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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", From 29b643954455b309f943ef30e53e86d25f569e02 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 23:30:01 +0100 Subject: [PATCH 740/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7.6.2=20(#898)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Franck Nijhof --- vscode/Dockerfile | 4 ++-- vscode/build.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 55c48e4..4f1d1aa 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.6.2 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -28,7 +28,7 @@ RUN \ \ && 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 \ diff --git a/vscode/build.yaml b/vscode/build.yaml index 1198a3e..25d0afb 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.6.2 + amd64: ghcr.io/hassio-addons/debian-base:7.6.2 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 3e764f26bd0b52147a825f5dd94c5b53d47a0e06 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 23:47:37 +0100 Subject: [PATCH 741/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.96.2=20(#901)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 4f1d1aa..4188611 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.95.1" +ARG CODE_SERVER_VERSION="v4.96.2" ARG HA_CLI_VERSION="4.36.0" # hadolint ignore=SC2181, DL3008 RUN \ From 61342632eb279cca0ef430021c891119966d6a25 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 24 Dec 2024 02:04:13 +0100 Subject: [PATCH 742/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.12.2=20(#903)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 457ca71..60f0b74 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.10.3 +esphome==2024.12.2 yamllint==1.35.1 From 50ce3ff972aab52cfb2819df6dd3f79bc53740f4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 5 Jan 2025 19:32:40 +0100 Subject: [PATCH 743/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20emilast/v?= =?UTF-8?q?scode-logfile-highlighter=20to=20v3.4.0=20(#912)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/vscode.extensions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 988efe9542fe399782ccc1932657b54f30f43a39 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 10:54:13 +0100 Subject: [PATCH 744/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7.6.3=20(#911)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 4188611..2c839f1 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.6.2 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.6.3 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index 25d0afb..650c8ec 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.6.2 - amd64: ghcr.io/hassio-addons/debian-base:7.6.2 + aarch64: ghcr.io/hassio-addons/debian-base:7.6.3 + amd64: ghcr.io/hassio-addons/debian-base:7.6.3 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From f4ed96a2f83aa70d5ddbbfaa78a014005fd8b29b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 02:22:33 +0100 Subject: [PATCH 745/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?12/openssh=20to=20v1:9.2p1-2+deb12u4=20(#913)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 2c839f1..63b5556 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -38,7 +38,7 @@ RUN \ 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 \ + openssh-client=1:9.2p1-2+deb12u4 \ openssl=3.0.15-1~deb12u1 \ python3-dev=3.11.2-1+b1 \ python3=3.11.2-1+b1 \ From c7f69e61595d6a045f3dee1b691d64bf43b6da94 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 19 Jan 2025 19:33:09 +0100 Subject: [PATCH 746/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2024.12.4=20(#914)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 60f0b74..b7a4932 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.12.2 +esphome==2024.12.4 yamllint==1.35.1 From e8ec47b534d9deedfc2f59e3a5d97a2332cc12b0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 19 Jan 2025 22:21:52 +0100 Subject: [PATCH 747/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7.7.0=20(#916)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 63b5556..d2a4c84 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.6.3 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.7.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index 650c8ec..484706a 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.6.3 - amd64: ghcr.io/hassio-addons/debian-base:7.6.3 + aarch64: ghcr.io/hassio-addons/debian-base:7.7.0 + amd64: ghcr.io/hassio-addons/debian-base:7.7.0 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 3faac467382dcad40bdbbb3ef6b2a196b221d0c0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 21:38:59 +0100 Subject: [PATCH 748/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.96.4=20(#917)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index d2a4c84..0f1c78e 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.96.2" +ARG CODE_SERVER_VERSION="v4.96.4" ARG HA_CLI_VERSION="4.36.0" # hadolint ignore=SC2181, DL3008 RUN \ From 1b6cfddc89210d067a108746bddab043e9393395 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2025 21:16:47 +0100 Subject: [PATCH 749/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?12/git=20to=20v1:2.39.5-0+deb12u2=20(#919)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 0f1c78e..0a7284e 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -31,7 +31,7 @@ RUN \ libarchive-tools=3.6.2-1+deb12u2 \ build-essential=12.9 \ colordiff=1.0.20-1 \ - git=1:2.39.5-0+deb12u1 \ + 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 \ From 04eb8873bbdae1b9c11fc0fcd1832112c8699c03 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 16 Feb 2025 18:37:29 +0100 Subject: [PATCH 750/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7.7.1=20(#923)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 0a7284e..a6016c7 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.7.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.7.1 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index 484706a..9f94450 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.7.0 - amd64: ghcr.io/hassio-addons/debian-base:7.7.0 + aarch64: ghcr.io/hassio-addons/debian-base:7.7.1 + amd64: ghcr.io/hassio-addons/debian-base:7.7.1 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From a6ba8447b09dcd98e76504074e3c875aa3256f28 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 16 Feb 2025 20:53:10 +0100 Subject: [PATCH 751/778] :fireworks: Updates maintenance/license year to 2025 (#924) --- LICENSE.md | 2 +- README.md | 4 ++-- vscode/.README.j2 | 2 +- vscode/DOCS.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) 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 From 8a84bb3be12228eb0d2c2328e8f9e5c89fd66473 Mon Sep 17 00:00:00 2001 From: Klaus Zipfel <30482165+systemofapwne@users.noreply.github.com> Date: Sun, 16 Feb 2025 22:34:40 +0100 Subject: [PATCH 752/778] user-init: Safeguarded linking directories via the --no-dereference flag to avoid link-loops. Catching linking of .gitignore and .ssh via a warning, so that s6 does does not crash (and with it, the container) (#922) --- vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 From 0b1ce33c30c3490813551f31c7598c43d513e392 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Feb 2025 19:13:53 +0100 Subject: [PATCH 753/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?12/openssh=20to=20v1:9.2p1-2+deb12u5=20(#925)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index a6016c7..052eb3a 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -38,7 +38,7 @@ RUN \ 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+deb12u4 \ + openssh-client=1:9.2p1-2+deb12u5 \ openssl=3.0.15-1~deb12u1 \ python3-dev=3.11.2-1+b1 \ python3=3.11.2-1+b1 \ From 7e23ab4981ff1b3e7643b29c2b910fff78e4f75d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Feb 2025 04:53:31 +0100 Subject: [PATCH 754/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.97.2=20(#927)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 052eb3a..c5a7d2b 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.96.4" +ARG CODE_SERVER_VERSION="v4.97.2" ARG HA_CLI_VERSION="4.36.0" # hadolint ignore=SC2181, DL3008 RUN \ From 1bff9b634bf5c39ebbd103e1885ee046e80df3a3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Feb 2025 06:36:43 +0100 Subject: [PATCH 755/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20home-assi?= =?UTF-8?q?stant/cli=20to=20v4.37.0=20(#926)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index c5a7d2b..60920bf 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -21,7 +21,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 ARG CODE_SERVER_VERSION="v4.97.2" -ARG HA_CLI_VERSION="4.36.0" +ARG HA_CLI_VERSION="4.37.0" # hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ From 00ec14191d2487de829b0dd93f9865b6a59b3f09 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Feb 2025 12:54:17 +0100 Subject: [PATCH 756/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2025=20(#928)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index b7a4932..c571b82 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2024.12.4 +esphome==2025.2.0 yamllint==1.35.1 From 55bcb1390f9310c03652a8a9e45c95631594e345 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 20 Feb 2025 12:57:40 +0100 Subject: [PATCH 757/778] =?UTF-8?q?Revert=20"=E2=AC=86=EF=B8=8F=20Update?= =?UTF-8?q?=20cdr/code-server=20to=20v4.97.2=20(#927)"=20(#930)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 60920bf..a0c2587 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.97.2" +ARG CODE_SERVER_VERSION="v4.96.4" ARG HA_CLI_VERSION="4.37.0" # hadolint ignore=SC2181, DL3008 RUN \ From 444597e4671fbec5b9730b9bb13b1165876b25ee Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 8 Mar 2025 21:27:46 +0100 Subject: [PATCH 758/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2025.2.2=20(#933)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index c571b82..c4b4e5b 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2025.2.0 +esphome==2025.2.2 yamllint==1.35.1 From 2129ac43e5e16a6ad41e688d426d61d700002567 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Mar 2025 09:03:54 +0100 Subject: [PATCH 759/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.98.0=20(#934)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index a0c2587..b2b376b 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.96.4" +ARG CODE_SERVER_VERSION="v4.98.0" ARG HA_CLI_VERSION="4.37.0" # hadolint ignore=SC2181, DL3008 RUN \ From a01f443514265c9ac8f5f04603814c902aac8152 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Mar 2025 09:27:44 +0100 Subject: [PATCH 760/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20yamllint?= =?UTF-8?q?=20to=20v1.36.0=20(#935)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index c4b4e5b..b86f0f9 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ esphome==2025.2.2 -yamllint==1.35.1 +yamllint==1.36.0 From 76faed90d1b02f5db1a3dcbd74ef101728664d53 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 16 Mar 2025 19:30:37 +0100 Subject: [PATCH 761/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20debian=5F?= =?UTF-8?q?12/mariadb-client=20to=20v1:10.11.11-0+deb12u1=20(#937)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index b2b376b..819389c 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -34,7 +34,7 @@ RUN \ 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 \ From 2210709d9b48123b3ba712eee638638eca99f229 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 16 Mar 2025 19:30:47 +0100 Subject: [PATCH 762/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.98.2=20(#936)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 819389c..9a80cb5 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.98.0" +ARG CODE_SERVER_VERSION="v4.98.2" ARG HA_CLI_VERSION="4.37.0" # hadolint ignore=SC2181, DL3008 RUN \ From 8eb82786d7e2e9c8683fa29f8b4e27802b984eae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 16 Mar 2025 19:45:17 +0100 Subject: [PATCH 763/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20yamllint?= =?UTF-8?q?=20to=20v1.36.1=20(#938)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index b86f0f9..671b328 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ esphome==2025.2.2 -yamllint==1.36.0 +yamllint==1.36.1 From 8a086415ed55c0bb0ab19ea746d6d6a0466f399a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Mar 2025 11:40:08 +0100 Subject: [PATCH 764/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20yamllint?= =?UTF-8?q?=20to=20v1.36.2=20(#939)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 671b328..e856a8f 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ esphome==2025.2.2 -yamllint==1.36.1 +yamllint==1.36.2 From da0e6587a5095259c18da4b17506fa431251aa87 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Mar 2025 12:21:12 +0100 Subject: [PATCH 765/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2025.3.0=20(#940)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index e856a8f..223b126 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2025.2.2 +esphome==2025.3.0 yamllint==1.36.2 From df15aa9b5cf264a3f90b675cf04823a74b132599 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Mar 2025 12:28:28 +0100 Subject: [PATCH 766/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7.8.0=20(#941)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 9a80cb5..89e73d5 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.7.1 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.8.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index 9f94450..57deda5 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.7.1 - amd64: ghcr.io/hassio-addons/debian-base:7.7.1 + aarch64: ghcr.io/hassio-addons/debian-base:7.8.0 + amd64: ghcr.io/hassio-addons/debian-base:7.8.0 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From 0531db3bc494644cf238aa9125599ddc747e5bde Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 23 Mar 2025 19:11:20 +0100 Subject: [PATCH 767/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20yamllint?= =?UTF-8?q?=20to=20v1.37.0=20(#944)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 223b126..5e1d078 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ esphome==2025.3.0 -yamllint==1.36.2 +yamllint==1.37.0 From ec80926453c5a1c3f97ae8a543a0ed8f777af1d3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 23 Mar 2025 19:18:37 +0100 Subject: [PATCH 768/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2025.3.1=20(#943)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 5e1d078..3c9907c 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2025.3.0 +esphome==2025.3.1 yamllint==1.37.0 From b259150fbce1d36b853aa7d28ae2a1db4bce2293 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 29 Mar 2025 07:55:47 +0100 Subject: [PATCH 769/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2025.3.2=20(#945)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 3c9907c..70bfb44 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2025.3.1 +esphome==2025.3.2 yamllint==1.37.0 From 8957ad50fdd31389270353c5fd42c5e297344e24 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 22:47:25 +0200 Subject: [PATCH 770/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7.8.1=20(#948)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 89e73d5..ac395cc 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.8.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.8.1 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index 57deda5..01693c2 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.8.0 - amd64: ghcr.io/hassio-addons/debian-base:7.8.0 + aarch64: ghcr.io/hassio-addons/debian-base:7.8.1 + amd64: ghcr.io/hassio-addons/debian-base:7.8.1 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev From a82de999c3148eb16178bd0febe4f8c8a07ae2a9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 23:52:31 +0200 Subject: [PATCH 771/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2025.3.3=20(#947)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 70bfb44..eb5d632 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2025.3.2 +esphome==2025.3.3 yamllint==1.37.0 From 5521843c6e89291795b2869b97fb06d784643991 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 12 Apr 2025 12:18:01 +0200 Subject: [PATCH 772/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.99.2=20(#950)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index ac395cc..105a994 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.98.2" +ARG CODE_SERVER_VERSION="v4.99.2" ARG HA_CLI_VERSION="4.37.0" # hadolint ignore=SC2181, DL3008 RUN \ From 76bf8323f72ecf639b50550809314ea554f73a9a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 14:14:27 +0200 Subject: [PATCH 773/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/h?= =?UTF-8?q?assio-addons/debian-base=20Docker=20tag=20to=20v7.8.2=20(#953)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- vscode/build.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 105a994..c4769db 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.8.1 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:7.8.2 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/vscode/build.yaml b/vscode/build.yaml index 01693c2..30d90d3 100644 --- a/vscode/build.yaml +++ b/vscode/build.yaml @@ -1,7 +1,7 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/debian-base:7.8.1 - amd64: ghcr.io/hassio-addons/debian-base:7.8.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 From af38f1b5c166eab50fc99e3724fb914822079f82 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 14:26:49 +0200 Subject: [PATCH 774/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20home-assi?= =?UTF-8?q?stant/cli=20to=20v4.38.0=20(#951)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index c4769db..7bd699e 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -21,7 +21,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 ARG CODE_SERVER_VERSION="v4.99.2" -ARG HA_CLI_VERSION="4.37.0" +ARG HA_CLI_VERSION="4.38.0" # hadolint ignore=SC2181, DL3008 RUN \ apt-get update \ From af654c84fa9f2641b6b3474106d8ee7b7215fb87 Mon Sep 17 00:00:00 2001 From: Guillaume Rischard Date: Tue, 15 Apr 2025 20:51:34 -0400 Subject: [PATCH 775/778] Add python-venv to dockerfile (#954) --- vscode/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 7bd699e..7deea8f 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -41,6 +41,7 @@ RUN \ 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 \ From 6c8a091bf1a178732656e1cda97c1618ab994508 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Apr 2025 06:18:16 +0200 Subject: [PATCH 776/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2025.4.0=20(#955)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index eb5d632..9983e2e 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2025.3.3 +esphome==2025.4.0 yamllint==1.37.0 From 3e7f45870ec22fd9b1923473385f8fd23a0e47ab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 19 Apr 2025 10:09:33 +0200 Subject: [PATCH 777/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20cdr/code-?= =?UTF-8?q?server=20to=20v4.99.3=20(#956)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/Dockerfile b/vscode/Dockerfile index 7deea8f..4eea0cc 100755 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -20,7 +20,7 @@ COPY vscode.extensions /root/vscode.extensions # Setup base system ARG BUILD_ARCH=amd64 -ARG CODE_SERVER_VERSION="v4.99.2" +ARG CODE_SERVER_VERSION="v4.99.3" ARG HA_CLI_VERSION="4.38.0" # hadolint ignore=SC2181, DL3008 RUN \ From d4aa8758d110798b2dc6eb46e85f078802ddf48f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 29 Apr 2025 13:40:16 +0200 Subject: [PATCH 778/778] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esphome?= =?UTF-8?q?=20to=20v2025.4.1=20(#961)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vscode/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vscode/requirements.txt b/vscode/requirements.txt index 9983e2e..0493acc 100644 --- a/vscode/requirements.txt +++ b/vscode/requirements.txt @@ -1,2 +1,2 @@ -esphome==2025.4.0 +esphome==2025.4.1 yamllint==1.37.0