avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-06-02 22:04:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2633 from alexbelgium/copilot/fix-env-vars-not-passed

Browse Source 
Fix env vars not propagated to s6-overlay v3 services in hotio-based addons
This commit is contained in:
Alexandre
2026-04-07 14:17:02 +02:00
committed by GitHub
parent 402563eee3 96c0cba649
commit 598b2b5b1a
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.templates/00-global_var.sh
View File

@@ -234,7 +234,7 @@ cp "$ENV_FILE" "$ETC_ENV_FILE"
################################################################################ ################################################################################
# Inject into scripts and shells (best-effort) # Inject into scripts and shells (best-effort)
################################################################################ ################################################################################
for f in /etc/services.d/*/run /etc/cont-init.d/*.sh /entrypoint.sh /etc/bash.bashrc "${GLOBAL_VAR_FILES:-}"; do for f in /etc/services.d/*/run /etc/s6-overlay/s6-rc.d/*/run /etc/cont-init.d/*.sh /entrypoint.sh /etc/bash.bashrc "${GLOBAL_VAR_FILES:-}"; do
[[ -f "$f" ]] && inject_block "$f" [[ -f "$f" ]] && inject_block "$f"
done done

4
unpackerr/CHANGELOG.md
View File

@@ -1,4 +1,8 @@
## v0.15.2-2 (2026-04-06)
- Fix environment variables not being passed into the container (e.g. VPN_AUTO_PORT_FORWARD, VPN_ENABLED)
- Disable VPN port forwarder service when no VPN provider is configured
## v0.15.2 (2026-03-14) ## v0.15.2 (2026-03-14)
- Update to latest version from Unpackerr/unpackerr (changelog : https://github.com/Unpackerr/unpackerr/releases) - Update to latest version from Unpackerr/unpackerr (changelog : https://github.com/Unpackerr/unpackerr/releases)

2
unpackerr/config.yaml
View File

@@ -100,4 +100,4 @@ schema:
slug: unpackerr slug: unpackerr
udev: true udev: true
url: https://github.com/alexbelgium/hassio-addons url: https://github.com/alexbelgium/hassio-addons
version: "v0.15.2" version: "v0.15.2-2"

7
unpackerr/rootfs/etc/cont-init.d/90-vpn.sh
View File

@@ -23,5 +23,12 @@ case "$VPN_PROVIDER" in
sed -i "1a sleep infinity" /etc/s6*/s6*/service-privoxy/run sed -i "1a sleep infinity" /etc/s6*/s6*/service-privoxy/run
sed -i "1a sleep infinity" /etc/s6*/s6*/service-proton/run sed -i "1a sleep infinity" /etc/s6*/s6*/service-proton/run
sed -i "1a sleep infinity" /etc/s6*/s6*/service-pia/run sed -i "1a sleep infinity" /etc/s6*/s6*/service-pia/run
sed -i "1a sleep infinity" /etc/s6*/s6*/service-forwarder/run
;; ;;
esac esac
# Disable port forwarder when VPN_AUTO_PORT_FORWARD is explicitly false
VPN_AUTO_PORT_FORWARD="${VPN_AUTO_PORT_FORWARD:-}"
if [ "${VPN_AUTO_PORT_FORWARD,,}" = "false" ]; then
sed -i "1a sleep infinity" /etc/s6*/s6*/service-forwarder/run 2>/dev/null || true
fi