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

Revert https://github.com/alexbelgium/hassio-addons/issues/470

Browse Source
This commit is contained in:
Alexandre
2022-09-09 16:33:51 +02:00
committed by GitHub
parent 840e04fb1c
commit af26d11828
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
qbittorrent/Dockerfile
View File

@@ -37,32 +37,32 @@ ENV \
S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES=1 \
TERM="xterm-256color" TERM="xterm-256color"
# SPECIFIC IMAGES MODIFICATIONS
# hadolint ignore=SC2015 # hadolint ignore=SC2015
RUN \
# Set download folder to /share
sed -i 's|/downloads/|/share/qBittorrent/|g' /defaults/qBittorrent.conf \
\
# Remove fixed folders, allows connection to webUI
&& sed '11,13d' /defaults/qBittorrent.conf \
&& echo 'WebUI\HostHeaderValidation=false' >> /defaults/qBittorrent.conf \
&& echo 'WebUI\LocalHostAuth=false' >> /defaults/qBittorrent.conf || true
# GLOBAL LSIO MODIFICATIONS
# hadolint ignore=SC2015
ARG CONFIGLOCATION="/config/qBittorrent"
RUN \ RUN \
# Avoid custom-init.d duplications # Avoid custom-init.d duplications
rm -f $(grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d) \ rm -f $(grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d) \
\ \
# change config folder # Prevent changing ownership of /config
&& sed -i "s=/config=$CONFIGLOCATION || true=g" $(grep -sril '/config[ /$]' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d) \ && if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
&& if [ -f /etc/s6-overlay/s6-rc.d/init-adduser/run ]; then sed -i "/config/d" /etc/s6-overlay/s6-rc.d/init-adduser/run; fi \
\ \
# Allow UID and GID setting # Allow UID and GID setting
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \ && for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
sed -i 's/bash/bashio/g' "$file" && \ sed -i 's/bash/bashio/g' "$file" && \
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \ sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \
\
# Correct permissions
&& sed -i 's=/config=/config/qBittorrent || true=g' /etc/cont-init.d/10-adduser \
&& sed -i 's= /config= /config/qBittorrent || true=g' /etc/cont-init.d/30-config \
\
# Set download folder to /share
&& sed -i 's|/downloads/|/share/qBittorrent/|g' /defaults/qBittorrent.conf \
\
# Remove fixed folders, allows connection to webUI
&& sed '11,13d' /defaults/qBittorrent.conf \
&& echo 'WebUI\HostHeaderValidation=false' >> /defaults/qBittorrent.conf \
&& echo 'WebUI\LocalHostAuth=false' >> /defaults/qBittorrent.conf
################## ##################
# 3 Install apps # # 3 Install apps #