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

correct lsio

Browse Source
This commit is contained in:
Alexandre
2022-09-08 22:25:38 +02:00
parent 485b165dc2
commit 432770a334
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bazarr/Dockerfile
View File

@@ -27,17 +27,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
S6_SERVICES_GRACETIME=0 S6_SERVICES_GRACETIME=0
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# GLOBAL LSIO MODIFICATIONS # GLOBAL LSIO MODIFICATIONS
# hadolint ignore=SC2015 # hadolint ignore=SC2015
ARG CONFIGLOCATION="/config/addons_config/bazarr" ARG CONFIGLOCATION="/config/addons_config/bazarr"
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN \ RUN \
# Avoid custom-init.d duplications # Avoid custom-init.d duplications
grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ rm -f $(grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d) \
\ \
# change config folder # change config folder
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs sed -i "s=/config=$CONFIGLOCATION || true=g" \ && sed -i "s=/config=$CONFIGLOCATION || true=g" $(grep -sril '/config[ /$]' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d) \
\ \
# 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 \

25
prowlarr/Dockerfile
View File

@@ -27,31 +27,28 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
S6_SERVICES_GRACETIME=0 S6_SERVICES_GRACETIME=0
# GLOBAL LSIO MODIFICATIONS
# hadolint ignore=SC2015
ARG CONFIGLOCATION="/config/addons_config/prowlarr"
RUN \ RUN \
# Avoid custom-init.d duplications # Avoid custom-init.d duplications
grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \ rm -f $(grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d) \
\ \
# Prevent changing ownership of /config # change config folder
#&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \ && 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 \
\ \
# 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|-R /config/addons_config/prowlarr|g' /etc/cont-init.d/10-adduser \
&& sed -i 's= /config=/config/addons_config/prowlarr || true=g' /etc/cont-init.d/30-config \
&& sed -i 's|/config|/config/addons_config/prowlarr|g' /etc/services.d/prowlarr/run
################## ##################
# 3 Install apps # # 3 Install apps #
################## ##################
# Add rootfs # Add rootfs
COPY rootfs/ / COPY rootfs/ /
# Corrects permissions for s6 v3 # Corrects permissions for s6 v3
RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \