From dc44fa1eff1946985147bbfa15d9f6a82651f942 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 19 Nov 2025 08:32:39 +0000 Subject: [PATCH] Revert 'build' [nobuild] --- qbittorrent/Dockerfile | 15 +++++++++++---- qbittorrent/config.yaml | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index 140c99f43..59ca63d51 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -84,10 +84,7 @@ RUN \ ln -sf python3 /usr/bin/python && \ apk add --no-cache py3-pip gcc musl-dev && \ cd /qbit_manage && \ - pip3 install --break-system-packages --user . && \ - \ - # Ensure permissions - chmod +x /rootsfs/usr/local/sbin/* /rootsfs/usr/local/bin/* + pip3 install --break-system-packages --user . ################## # 3 Install apps # @@ -107,6 +104,12 @@ ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.s ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh" RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh +#RUN if [ -f /etc/s6-overlay/s6-rc.d/init-adduser ]; then for SCRIPTS in /etc/cont-init.d/*; do [ -e "$SCRIPTS" ] || continue \ +# && mkdir -p /abscripts && sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" \ +# && SCRIPTSNAME="$(basename "$SCRIPTS")" && mkdir /etc/s6-overlay/s6-rc.d/"$SCRIPTSNAME" && mv "$SCRIPTS" /etc/s6-overlay/s6-rc.d/"$SCRIPTSNAME"/run \ +# && echo "oneshot" > /etc/s6-overlay/s6-rc.d/"$SCRIPTSNAME"/type && echo "/etc/s6-overlay/s6-rc.d/$SCRIPTSNAME/run" > /etc/s6-overlay/s6-rc.d/"$SCRIPTSNAME"/up \ +# && chmod a+x /etc/s6-overlay/s6-rc.d/$SCRIPTSNAME/* ; done; fi + # Manual apps ARG PACKAGES="wireguard-tools iptables ip6tables" @@ -114,6 +117,10 @@ ARG PACKAGES="wireguard-tools iptables ip6tables" ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh" RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh +# Switch scripts from s6 v2 to v3 +#RUN if [ -f /etc/s6-overlay/s6-rc.d/init-custom-file/run ]; then mkdir "/custom-cont-init.d" && for SCRIPTS in /etc/cont-init.d/*; do [ -e "$SCRIPTS" ] || continue \ +# && mv "$SCRIPTS" /custom-cont-init.d && chmod a+x /custom-cont-init.d/*; done; fi + ################ # 4 Entrypoint # ################ diff --git a/qbittorrent/config.yaml b/qbittorrent/config.yaml index 31ae3f47e..e0be4b5d2 100644 --- a/qbittorrent/config.yaml +++ b/qbittorrent/config.yaml @@ -145,4 +145,4 @@ schema: slug: qbittorrent udev: true url: https://github.com/alexbelgium/hassio-addons -version: 5.1.2-10 +version: 5.1.2-9