From c5bff7b300c864f76ee7ae9572023775c5a81f36 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Sun, 4 Sep 2022 12:44:30 +0200 Subject: [PATCH] Update Dockerfile --- qbittorrent/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index 24eb5549f..725462054 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -1,4 +1,4 @@ -#============================# +2#============================# # ALEXBELGIUM'S DOCKERFILE # #============================# # _.------. @@ -85,10 +85,6 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE -# Switch scripts from s6 v2 to v3 -RUN if [ -f /etc/s6-overlay/s6-rc.d/init-custom-files/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 - #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 \ @@ -106,6 +102,10 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && eval /./automatic_packages.sh "${PACKAGES:-}" \ && rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE +# Switch scripts from s6 v2 to v3 +RUN if [ -f /etc/s6-overlay/s6-rc.d/init-custom-files/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 # ################