Merge pull request #452 from Poeschl/dev

Dev

.github/workflows/issue-labeler.yaml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: 🏷️ Label issue
-      uses: github/issue-labeler@v3.2
+      uses: github/issue-labeler@v3.3
       with:
         repo-token: "${{ secrets.CR_PAT }}"
         configuration-path: .github/labeler.yaml

git-exporter/CHANGELOG.md

@@ -1,8 +1,14 @@
+## 1.17.0 - 2024-01-13
+
+* ⬆️ Updated python3 to `3.10.13-r0`
+* ⬆️ Updated git to `2.36.6-r0`
+* ⬇️ Downgraded PyYAML to `5.3.1` to avoid issues with the build (see [GitHub issue](https://github.com/yaml/pyyaml/issues/723#issuecomment-1638583120))
+* 📝 Updated some texts and hints (thanks @reedy #421 #422 #424 #425)
+
 ## 1.16.0 - 2023-01-25
 
 * 🔨 Also detect the new GitHub access token and don't encode it then
 
-
 ## 1.15.0 - 2023-01-25
 
 * 🐛 Fixes issue with unbound variable (#361)

git-exporter/DOCS.md

@@ -46,7 +46,7 @@ Your username for https authentication.
 
 ### `repository.password`
 
-Your password or __access token__ for your repository.
+Your password or [__access token__](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) for your repository.
 
 ### `repository.pull_before_push`
 

git-exporter/Dockerfile

@@ -2,7 +2,7 @@ ARG BUILD_FROM
 FROM $BUILD_FROM AS BUILD
 
 RUN apk add --no-cache \
-		'git=2.36.4-r0' \
+		'git=2.36.6-r0' \
 		'make=4.3-r0'
 
 ENV GIT_SECRET_VERSION 1.3.0
@@ -14,14 +14,14 @@ RUN git config --global advice.detachedHead false && \
 FROM $BUILD_FROM AS RUNNING
 
 RUN apk add --no-cache \
-			'git=2.36.4-r0' \
+			'git=2.36.6-r0' \
 			'rsync=3.2.7-r0' \
 			'grep=3.7-r0' \
 			'sed=4.8-r0' \
-			'python3=3.10.9-r0' \
+			'python3=3.10.13-r0' \
 			'py3-pip=22.1.1-r0' \
 			'findutils=4.9.0-r0' \
-	&& pip3 install --no-cache-dir PyYAML==6.0 dotty-dict==1.3.1
+	&& pip3 install --no-cache-dir PyYAML==5.3.1 dotty-dict==1.3.1
 
 COPY --from=BUILD /usr/local/bin/git-secrets /usr/local/bin/git-secrets
 

git-exporter/README.md

@@ -16,11 +16,11 @@ Can be used to show your Home Assistant setup in public repositories.
 
 # Functionality
 
-* Export Home Assistant configuration
-* Export Supervisor Addon configuration
-* Export Lovelace configuration
-* Export ESPHome configurations
-* Export Node-RED flows
+* Export Home Assistant configuration.
+* Export Supervisor Addon configuration.
+* Export Lovelace configuration.
+* Export ESPHome configurations.
+* Export Node-RED flows.
 * Check for plaintext secrets based on your `secrets.yaml` file and common patterns.
 * Check for plaintext ip and addresses in your config.
 
@@ -32,7 +32,7 @@ The folders there are gettings synced with this addon.
 
 # Badge
 
-If you export your config with this addon and want to help me to spread it further. Here is a badge you can embedd in your readme.
+If you export your config with this addon and want to help me to spread it further, here is a badge you can embed in your README.
 
 [![Home Assistant Git Exporter](https://img.shields.io/badge/Powered%20by-Home%20Assistant%20Git%20Exporter-%23d32f2f)](https://github.com/Poeschl/Hassio-Addons/tree/main/git-exporter)
 

git-exporter/config.yaml

@@ -1,7 +1,7 @@
 name: Home Assistant Git Exporter
-version: 1.16.0
+version: 1.17.0
 slug: git-exporter
-description: Export all of your Home Assistant configuration to a git repository of your choice.
+description: Export all of your Home Assistant configuration to a git repository of your choice
 url: https://github.com/Poeschl/Hassio-Addons/tree/main/git-exporter
 arch:
   - armhf

git-exporter/root/run.sh

@@ -115,7 +115,7 @@ function check_secrets {
     bashio::log.info 'Checking for secrets'
     # shellcheck disable=SC2046
     git secrets --scan $(find $local_repository -name '*.yaml' -o -name '*.yml' -o -name '*.json' -o -name '*.disabled') \
-    || (bashio::log.error 'Found secrets in files!!! Fix them to be able to commit!' && exit 1)
+    || (bashio::log.error 'Found secrets in files!!! Fix them to be able to commit! See https://www.home-assistant.io/docs/configuration/secrets/ for more information!' && exit 1)
 }
 
 function export_ha_config {

syncthing/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.18.0 - 2024-01-13
+
+* 🔨 Configure Syncthing via environment variables instead of CLI arguments where possible and properly separate config and database/state directories (thanks @salim-b | #450)
+* 🔨 Set `/share` as default folder path fallback (fixes #447, @salim-b).
+* 🔼 Updated syncthing to `1.27.2-r0`
+
 ## 1.17.0 - 2023-10-13
 
 * 🔨 Set gui-address to first IP in container (thanks @reedy | #426)

syncthing/DOCS.md

@@ -19,7 +19,6 @@ When using this add-on to permanently hold your data, put the synced folders ins
 - `/data`
 - `/media`
 - `/share`
-- `/config`
 - `/ssl`
 - `/addons`
 

syncthing/Dockerfile

@@ -2,8 +2,16 @@ ARG BUILD_FROM
 FROM $BUILD_FROM
 
 RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community \
-		"syncthing=1.25.0-r1"
+		"syncthing=1.27.2-r0"
+
+COPY root /
+
+ENV HOME=/share \
+    STCONFDIR=/config \
+    STDATADIR=/data \
+    STNODEFAULTFOLDER=1 \
+    STNORESTART=1 \
+    STNOUPGRADE=1
 
 ENTRYPOINT [ "/init" ]
 CMD []
-COPY root /

syncthing/config.yaml

@@ -1,5 +1,5 @@
 name: Syncthing
-version: "1.17.0"
+version: "1.18.0"
 slug: syncthing
 description: "Syncthing is a continuous file synchronization program in a
   de-centralized way"
@@ -26,9 +26,9 @@ ingress_port: 8384
 panel_title: Syncthing
 panel_icon: mdi:sync
 map:
-  - share:rw
-  - config:rw
-  - backup:rw
+  - addon_config:rw
   - addons:rw
-  - ssl:rw
+  - backup:rw
   - media:rw
+  - share:rw
+  - ssl:rw

syncthing/root/etc/s6-overlay/s6-rc.d/syncthing/run

@@ -2,19 +2,28 @@
 # shellcheck shell=bash
 set -e
 
-export STNOUPGRADE=1
-
-bashio::log.info 'Setup config'
-mkdir -p /data/config
+bashio::log.info 'Intializing Syncthing'
 
+# determine IP address to serve Syncthing's GUI on
 ip=$(ifconfig | grep "inet " | grep -Fv 127.0.0.1 | awk '{sub("addr:",""); print $2}' | head -n 1)
 
 if [ -z "$ip" ]
 then
-      ip=0.0.0.0
+  ip=0.0.0.0
+  bashio::log.info "Couldn't detect IP address. Falling back to: $ip"
+else
+  bashio::log.info "Detected IP address: $ip"
 fi
 
-bashio::log.info "Detected IP Address: $ip"
+# move config and DB state from old to new locations if necessary, cf. https://github.com/Poeschl/Hassio-Addons/pull/450
+if [ -d /data/config ]
+then
+  for CONF_FILE in config.xml cert.pem key.pem https-cert.pem https-key.pem
+  do
+    [ -f "/data/config/${CONF_FILE}" ] && mv -fu "/data/config/${CONF_FILE}" /config/ && rm -f "/data/config/${CONF_FILE}"
+  done
+  mv -fu /data/config/* /data/ && rm -f /data/config
+fi
 
-bashio::log.info 'Start syncthing'
-syncthing --no-browser --no-restart --home=/data/config --gui-address="$ip:8384"
+bashio::log.info 'Starting Syncthing'
+syncthing --gui-address="$ip:8384" --no-browser

valetudo-mapper/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.12.0 - 2024-01-13
+
+* 🔼 Update Valetudo-Mapper to commit `54aba35` (thanks @gerard33 #442)
+* 🔼 Update git to `2.36.6-r0`
+
 ## 1.11.0 - 2022-08-03
 
 * 🔼 Update Valetudo-Mapper to commit `bd97779`

valetudo-mapper/Dockerfile

@@ -3,9 +3,9 @@ FROM $BUILD_FROM AS BUILD
 
 ENV LANG C.UTF-8
 
-RUN apk add --no-cache git=2.36.2-r0 npm=8.10.0-r0
+RUN apk add --no-cache git=2.36.6-r0 npm=8.10.0-r0
 
-ENV COMMIT_SHA 'bd97779d5a1aa74c52914974e3badfaee0c4b3e6'
+ENV COMMIT_SHA '54aba3534e9e797b9a22c0e134fa2706effd2e9d'
 # hadolint ignore=DL3003
 RUN git config --global advice.detachedHead false && \
     git clone https://github.com/rand256/valetudo-mapper -b master /app && \
@@ -23,4 +23,4 @@ COPY --from=BUILD /app /app
 
 ENTRYPOINT [ "/init" ]
 CMD []
-COPY root /
+COPY root /

valetudo-mapper/config.yaml

@@ -1,5 +1,5 @@
 name: Valetudo Mapper
-version: 1.11.0
+version: 1.12.0
 slug: valetudomapper
 description: This is a simple companion service for Valetudo RE which generates
   the map pngs.