Bump version to 2023.6.1

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

.devcontainer/Dockerfile

@@ -0,0 +1,10 @@
+FROM ghcr.io/home-assistant/devcontainer:addons
+
+RUN \
+  apt-get update \
+  && apt-get install -y --no-install-recommends \
+    python3-pip
+
+COPY script/requirements.txt /
+
+RUN pip install -r /requirements.txt

.devcontainer/devcontainer.json

@@ -0,0 +1,36 @@
+{
+  "name": "ESPHome Home Assistant add-on devcontainer",
+  "image": "ghcr.io/esphome/devcontainer:addons",
+  "appPort": [
+    "7123:8123",
+    "7357:4357"
+  ],
+  "postStartCommand": "bash devcontainer_bootstrap",
+  "runArgs": [
+    "-e",
+    "GIT_EDITOR=code --wait",
+    "--privileged"
+  ],
+  "containerEnv": {
+    "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
+  },
+  "extensions": [
+    "timonwong.shellcheck",
+    "esbenp.prettier-vscode"
+  ],
+  "mounts": [
+    "type=volume,target=/var/lib/docker"
+  ],
+  "settings": {
+    "terminal.integrated.profiles.linux": {
+      "zsh": {
+        "path": "/usr/bin/zsh"
+      }
+    },
+    "terminal.integrated.defaultProfile.linux": "zsh",
+    "editor.formatOnPaste": false,
+    "editor.formatOnSave": true,
+    "editor.formatOnType": true,
+    "files.trimTrailingWhitespace": true
+  }
+}

.github/workflows/bump-version.yml

@@ -6,18 +6,36 @@ on:
       version:
         description: The version to release
         required: true
+      content:
+        description: The content of the release-notes
+        required: true
 
 jobs:
   create-release:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-    - uses: actions/checkout@v3.0.2
+    - uses: actions/checkout@v3.5.3
     - uses: actions/setup-python@v4
       with:
         python-version: '3.x'
     - run: pip install -r script/requirements.txt
     - run: script/bump-version.py ${{ github.event.inputs.version }}
+    - name: Write Beta changelog
+      run: |
+        cat > esphome-beta/CHANGELOG.md << 'EOF'
+        ## ${{ github.event.inputs.version }}
+
+        ${{ github.event.inputs.content }}
+        EOF
+    - name: Write Stable changelog
+      if: ${{ !contains(github.event.inputs.version, 'b') }}
+      run: |
+        cat > esphome/CHANGELOG.md << 'EOF'
+        ## ${{ github.event.inputs.version }}
+
+        ${{ github.event.inputs.content }}
+        EOF
     - name: Commit version bump
       id: commit_version
       run: |
@@ -28,8 +46,7 @@ jobs:
         git push
         COMMIT=$(git rev-parse HEAD)
         echo "::set-output name=commit_sha::${COMMIT}"
-    - if: ${{ contains(github.event.inputs.version, 'b') }}
-      name: Create Beta Release
+    - name: Create a Release
       uses: actions/create-release@v1.1.4
       continue-on-error: true
       env:
@@ -37,18 +54,6 @@ jobs:
       with:
         tag_name: ${{ github.event.inputs.version }}
         release_name: ${{ github.event.inputs.version }}
-        body: 'See https://beta.esphome.io/changelog/index.html'
-        prerelease: true
-        commitish: ${{ steps.commit_version.outputs.commit_sha }}
-    - if: ${{ !contains(github.event.inputs.version, 'b') }}
-      name: Create Stable Release
-      uses: actions/create-release@v1.1.4
-      continue-on-error: true
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ github.event.inputs.version }}
-        release_name: ${{ github.event.inputs.version }}
-        body: 'See https://esphome.io/changelog/index.html'
-        prerelease: false
+        body: ${{ github.event.inputs.content }}
+        prerelease: ${{ contains(github.event.inputs.version, 'b') }}
         commitish: ${{ steps.commit_version.outputs.commit_sha }}

.github/workflows/devcontainer-build.yaml

@@ -0,0 +1,41 @@
+name: Build devcontainer image
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - .devcontainer/**
+  schedule:
+    - cron: '0 0 1 * *'
+  pull_request:
+    branches:
+      - main
+    paths:
+      - .devcontainer/**
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3.5.3
+      - name: Log in to the GitHub container registry
+        uses: docker/login-action@v2.2.0
+        if: github.event_name != 'pull_request'
+        with:
+            registry: ghcr.io
+            username: ${{ github.repository_owner }}
+            password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2.2.0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2.7.0
+      - name: Build and Push
+        uses: docker/build-push-action@v4.1.1
+        with:
+          context: .
+          file: .devcontainer/Dockerfile
+          tags: ghcr.io/${{ github.repository_owner }}/devcontainer:addons
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
             channel: dev
     steps:
       - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v3.5.3
       - name: 🛠 Setup Python
         uses: actions/setup-python@v4
         with:
@@ -29,6 +29,6 @@ jobs:
       - name: 🛠 Generate files from template
         run: python script/generate.py ${{ matrix.channels.channel }}
       - name: 🚀 Run Home Assistant Add-on Lint on ${{ matrix.channels.channel }}
-        uses: frenck/action-addon-linter@v2.9.0
+        uses: frenck/action-addon-linter@v2.13.1
         with:
           path: "./${{ matrix.channels.folder }}"

.vscode/tasks.json

@@ -0,0 +1,19 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Start Home Assistant",
+      "type": "shell",
+      "command": "supervisor_run",
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      },
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      },
+      "problemMatcher": []
+    }
+  ]
+}

esphome-beta/CHANGELOG.md

@@ -1 +1,5 @@
-See https://esphome.io/changelog/index.html
+## 2023.6.1
+
+- Make ethernet_info work with esp-idf framework [esphome#4976](https://github.com/esphome/esphome/pull/4976) by [@HeMan](https://github.com/HeMan)
+- display: fix white screen on binary displays [esphome#4991](https://github.com/esphome/esphome/pull/4991) by [@ayufan](https://github.com/ayufan)
+

esphome-beta/DOCS.md

@@ -1,5 +1,4 @@
-# Home Assistant Community Add-on: ESPHome
-
+# ESPHome Add-on
 ## Installation
 
 The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.

esphome-beta/README.md

@@ -1,9 +1,8 @@
-# ESPHome Home Assistant Add-On
+# ESPHome Beta Add-On
 
-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo][logo]][website]
 
-[![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
-[![GitHub Release][releases-shield]][releases]
+[![GitHub stars][github-stars-shield]][repository]
 [![Discord][discord-shield]][discord]
 
 ## About
@@ -14,10 +13,10 @@ is write YAML configuration files; the rest (over-the-air updates, compiling) is
 handled by ESPHome.
 
 <p align="center">
-<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/screenshot.png" width="700px"></img>
 </p>
 
-[View the ESPHome documentation](https://esphome.io/)
+[View the ESPHome documentation][website]
 
 ## Example
 
@@ -26,15 +25,17 @@ firmware. For example, to include a [DHT22][dht22].
 temperature and humidity sensor, you just need to include 8 lines of YAML
 in your configuration file:
 
-<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/dht-example.png" width="500px"></img>
 
 Then just click UPLOAD and the sensor will magically appear in Home Assistant:
 
-<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/temperature-humidity.png" width="600px"></img>
 
-[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
-[dht22]: https://esphome.io/components/sensor/dht.html
 [discord]: https://discord.gg/KhAMKrd
-[releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
-[releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://beta.esphome.io/components/sensor/dht.html
+[releases]: https://beta.esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/logo.png
+[website]: https://beta.esphome.io/

esphome-beta/config.yaml

@@ -1,37 +1,42 @@
 ---
-advanced: true
+url: https://beta.esphome.io/
 arch:
 - amd64
 - armv7
 - aarch64
-auth_api: true
-backup_exclude:
-- '*/*/'
-description: Beta version of ESPHome add-on
 hassio_api: true
+auth_api: true
 host_network: true
-image: ghcr.io/esphome/esphome-hassio-{arch}
 ingress: true
 ingress_port: 0
+panel_icon: mdi:chip
+uart: true
+ports:
+  6052/tcp: null
 map:
 - ssl:ro
 - config:rw
-name: ESPHome (beta)
-panel_icon: mdi:chip
-ports:
-  6052/tcp: null
-ports_description:
-  6052/tcp: Web interface (not required for Home Assistant ingress)
+discovery:
+- esphome
 schema:
-  certfile: str?
-  keyfile: str?
-  leave_front_door_open: bool?
-  relative_url: str?
-  ssl: bool?
   status_use_ping: bool?
   streamer_mode: bool?
+  home_assistant_dashboard_integration: bool?
+  default_compile_process_limit: int(1,)?
+  ssl: bool?
+  certfile: str?
+  keyfile: str?
+  relative_url: str?
+  leave_front_door_open: bool?
+backup_exclude:
+- '*/*/'
+init: false
+name: ESPHome (beta)
+version: 2023.6.1
 slug: esphome-beta
+description: Beta version of ESPHome add-on
+image: ghcr.io/esphome/esphome-hassio
 stage: experimental
-uart: true
-url: https://beta.esphome.io/
-version: 2022.9.2
+advanced: true
+options:
+  home_assistant_dashboard_integration: false

esphome-beta/translations/en.yaml

@@ -0,0 +1,67 @@
+---
+configuration:
+  certfile:
+    name: Certificate file
+    description: >-
+      The certificate file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  default_compile_process_limit:
+    name: Default compile process limit
+    description: >-
+      The default compile process limit. This is the maximum number of
+      simultaneous compile processes that ESPHome will run.
+  esphome_fork:
+    name: Install ESPHome from a fork or branch
+    description: >-
+      For example to test a pull request, use `pull/XXXX/head` where `XXXX` is
+      the PR number, or you can specify the username of the fork owner and
+      branch `username:branch` which assumes the repository is named `esphome`
+      still.
+
+      If you need to test the latest commit on dev branch before the image is
+      updated you can enter `dev` here.
+
+      Please note that the fork or branch you are using **must** be up to
+      date with ESPHome dev or the add-on **will not start**.
+  home_assistant_dashboard_integration:
+    name: Home Assistant Dashboard Integration
+    description: >-
+      Enables/Disables the ESPHome dashboard integrating with Home Assistant
+      for automatic configuration of devices and device updates. If you use
+      multiple version of the ESPHome add-on, make sure it is enabled on a
+      single add-on only.
+  keyfile:
+    name: Private key file
+    description: >-
+      The private key file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  leave_front_door_open:
+    name: Disable external authentication
+    description: >-
+      Disables external authentication when having opened the add-on
+      on an external port. **WARNING**: This is a security risk!
+  relative_url:
+    name: Relative URL
+    description: >-
+      Host the ESPHome dashboard under a relative URL, so that it can be
+      integrated into existing web proxies like NGINX under a relative URL.
+      Defaults to `/`.
+  ssl:
+    name: SSL
+    description: >-
+      Enables/Disables SSL (HTTPS) on the web interface.
+  status_use_ping:
+    name: Use ping for status
+    description: >-
+      By default the dashboard uses mDNS to check if nodes are online. This does
+      not work across subnets unless your router supports mDNS forwarding
+      or avahi. Enabling this option will use ICMP ping to check if nodes are
+      online.
+  streamer_mode:
+    name: Streamer mode
+    description: >-
+      Enables/Disables streamer mode, which makes ESPHome hide all
+      potentially private information. So for example WiFi (B)SSIDs (which could
+      be used to find your location), usernames, etc.
+network:
+  6052/tcp: Web interface (to use without Home Assistant)

esphome-dev/DOCS.md

@@ -1,40 +1,31 @@
-# Home Assistant Community Add-on: ESPHome
+# ESPHome DEV add on
 
-## Installation
+This is **development** version of the ESPHome add on.
 
-The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.
+To deploy production nodes please use mainstream release add on.
 
-1. Search for the “ESPHome” add-on in the Supervisor add-on store.
-2. Press install to download the add-on and unpack it on your machine. This can take some time.
-3. Optional: If you're using SSL/TLS certificates and want to encrypt your communication to this add-on, please enter `true` into the `ssl` field and set the `fullchain` and `certfile` options accordingly.
-4. Start the add-on, check the logs of the add-on to see if everything went well.
-5. Click "OPEN WEB UI" to open the ESPHome dashboard. You will be asked for your Home Assistant credentials - ESPHome uses Home Assistant's authentication system to log you in.
-
-You can view the ESPHome documentation at https://esphome.io/
+The add on uses a version of ESPHome built automatically every day at 02:00 UTC. and is used to test components in development. See the `esphome_fork` configuration below to properly configure the add on. Once you update the configuration make sure to rebuild the image.
 
 ## Configuration
 
 **Note**: _Remember to restart the add-on when the configuration is changed._
 
-Example add-on configuration:
-
-```json
-{
-  "ssl": false,
-  "certfile": "fullchain.pem",
-  "keyfile": "privkey.pem"
-}
-```
-
 ### Option: `esphome_fork`
 
 Install ESPHome from a fork or branch.
 For example to test a pull request, use `pull/XXXX/head` where `XXXX` is the PR number,
 or you can specify the username of the fork owner and branch `username:branch` which
-assumes the repository is named `esphome` still. 
+assumes the repository is named `esphome` still.
+
+If you need to test the latest commit on dev branch before the image is updated you can enter `dev` here.
 
 Please note that the fork or branch you are using **must** be up to date with ESPHome dev
-or the add-on **will not start**. 
+or the add-on **will not start**.
+
+
+## General ESPHome add on configurations
+
+General options also available in other versions.
 
 ### Option: `ssl`
 

esphome-dev/README.md

@@ -1,9 +1,8 @@
-# ESPHome Home Assistant Add-On
+# ESPHome Dev Add-On
 
-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo][logo]][website]
 
-[![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
-[![GitHub Release][releases-shield]][releases]
+[![GitHub stars][github-stars-shield]][repository]
 [![Discord][discord-shield]][discord]
 
 ## About
@@ -14,10 +13,10 @@ is write YAML configuration files; the rest (over-the-air updates, compiling) is
 handled by ESPHome.
 
 <p align="center">
-<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/screenshot.png" width="700px"></img>
 </p>
 
-[View the ESPHome documentation](https://esphome.io/)
+[View the ESPHome documentation][website]
 
 ## Example
 
@@ -26,15 +25,17 @@ firmware. For example, to include a [DHT22][dht22].
 temperature and humidity sensor, you just need to include 8 lines of YAML
 in your configuration file:
 
-<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/dht-example.png" width="500px"></img>
 
 Then just click UPLOAD and the sensor will magically appear in Home Assistant:
 
-<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
 
-[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
-[dht22]: https://esphome.io/components/sensor/dht.html
 [discord]: https://discord.gg/KhAMKrd
-[releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
-[releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://next.esphome.io/components/sensor/dht.html
+[releases]: https://next.esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/logo.png
+[website]: https://next.esphome.io/

esphome-dev/build.yaml

@@ -1,5 +1,5 @@
 ---
 build_from:
-  aarch64: ghcr.io/esphome/esphome-hassio-aarch64:dev
-  amd64: ghcr.io/esphome/esphome-hassio-amd64:dev
-  armv7: ghcr.io/esphome/esphome-hassio-armv7:dev
+  aarch64: ghcr.io/esphome/esphome-hassio:dev
+  amd64: ghcr.io/esphome/esphome-hassio:dev
+  armv7: ghcr.io/esphome/esphome-hassio:dev

esphome-dev/config.yaml

@@ -1,37 +1,42 @@
 ---
-advanced: true
+url: https://next.esphome.io/
 arch:
 - amd64
 - armv7
 - aarch64
-auth_api: true
-backup_exclude:
-- '*/*/'
-description: Development version of ESPHome add-on
 hassio_api: true
+auth_api: true
 host_network: true
 ingress: true
 ingress_port: 0
+panel_icon: mdi:chip
+uart: true
+ports:
+  6052/tcp: null
 map:
 - ssl:ro
 - config:rw
-name: ESPHome (dev)
-panel_icon: mdi:chip
-ports:
-  6052/tcp: null
-ports_description:
-  6052/tcp: Web interface (not required for Home Assistant ingress)
+discovery:
+- esphome
 schema:
-  certfile: str?
-  esphome_fork: str?
-  keyfile: str?
-  leave_front_door_open: bool?
-  relative_url: str?
-  ssl: bool?
   status_use_ping: bool?
   streamer_mode: bool?
-slug: esphome-dev
-stage: experimental
-uart: true
-url: https://next.esphome.io/
+  home_assistant_dashboard_integration: bool?
+  default_compile_process_limit: int(1,)?
+  esphome_fork: str?
+  ssl: bool?
+  certfile: str?
+  keyfile: str?
+  relative_url: str?
+  leave_front_door_open: bool?
+backup_exclude:
+- '*/*/'
+init: false
+name: ESPHome (dev)
 version: dev
+slug: esphome-dev
+description: Development version of ESPHome add-on
+stage: experimental
+advanced: true
+options:
+  home_assistant_dashboard_integration: false

esphome-dev/rootfs/etc/cont-init.d/30-esphome-fork.sh

@@ -25,10 +25,11 @@ if bashio::config.has_value 'esphome_fork'; then
     curl -L -o /tmp/esphome.tar.gz "${full_url}" -qq \
       || bashio::exit.nok "Failed downloading ESPHome fork."
     bashio::log.info "Installing ESPHome from fork '${esphome_fork}' (${full_url})..."
-    mkdir /esphome-fork
-    tar -zxf /tmp/esphome.tar.gz -C /esphome-fork --strip-components=1 \
+    rm -rf /esphome || bashio::exit.nok "Failed to remove ESPHome."
+    mkdir /esphome
+    tar -zxf /tmp/esphome.tar.gz -C /esphome --strip-components=1 \
       || bashio::exit.nok "Failed installing ESPHome from fork."
-    pip install -U -e /esphome-fork || bashio::exit.nok "Failed installing ESPHome from fork."
+    pip install -U -e /esphome || bashio::exit.nok "Failed installing ESPHome from fork."
     rm -f /tmp/esphome.tar.gz
     fork_version=$(python3 -c "from esphome.const import __version__; print(__version__)")
 

esphome-dev/translations/en.yaml

@@ -0,0 +1,67 @@
+---
+configuration:
+  certfile:
+    name: Certificate file
+    description: >-
+      The certificate file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  default_compile_process_limit:
+    name: Default compile process limit
+    description: >-
+      The default compile process limit. This is the maximum number of
+      simultaneous compile processes that ESPHome will run.
+  esphome_fork:
+    name: Install ESPHome from a fork or branch
+    description: >-
+      For example to test a pull request, use `pull/XXXX/head` where `XXXX` is
+      the PR number, or you can specify the username of the fork owner and
+      branch `username:branch` which assumes the repository is named `esphome`
+      still.
+
+      If you need to test the latest commit on dev branch before the image is
+      updated you can enter `dev` here.
+
+      Please note that the fork or branch you are using **must** be up to
+      date with ESPHome dev or the add-on **will not start**.
+  home_assistant_dashboard_integration:
+    name: Home Assistant Dashboard Integration
+    description: >-
+      Enables/Disables the ESPHome dashboard integrating with Home Assistant
+      for automatic configuration of devices and device updates. If you use
+      multiple version of the ESPHome add-on, make sure it is enabled on a
+      single add-on only.
+  keyfile:
+    name: Private key file
+    description: >-
+      The private key file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  leave_front_door_open:
+    name: Disable external authentication
+    description: >-
+      Disables external authentication when having opened the add-on
+      on an external port. **WARNING**: This is a security risk!
+  relative_url:
+    name: Relative URL
+    description: >-
+      Host the ESPHome dashboard under a relative URL, so that it can be
+      integrated into existing web proxies like NGINX under a relative URL.
+      Defaults to `/`.
+  ssl:
+    name: SSL
+    description: >-
+      Enables/Disables SSL (HTTPS) on the web interface.
+  status_use_ping:
+    name: Use ping for status
+    description: >-
+      By default the dashboard uses mDNS to check if nodes are online. This does
+      not work across subnets unless your router supports mDNS forwarding
+      or avahi. Enabling this option will use ICMP ping to check if nodes are
+      online.
+  streamer_mode:
+    name: Streamer mode
+    description: >-
+      Enables/Disables streamer mode, which makes ESPHome hide all
+      potentially private information. So for example WiFi (B)SSIDs (which could
+      be used to find your location), usernames, etc.
+network:
+  6052/tcp: Web interface (to use without Home Assistant)

esphome/CHANGELOG.md

@@ -1 +1,5 @@
-See https://esphome.io/changelog/index.html
+## 2023.6.1
+
+- Make ethernet_info work with esp-idf framework [esphome#4976](https://github.com/esphome/esphome/pull/4976) by [@HeMan](https://github.com/HeMan)
+- display: fix white screen on binary displays [esphome#4991](https://github.com/esphome/esphome/pull/4991) by [@ayufan](https://github.com/ayufan)
+

esphome/DOCS.md

@@ -1,5 +1,4 @@
-# Home Assistant Community Add-on: ESPHome
-
+# ESPHome Add-on
 ## Installation
 
 The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.

esphome/README.md

@@ -1,9 +1,8 @@
-# ESPHome Home Assistant Add-On
+# ESPHome Add-On
 
-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo][logo]][website]
 
-[![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
-[![GitHub Release][releases-shield]][releases]
+[![GitHub stars][github-stars-shield]][repository]
 [![Discord][discord-shield]][discord]
 
 ## About
@@ -14,10 +13,10 @@ is write YAML configuration files; the rest (over-the-air updates, compiling) is
 handled by ESPHome.
 
 <p align="center">
-<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/screenshot.png" width="700px"></img>
 </p>
 
-[View the ESPHome documentation](https://esphome.io/)
+[View the ESPHome documentation][website]
 
 ## Example
 
@@ -26,15 +25,17 @@ firmware. For example, to include a [DHT22][dht22].
 temperature and humidity sensor, you just need to include 8 lines of YAML
 in your configuration file:
 
-<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/dht-example.png" width="500px"></img>
 
 Then just click UPLOAD and the sensor will magically appear in Home Assistant:
 
-<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/temperature-humidity.png" width="600px"></img>
 
-[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
-[dht22]: https://esphome.io/components/sensor/dht.html
 [discord]: https://discord.gg/KhAMKrd
-[releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
-[releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://esphome.io/components/sensor/dht.html
+[releases]: https://esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome/logo.png
+[website]: https://esphome.io/

esphome/config.yaml

@@ -1,35 +1,38 @@
 ---
+url: https://esphome.io/
 arch:
 - amd64
 - armv7
 - aarch64
-auth_api: true
-backup_exclude:
-- '*/*/'
-description: ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices
 hassio_api: true
+auth_api: true
 host_network: true
-image: ghcr.io/esphome/esphome-hassio-{arch}
 ingress: true
 ingress_port: 0
+panel_icon: mdi:chip
+uart: true
+ports:
+  6052/tcp: null
 map:
 - ssl:ro
 - config:rw
-name: ESPHome
-panel_icon: mdi:chip
-ports:
-  6052/tcp: null
-ports_description:
-  6052/tcp: Web interface (not required for Home Assistant ingress)
+discovery:
+- esphome
 schema:
-  certfile: str?
-  keyfile: str?
-  leave_front_door_open: bool?
-  relative_url: str?
-  ssl: bool?
   status_use_ping: bool?
   streamer_mode: bool?
+  home_assistant_dashboard_integration: bool?
+  default_compile_process_limit: int(1,)?
+  ssl: bool?
+  certfile: str?
+  keyfile: str?
+  relative_url: str?
+  leave_front_door_open: bool?
+backup_exclude:
+- '*/*/'
+init: false
+name: ESPHome
+version: 2023.6.1
 slug: esphome
-uart: true
-url: https://esphome.io/
-version: 2022.9.2
+description: ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices
+image: ghcr.io/esphome/esphome-hassio

esphome/translations/en.yaml

@@ -0,0 +1,67 @@
+---
+configuration:
+  certfile:
+    name: Certificate file
+    description: >-
+      The certificate file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  default_compile_process_limit:
+    name: Default compile process limit
+    description: >-
+      The default compile process limit. This is the maximum number of
+      simultaneous compile processes that ESPHome will run.
+  esphome_fork:
+    name: Install ESPHome from a fork or branch
+    description: >-
+      For example to test a pull request, use `pull/XXXX/head` where `XXXX` is
+      the PR number, or you can specify the username of the fork owner and
+      branch `username:branch` which assumes the repository is named `esphome`
+      still.
+
+      If you need to test the latest commit on dev branch before the image is
+      updated you can enter `dev` here.
+
+      Please note that the fork or branch you are using **must** be up to
+      date with ESPHome dev or the add-on **will not start**.
+  home_assistant_dashboard_integration:
+    name: Home Assistant Dashboard Integration
+    description: >-
+      Enables/Disables the ESPHome dashboard integrating with Home Assistant
+      for automatic configuration of devices and device updates. If you use
+      multiple version of the ESPHome add-on, make sure it is enabled on a
+      single add-on only.
+  keyfile:
+    name: Private key file
+    description: >-
+      The private key file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  leave_front_door_open:
+    name: Disable external authentication
+    description: >-
+      Disables external authentication when having opened the add-on
+      on an external port. **WARNING**: This is a security risk!
+  relative_url:
+    name: Relative URL
+    description: >-
+      Host the ESPHome dashboard under a relative URL, so that it can be
+      integrated into existing web proxies like NGINX under a relative URL.
+      Defaults to `/`.
+  ssl:
+    name: SSL
+    description: >-
+      Enables/Disables SSL (HTTPS) on the web interface.
+  status_use_ping:
+    name: Use ping for status
+    description: >-
+      By default the dashboard uses mDNS to check if nodes are online. This does
+      not work across subnets unless your router supports mDNS forwarding
+      or avahi. Enabling this option will use ICMP ping to check if nodes are
+      online.
+  streamer_mode:
+    name: Streamer mode
+    description: >-
+      Enables/Disables streamer mode, which makes ESPHome hide all
+      potentially private information. So for example WiFi (B)SSIDs (which could
+      be used to find your location), usernames, etc.
+network:
+  6052/tcp: Web interface (to use without Home Assistant)

script/generate.py

@@ -6,6 +6,7 @@ from pathlib import Path
 from enum import Enum
 from shutil import copyfile
 import sys
+import os
 
 
 class Channel(Enum):
@@ -35,9 +36,10 @@ def main(args):
         dir_ = root / conf.pop("directory")
         path = dir_ / "config.yaml"
         with open(path, "w") as f:
-            yaml.dump(conf, f, indent=2, sort_keys=True, explicit_start=True)
+            yaml.dump(conf, f, indent=2, sort_keys=False, explicit_start=True)
 
-        for file_, conf_ in copyf.items():
+        for file_ in copyf:
+            os.makedirs(dir_ / Path(file_).parent, exist_ok=True)
             if Path.exists(templ / channel.value / file_):
                 copyfile(templ / channel.value / file_, dir_ / file_)
             else:
@@ -51,7 +53,7 @@ def main(args):
             path = dir_ / "build.yaml"
             build_conf = {
                 "build_from": {
-                    arch: base_image.format(arch=arch) for arch in conf["arch"]
+                    arch: base_image for arch in conf["arch"]
                 }
             }
             with open(path, "w") as f:

template/CHANGELOG.md

@@ -1 +0,0 @@
-See https://esphome.io/changelog/index.html

template/DOCS.md

@@ -1,5 +1,4 @@
-# Home Assistant Community Add-on: ESPHome
-
+# ESPHome Add-on
 ## Installation
 
 The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.

template/README.md

@@ -1,9 +1,8 @@
-# ESPHome Home Assistant Add-On
+# ESPHome Add-On
 
-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo][logo]][website]
 
-[![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
-[![GitHub Release][releases-shield]][releases]
+[![GitHub stars][github-stars-shield]][repository]
 [![Discord][discord-shield]][discord]
 
 ## About
@@ -14,10 +13,10 @@ is write YAML configuration files; the rest (over-the-air updates, compiling) is
 handled by ESPHome.
 
 <p align="center">
-<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/screenshot.png" width="700px"></img>
 </p>
 
-[View the ESPHome documentation](https://esphome.io/)
+[View the ESPHome documentation][website]
 
 ## Example
 
@@ -26,15 +25,17 @@ firmware. For example, to include a [DHT22][dht22].
 temperature and humidity sensor, you just need to include 8 lines of YAML
 in your configuration file:
 
-<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/dht-example.png" width="500px"></img>
 
 Then just click UPLOAD and the sensor will magically appear in Home Assistant:
 
-<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/temperature-humidity.png" width="600px"></img>
 
-[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
-[dht22]: https://esphome.io/components/sensor/dht.html
 [discord]: https://discord.gg/KhAMKrd
-[releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
-[releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://esphome.io/components/sensor/dht.html
+[releases]: https://esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome/logo.png
+[website]: https://esphome.io/

template/addon_config.yaml

@@ -21,21 +21,25 @@ base: &base
   uart: true
   ports:
     '6052/tcp': null
-  ports_description:
-    '6052/tcp': "Web interface (not required for Home Assistant ingress)"
   map:
     - ssl:ro
     - config:rw
+  discovery:
+    - esphome
   schema:
+    status_use_ping: bool?
+    streamer_mode: bool?
+    home_assistant_dashboard_integration: bool?
+    default_compile_process_limit: int(1,)?
     ssl: bool?
     certfile: str?
     keyfile: str?
-    leave_front_door_open: bool?
-    streamer_mode: bool?
     relative_url: str?
-    status_use_ping: bool?
+    leave_front_door_open: bool?
   backup_exclude:
     - "*/*/"
+  # Disable docker init for s6
+  init: false
 
 esphome-dev:
   <<: *base
@@ -48,40 +52,49 @@ esphome-dev:
   stage: experimental
   advanced: true
   schema:
+    status_use_ping: bool?
+    streamer_mode: bool?
+    home_assistant_dashboard_integration: bool?
+    default_compile_process_limit: int(1,)?
+    esphome_fork: str?
     ssl: bool?
     certfile: str?
     keyfile: str?
-    leave_front_door_open: bool?
-    streamer_mode: bool?
     relative_url: str?
-    status_use_ping: bool?
-    esphome_fork: str?
-  base_image: ghcr.io/esphome/esphome-hassio-{arch}:dev
+    leave_front_door_open: bool?
+  base_image: ghcr.io/esphome/esphome-hassio:dev
+  options:
+      home_assistant_dashboard_integration: false
 
 esphome-beta:
   <<: *base
   directory: esphome-beta
   name: ESPHome (beta)
-  version: '2022.9.2'  # BETA
+  version: '2023.6.1'  # BETA
   slug: esphome-beta
   description: "Beta version of ESPHome add-on"
   url: https://beta.esphome.io/
-  image: ghcr.io/esphome/esphome-hassio-{arch}
+  image: ghcr.io/esphome/esphome-hassio
   stage: experimental
   advanced: true
+  options:
+      home_assistant_dashboard_integration: false
 
 esphome-stable:
   <<: *base
   directory: esphome
   name: ESPHome
-  version: '2022.9.2'  # STABLE
+  version: '2023.6.1'  # STABLE
   slug: esphome
   description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
-  image: ghcr.io/esphome/esphome-hassio-{arch}
+  image: ghcr.io/esphome/esphome-hassio
 
 copy_files:
-  icon.png:
-  logo.png:
-  README.md:
-  DOCS.md:
-  CHANGELOG.md:
+  - DOCS.md
+  - icon.png
+  - logo.png
+  - README.md
+  - translations/en.yaml
+  - images/dht-example.png
+  - images/screenshot.png
+  - images/temperature-humidity.png

template/beta/README.md

@@ -0,0 +1,41 @@
+# ESPHome Beta Add-On
+
+[![ESPHome logo][logo]][website]
+
+[![GitHub stars][github-stars-shield]][repository]
+[![Discord][discord-shield]][discord]
+
+## About
+
+This add-on allows you to manage and program your ESP8266 and ESP32 based microcontrollers
+directly through Home Assistant **with no programming experience required**. All you need to do
+is write YAML configuration files; the rest (over-the-air updates, compiling) is all
+handled by ESPHome.
+
+<p align="center">
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/screenshot.png" width="700px"></img>
+</p>
+
+[View the ESPHome documentation][website]
+
+## Example
+
+With ESPHome, you can go from a few lines of YAML straight to a custom-made
+firmware. For example, to include a [DHT22][dht22].
+temperature and humidity sensor, you just need to include 8 lines of YAML
+in your configuration file:
+
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/dht-example.png" width="500px"></img>
+
+Then just click UPLOAD and the sensor will magically appear in Home Assistant:
+
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/temperature-humidity.png" width="600px"></img>
+
+[discord]: https://discord.gg/KhAMKrd
+[repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://beta.esphome.io/components/sensor/dht.html
+[releases]: https://beta.esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/logo.png
+[website]: https://beta.esphome.io/

template/dev/DOCS.md

@@ -1,40 +1,31 @@
-# Home Assistant Community Add-on: ESPHome
+# ESPHome DEV add on
 
-## Installation
+This is **development** version of the ESPHome add on.
 
-The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.
+To deploy production nodes please use mainstream release add on.
 
-1. Search for the “ESPHome” add-on in the Supervisor add-on store.
-2. Press install to download the add-on and unpack it on your machine. This can take some time.
-3. Optional: If you're using SSL/TLS certificates and want to encrypt your communication to this add-on, please enter `true` into the `ssl` field and set the `fullchain` and `certfile` options accordingly.
-4. Start the add-on, check the logs of the add-on to see if everything went well.
-5. Click "OPEN WEB UI" to open the ESPHome dashboard. You will be asked for your Home Assistant credentials - ESPHome uses Home Assistant's authentication system to log you in.
-
-You can view the ESPHome documentation at https://esphome.io/
+The add on uses a version of ESPHome built automatically every day at 02:00 UTC. and is used to test components in development. See the `esphome_fork` configuration below to properly configure the add on. Once you update the configuration make sure to rebuild the image.
 
 ## Configuration
 
 **Note**: _Remember to restart the add-on when the configuration is changed._
 
-Example add-on configuration:
-
-```json
-{
-  "ssl": false,
-  "certfile": "fullchain.pem",
-  "keyfile": "privkey.pem"
-}
-```
-
 ### Option: `esphome_fork`
 
 Install ESPHome from a fork or branch.
 For example to test a pull request, use `pull/XXXX/head` where `XXXX` is the PR number,
 or you can specify the username of the fork owner and branch `username:branch` which
-assumes the repository is named `esphome` still. 
+assumes the repository is named `esphome` still.
+
+If you need to test the latest commit on dev branch before the image is updated you can enter `dev` here.
 
 Please note that the fork or branch you are using **must** be up to date with ESPHome dev
-or the add-on **will not start**. 
+or the add-on **will not start**.
+
+
+## General ESPHome add on configurations
+
+General options also available in other versions.
 
 ### Option: `ssl`
 

template/dev/README.md

@@ -0,0 +1,41 @@
+# ESPHome Dev Add-On
+
+[![ESPHome logo][logo]][website]
+
+[![GitHub stars][github-stars-shield]][repository]
+[![Discord][discord-shield]][discord]
+
+## About
+
+This add-on allows you to manage and program your ESP8266 and ESP32 based microcontrollers
+directly through Home Assistant **with no programming experience required**. All you need to do
+is write YAML configuration files; the rest (over-the-air updates, compiling) is all
+handled by ESPHome.
+
+<p align="center">
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/screenshot.png" width="700px"></img>
+</p>
+
+[View the ESPHome documentation][website]
+
+## Example
+
+With ESPHome, you can go from a few lines of YAML straight to a custom-made
+firmware. For example, to include a [DHT22][dht22].
+temperature and humidity sensor, you just need to include 8 lines of YAML
+in your configuration file:
+
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/dht-example.png" width="500px"></img>
+
+Then just click UPLOAD and the sensor will magically appear in Home Assistant:
+
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+
+[discord]: https://discord.gg/KhAMKrd
+[repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://next.esphome.io/components/sensor/dht.html
+[releases]: https://next.esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/logo.png
+[website]: https://next.esphome.io/

template/translations/en.yaml

@@ -0,0 +1,67 @@
+---
+configuration:
+  certfile:
+    name: Certificate file
+    description: >-
+      The certificate file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  default_compile_process_limit:
+    name: Default compile process limit
+    description: >-
+      The default compile process limit. This is the maximum number of
+      simultaneous compile processes that ESPHome will run.
+  esphome_fork:
+    name: Install ESPHome from a fork or branch
+    description: >-
+      For example to test a pull request, use `pull/XXXX/head` where `XXXX` is
+      the PR number, or you can specify the username of the fork owner and
+      branch `username:branch` which assumes the repository is named `esphome`
+      still.
+
+      If you need to test the latest commit on dev branch before the image is
+      updated you can enter `dev` here.
+
+      Please note that the fork or branch you are using **must** be up to
+      date with ESPHome dev or the add-on **will not start**.
+  home_assistant_dashboard_integration:
+    name: Home Assistant Dashboard Integration
+    description: >-
+      Enables/Disables the ESPHome dashboard integrating with Home Assistant
+      for automatic configuration of devices and device updates. If you use
+      multiple version of the ESPHome add-on, make sure it is enabled on a
+      single add-on only.
+  keyfile:
+    name: Private key file
+    description: >-
+      The private key file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  leave_front_door_open:
+    name: Disable external authentication
+    description: >-
+      Disables external authentication when having opened the add-on
+      on an external port. **WARNING**: This is a security risk!
+  relative_url:
+    name: Relative URL
+    description: >-
+      Host the ESPHome dashboard under a relative URL, so that it can be
+      integrated into existing web proxies like NGINX under a relative URL.
+      Defaults to `/`.
+  ssl:
+    name: SSL
+    description: >-
+      Enables/Disables SSL (HTTPS) on the web interface.
+  status_use_ping:
+    name: Use ping for status
+    description: >-
+      By default the dashboard uses mDNS to check if nodes are online. This does
+      not work across subnets unless your router supports mDNS forwarding
+      or avahi. Enabling this option will use ICMP ping to check if nodes are
+      online.
+  streamer_mode:
+    name: Streamer mode
+    description: >-
+      Enables/Disables streamer mode, which makes ESPHome hide all
+      potentially private information. So for example WiFi (B)SSIDs (which could
+      be used to find your location), usernames, etc.
+network:
+  6052/tcp: Web interface (to use without Home Assistant)