Merge branch 'master' into duckdns

home-assistant · Nov 24, 2023 · adce8ca · adce8ca
2 parents d4cb735 + f544e2b
commit adce8ca
Show file tree

Hide file tree

Showing 146 changed files with 2,413 additions and 1,143 deletions.
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
@@ -22,7 +22,7 @@ jobs:
       changed: ${{ steps.changed_addons.outputs.changed }}
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
 
       - name: Get changed files
         id: changed_files
@@ -74,7 +74,7 @@ jobs:
 
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
 
       - name: Get information
         id: info
@@ -100,19 +100,17 @@ jobs:
 
       - name: Login to DockerHub
         if: env.BUILD_ARGS == '--docker-hub-check'
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build ${{ matrix.addon }} add-on
         if: steps.check.outputs.build_arch == 'true'
-        uses: home-assistant/builder@2023.06.1
+        uses: home-assistant/builder@2023.09.0
         with:
           args: |
             ${{ env.BUILD_ARGS }} \
             --${{ matrix.arch }} \
             --target /data/${{ matrix.addon }} \
             --addon
-        env:
-          CAS_API_KEY: ${{ secrets.CAS_TOKEN }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -18,7 +18,7 @@ jobs:
     name: hadolint
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
 
       - name: Run linter
         id: changed_files
@@ -36,7 +36,7 @@ jobs:
     name: YAMLLint
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
 
       - name: Run YAMLLint
         uses: frenck/[email protected]
@@ -46,7 +46,7 @@ jobs:
     name: ShellCheck
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
 
       - name: Run linter
         uses: ludeeus/[email protected]
diff --git a/.hadolint.yaml b/.hadolint.yaml
@@ -6,6 +6,7 @@ ignored:
   - DL3008
   - DL3013
   - DL3018
+  - DL3042
   - DL4006
   - SC2046
   - SC2086
diff --git a/README.md b/README.md
@@ -39,7 +39,6 @@ systems that have installed Home Assistant.
 
     The Open-source, Privacy-Preserving Voice Assistant.
 
-
 - **[Git pull](/git_pull/README.md)**
 
     Load and update configuration files for Home Assistant from a Git repository.
@@ -86,10 +85,6 @@ systems that have installed Home Assistant.
 
 ### Deprecated Add-ons
 
-- **[Hey Ada!](/ada/README.md)**
-
-    Voice assistant powered by Home Assistant.
-
 - **[HomeMatic](/homematic/README.md)**
 
     HomeMatic central based on OCCU.
@@ -100,7 +95,7 @@ systems that have installed Home Assistant.
 
     Allow Home Assistant to talk to a Z-Wave Network via a USB Controller.
 
-    Deprecated in favor of [Z-Wave JS](/zwave_js/README.md)
+    Deprecated in favor of [Z-Wave JS](/zwave_js/README.md).
 
 ## Support
 
@@ -110,7 +105,7 @@ You have several options to get them answered:
 
 - The [Home Assistant Discord Chat Server][discord].
 - The Home Assistant [Community Forum][forum].
-- Join the [Reddit subreddit][reddit] in [/r/homeassistant][reddit]
+- Join the [Reddit subreddit][reddit] in [/r/homeassistant][reddit].
 
 In case you've found a bug, please [open an issue on our GitHub][issue].
 

diff --git a/ada/CHANGELOG.md b/ada/CHANGELOG.md
diff --git a/ada/DOCS.md b/ada/DOCS.md
diff --git a/ada/Dockerfile b/ada/Dockerfile
diff --git a/ada/README.md b/ada/README.md
diff --git a/ada/build.yaml b/ada/build.yaml
diff --git a/ada/config.yaml b/ada/config.yaml
diff --git a/ada/icon.png b/ada/icon.png
diff --git a/ada/logo.png b/ada/logo.png
diff --git a/ada/rootfs/etc/services.d/ada/finish b/ada/rootfs/etc/services.d/ada/finish
diff --git a/ada/rootfs/etc/services.d/ada/run b/ada/rootfs/etc/services.d/ada/run
diff --git a/ada/translations/en.yaml b/ada/translations/en.yaml
diff --git a/configurator/CHANGELOG.md b/configurator/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 5.7.0
+
+- Use new location for accessing the Home Assistant configuration folder using `/homeassistant`
+- Add access to the new public configuration folders of add-ons
+- Upgrade to Alpine 3.18
+- Remove unneeded pip configuration when building add-on
+- Remove unused variable in finish script
+
 ## 5.6.0
 
 - Update base image to Alpine 3.17

diff --git a/configurator/DOCS.md b/configurator/DOCS.md
@@ -38,7 +38,8 @@ Set it to `true` to list directories first, `false` otherwise.
 
 ### Option: `enforce_basepath` (required)
 
-If set to `true`, access is limited to files within the `/config` directory.
+If set to `true`, access is limited to files within the `/homeassistant` directory
+(also known as the `/config` folder inside Home Assisant itself).
 
 ### Option: `git` (required)
 

diff --git a/configurator/Dockerfile b/configurator/Dockerfile
@@ -11,9 +11,6 @@ RUN \
         py3-pip \
         python3 \
     && pip3 install \
-        --no-cache-dir \
-        --prefer-binary \
-        --find-links "https://wheels.home-assistant.io/musllinux/${BUILD_ARCH}/" \
         hass-configurator=="${CONFIGURATOR_VERSION}" \
     \
     && find /usr/local \
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ ignored: @@
       - DL3008
       - DL3013
       - DL3018
+      - DL3042
       - DL4006
       - SC2046
       - SC2086