mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-05-22 16:51:51 +02:00
v3ify
This commit is contained in:
@@ -28,22 +28,22 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|||||||
S6_SERVICES_GRACETIME=0
|
S6_SERVICES_GRACETIME=0
|
||||||
|
|
||||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||||
|
|
||||||
|
# GLOBAL LSIO MODIFICATIONS
|
||||||
|
# hadolint ignore=SC2015
|
||||||
|
ARG CONFIGLOCATION="/config/addons_config/bazarr"
|
||||||
RUN \
|
RUN \
|
||||||
# Correct config folder
|
|
||||||
grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/addons_config/bazarr|g' \
|
|
||||||
&& grep -rl " /config" /etc/services.d | xargs sed -i 's| /config| /config/addons_config/bazarr|g' \
|
|
||||||
\
|
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
&& if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# change config folder
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& 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" \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# 3 Install apps #
|
# 3 Install apps #
|
||||||
|
|||||||
@@ -30,16 +30,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|||||||
ENV BOOKSONIC_AIR_SETTINGS="/data"
|
ENV BOOKSONIC_AIR_SETTINGS="/data"
|
||||||
RUN \
|
RUN \
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# 3 Install apps #
|
# 3 Install apps #
|
||||||
|
|||||||
@@ -29,16 +29,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|||||||
S6_SERVICES_GRACETIME=0
|
S6_SERVICES_GRACETIME=0
|
||||||
|
|
||||||
# Allow UID and GID setting
|
# Allow UID and GID setting
|
||||||
RUN if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
RUN grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \
|
||||||
\
|
\
|
||||||
# Change home folder location
|
# Change home folder location
|
||||||
&& sed -i 's|/config|/config/addons_config/calibre|g' /defaults/* \
|
&& sed -i 's|/config|/config/addons_config/calibre|g' /defaults/* \
|
||||||
|
|||||||
@@ -28,16 +28,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
|
||||||
|
|
||||||
RUN if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
RUN grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \
|
||||||
\
|
\
|
||||||
# Change home folder location
|
# Change home folder location
|
||||||
&& sed -i 's|/config|/config/addons_config/calibre-web|g' /defaults/* \
|
&& sed -i 's|/config|/config/addons_config/calibre-web|g' /defaults/* \
|
||||||
|
|||||||
@@ -29,16 +29,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \
|
||||||
# MOFIFY DATA PATH
|
# MOFIFY DATA PATH
|
||||||
&& sed -i "s|config|data|g" /etc/services.d/code-server/run \
|
&& sed -i "s|config|data|g" /etc/services.d/code-server/run \
|
||||||
&& sed -i "s|config|data|g" /etc/cont-init.d/30-config
|
&& sed -i "s|config|data|g" /etc/cont-init.d/30-config
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ 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
|
||||||
|
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# 3 Install apps #
|
# 3 Install apps #
|
||||||
##################
|
##################
|
||||||
|
|||||||
@@ -32,16 +32,16 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
|||||||
# hadolint ignore=SC2016
|
# hadolint ignore=SC2016
|
||||||
RUN \
|
RUN \
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \
|
||||||
\
|
\
|
||||||
# Correct config folder
|
# Correct config folder
|
||||||
&& grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/addons_config/flexget|g' \
|
&& grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/addons_config/flexget|g' \
|
||||||
|
|||||||
@@ -33,16 +33,16 @@ RUN \
|
|||||||
&& sed -i "s|/share/grav/nginx|/config/nginx|g" /etc/cont-init.d/50-config \
|
&& sed -i "s|/share/grav/nginx|/config/nginx|g" /etc/cont-init.d/50-config \
|
||||||
\
|
\
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
&& if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
&& grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# 3 Install apps #
|
# 3 Install apps #
|
||||||
|
|||||||
@@ -31,16 +31,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|||||||
RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \
|
RUN sed -i "s|/config|/config/addons_config/Jackett|g" /etc/cont-init.d/30-config \
|
||||||
\
|
\
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
&& if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
&& grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done
|
||||||
|
|
||||||
# Changes config directory
|
# Changes config directory
|
||||||
ENV XDG_CONFIG_HOME="/config/addons_config"
|
ENV XDG_CONFIG_HOME="/config/addons_config"
|
||||||
|
|||||||
@@ -30,16 +30,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=0 \
|
|||||||
|
|
||||||
# Allow UID and GID setting
|
# Allow UID and GID setting
|
||||||
RUN \
|
RUN \
|
||||||
if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# 3 Install apps #
|
# 3 Install apps #
|
||||||
|
|||||||
@@ -33,16 +33,16 @@ RUN \
|
|||||||
&& sed -i "s|/config|/config/addons_config/lidarr|g" /etc/cont-init.d/30-config \
|
&& sed -i "s|/config|/config/addons_config/lidarr|g" /etc/cont-init.d/30-config \
|
||||||
\
|
\
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
&& if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
&& grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# 3 Install apps #
|
# 3 Install apps #
|
||||||
|
|||||||
@@ -31,16 +31,16 @@ RUN sed -i "s|/config|/data|g" /etc/services.d/*/run \
|
|||||||
&& sed -i "s|/config|/data|g" /etc/cont-init.d/* \
|
&& sed -i "s|/config|/data|g" /etc/cont-init.d/* \
|
||||||
\
|
\
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
&& if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
&& grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# 3 Install apps #
|
# 3 Install apps #
|
||||||
|
|||||||
@@ -31,16 +31,16 @@ RUN sed -i "s|/config|/config/addons_config/nzbget|g" /etc/services.d/nzbget/run
|
|||||||
&& sed -i "s|/config|/config/addons_config/nzbget|g" /etc/cont-init.d/30-config \
|
&& sed -i "s|/config|/config/addons_config/nzbget|g" /etc/cont-init.d/30-config \
|
||||||
&& sed -i "s|/config|/config/addons_config/nzbget|g" /etc/cont-init.d/10-adduser \
|
&& sed -i "s|/config|/config/addons_config/nzbget|g" /etc/cont-init.d/10-adduser \
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
&& if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
&& grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \
|
||||||
# Create folder
|
# Create folder
|
||||||
&& sed -i '1a mkdir -p /config/addons_config/nzbget' /etc/cont-init.d/10-adduser
|
&& sed -i '1a mkdir -p /config/addons_config/nzbget' /etc/cont-init.d/10-adduser
|
||||||
|
|
||||||
|
|||||||
@@ -31,16 +31,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|||||||
# hadolint ignore=SC2015,DL4006
|
# hadolint ignore=SC2015,DL4006
|
||||||
RUN \
|
RUN \
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \
|
||||||
\
|
\
|
||||||
# Correct config folder
|
# Correct config folder
|
||||||
&& grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/addons_config/ombi|g' || true \
|
&& grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /config/addons_config/ombi|g' || true \
|
||||||
|
|||||||
@@ -32,16 +32,16 @@ RUN \
|
|||||||
# Correct upstream image folders links #
|
# Correct upstream image folders links #
|
||||||
########################################
|
########################################
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \
|
||||||
\
|
\
|
||||||
# Allow custom config folder
|
# Allow custom config folder
|
||||||
&& grep -rl '/config' /defaults/ | xargs sed -i 's|/config|/data/organizr|g' \
|
&& grep -rl '/config' /defaults/ | xargs sed -i 's|/config|/data/organizr|g' \
|
||||||
|
|||||||
@@ -32,16 +32,16 @@ RUN sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/serv
|
|||||||
&& sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/cont-init.d/30-config \
|
&& sed -i "s|/config|/config/addons_config/addons_config/overseerr|g" /etc/cont-init.d/30-config \
|
||||||
\
|
\
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
&& if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
&& grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# 3 Install apps #
|
# 3 Install apps #
|
||||||
|
|||||||
@@ -35,16 +35,16 @@ RUN \
|
|||||||
# Correct image #
|
# Correct image #
|
||||||
#################
|
#################
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \
|
||||||
# Change config location
|
# Change config location
|
||||||
&& sed -i "s|/config|$PAPERLESS_DATA_DIR|g" /etc/cont-init.d/10-adduser \
|
&& sed -i "s|/config|$PAPERLESS_DATA_DIR|g" /etc/cont-init.d/10-adduser \
|
||||||
&& sed -i "s|/config|$PAPERLESS_DATA_DIR|g" /etc/cont-init.d/50-config
|
&& sed -i "s|/config|$PAPERLESS_DATA_DIR|g" /etc/cont-init.d/50-config
|
||||||
|
|||||||
@@ -30,16 +30,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|||||||
# hadolint ignore=SC2015
|
# hadolint ignore=SC2015
|
||||||
RUN \
|
RUN \
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \
|
||||||
# Change config path
|
# Change config path
|
||||||
&& sed -i 's|papermerge/config|papermerge/confi|g' /etc/cont-init.d/* \
|
&& sed -i 's|papermerge/config|papermerge/confi|g' /etc/cont-init.d/* \
|
||||||
&& sed -i 's|/config|/data/config|g' /etc/cont-init.d/* \
|
&& sed -i 's|/config|/data/config|g' /etc/cont-init.d/* \
|
||||||
|
|||||||
@@ -29,16 +29,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done
|
||||||
|
|
||||||
|
|
||||||
##################
|
##################
|
||||||
|
|||||||
@@ -36,16 +36,16 @@ RUN \
|
|||||||
# Allow UID and GID setting #
|
# Allow UID and GID setting #
|
||||||
#############################
|
#############################
|
||||||
\
|
\
|
||||||
if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \
|
||||||
&& sed -i "s|chown abc:abc /config||g" /etc/cont-init.d/10-adduser \
|
&& sed -i "s|chown abc:abc /config||g" /etc/cont-init.d/10-adduser \
|
||||||
\
|
\
|
||||||
######################
|
######################
|
||||||
|
|||||||
@@ -35,16 +35,16 @@ RUN \
|
|||||||
&& sed -i "s|/config|/config/addons_config/plex-meta-manager|g" /etc/cont-init.d/* \
|
&& sed -i "s|/config|/config/addons_config/plex-meta-manager|g" /etc/cont-init.d/* \
|
||||||
\
|
\
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
&& if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
&& grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \
|
||||||
\
|
\
|
||||||
# Add template config.yaml
|
# Add template config.yaml
|
||||||
&& mkdir /templates \
|
&& mkdir /templates \
|
||||||
|
|||||||
@@ -29,16 +29,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \
|
||||||
\
|
\
|
||||||
# Correct permissions
|
# Correct permissions
|
||||||
&& sed -i 's|/config|-R /config/addons_config/prowlarr|g' /etc/cont-init.d/10-adduser \
|
&& sed -i 's|/config|-R /config/addons_config/prowlarr|g' /etc/cont-init.d/10-adduser \
|
||||||
|
|||||||
@@ -37,32 +37,32 @@ ENV \
|
|||||||
S6_CMD_WAIT_FOR_SERVICES=1 \
|
S6_CMD_WAIT_FOR_SERVICES=1 \
|
||||||
TERM="xterm-256color"
|
TERM="xterm-256color"
|
||||||
|
|
||||||
# hadolint ignore=SC2015
|
# SPECIFIC IMAGES MODIFICATIONS
|
||||||
RUN \
|
RUN \
|
||||||
# Avoid custom-init.d duplications
|
|
||||||
if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
|
||||||
\
|
|
||||||
# Prevent changing ownership of /config
|
|
||||||
&& 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
|
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
|
|
||||||
\
|
|
||||||
# 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
|
# Set download folder to /share
|
||||||
&& sed -i 's|/downloads/|/share/qBittorrent/|g' /defaults/qBittorrent.conf \
|
sed -i 's|/downloads/|/share/qBittorrent/|g' /defaults/qBittorrent.conf \
|
||||||
\
|
\
|
||||||
# Remove fixed folders, allows connection to webUI
|
# Remove fixed folders, allows connection to webUI
|
||||||
&& sed '11,13d' /defaults/qBittorrent.conf \
|
&& sed '11,13d' /defaults/qBittorrent.conf \
|
||||||
&& echo 'WebUI\HostHeaderValidation=false' >> /defaults/qBittorrent.conf \
|
&& echo 'WebUI\HostHeaderValidation=false' >> /defaults/qBittorrent.conf \
|
||||||
&& echo 'WebUI\LocalHostAuth=false' >> /defaults/qBittorrent.conf || true
|
&& echo 'WebUI\LocalHostAuth=false' >> /defaults/qBittorrent.conf || true
|
||||||
|
|
||||||
|
# GLOBAL LSIO MODIFICATIONS
|
||||||
|
# hadolint ignore=SC2015
|
||||||
|
ARG CONFIGLOCATION="/config/qBittorrent"
|
||||||
|
RUN \
|
||||||
|
# Avoid custom-init.d duplications
|
||||||
|
grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
|
\
|
||||||
|
# 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" \
|
||||||
|
\
|
||||||
|
# Allow UID and GID setting
|
||||||
|
&& 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/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# 3 Install apps #
|
# 3 Install apps #
|
||||||
##################
|
##################
|
||||||
|
|||||||
@@ -33,16 +33,16 @@ RUN \
|
|||||||
&& sed -i "s|/config|/config/addons_config/radarr|g" /etc/cont-init.d/30-config \
|
&& sed -i "s|/config|/config/addons_config/radarr|g" /etc/cont-init.d/30-config \
|
||||||
\
|
\
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
&& if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
&& grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done
|
||||||
|
|
||||||
|
|
||||||
##################
|
##################
|
||||||
|
|||||||
@@ -32,16 +32,16 @@ RUN sed -i "s|/config|/config/addons_config/readarr|g" /etc/services.d/readarr/r
|
|||||||
&& sed -i "s|/config|/config/addons_config/readarr|g" /etc/cont-init.d/30-config \
|
&& sed -i "s|/config|/config/addons_config/readarr|g" /etc/cont-init.d/30-config \
|
||||||
\
|
\
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
&& if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
&& grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# 3 Install apps #
|
# 3 Install apps #
|
||||||
|
|||||||
@@ -32,16 +32,16 @@ RUN \
|
|||||||
sed -i 's|/config \\|/data \\|g' /etc/cont-init.d/30-config \
|
sed -i 's|/config \\|/data \\|g' /etc/cont-init.d/30-config \
|
||||||
\
|
\
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
&& if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
&& grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# 3 Install apps #
|
# 3 Install apps #
|
||||||
|
|||||||
@@ -34,16 +34,16 @@ RUN \
|
|||||||
# Adapt image #
|
# Adapt image #
|
||||||
###############
|
###############
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \
|
||||||
\
|
\
|
||||||
# Correct config folder
|
# Correct config folder
|
||||||
&& grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /share/resiliosync_config|g' || true \
|
&& grep -rl " /config" /etc/cont-init.d | xargs sed -i 's| /config| /share/resiliosync_config|g' || true \
|
||||||
|
|||||||
@@ -34,16 +34,16 @@ RUN \
|
|||||||
&& sed -i "s|/config|/config/addons_config/sonarr|g" /etc/cont-init.d/30-config \
|
&& sed -i "s|/config|/config/addons_config/sonarr|g" /etc/cont-init.d/30-config \
|
||||||
\
|
\
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
&& if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
&& grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# 3 Install apps #
|
# 3 Install apps #
|
||||||
|
|||||||
@@ -31,16 +31,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|||||||
RUN sed -i "s|config|config/transmission|g" /etc/services.d/transmission/run \
|
RUN sed -i "s|config|config/transmission|g" /etc/services.d/transmission/run \
|
||||||
#&& sed -i "s|config|config/transmission|g" /etc/cont-init.d/20-config \
|
#&& sed -i "s|config|config/transmission|g" /etc/cont-init.d/20-config \
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
&& if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
&& grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done
|
||||||
|
|
||||||
##################
|
##################
|
||||||
# 3 Install apps #
|
# 3 Install apps #
|
||||||
|
|||||||
@@ -28,16 +28,16 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|||||||
S6_SERVICES_GRACETIME=0
|
S6_SERVICES_GRACETIME=0
|
||||||
|
|
||||||
# Allow UID and GID setting
|
# Allow UID and GID setting
|
||||||
RUN if [ -f /etc/cont-init.d/02-tamper-check ]; then rm /etc/cont-init.d/02-tamper-check; fi \
|
RUN grep -sril "Potential tampering with custom" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs -r rm \
|
||||||
\
|
\
|
||||||
# Prevent changing ownership of /config
|
# Prevent changing ownership of /config
|
||||||
&& if [ -f /etc/cont-init.d/10-adduser ]; then sed -i "/chown abc:abc \/config$/d" /etc/cont-init.d/10-adduser; fi \
|
&& grep -sril "/config" /etc/cont-init.d /etc/s6-overlay/s6-rc.d | xargs grep -riL "/config/" | xargs -r rm \
|
||||||
&& 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
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
&& for file in $(grep -srl "PUID:-911" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do \
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/bash/bashio/g' "$file" && \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
|
sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' "$file" && \
|
||||||
|
sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' "$file"; done \
|
||||||
\
|
\
|
||||||
# Change home folder location
|
# Change home folder location
|
||||||
&& sed -i 's|/config|/share/webtop_kde|g' /defaults/* \
|
&& sed -i 's|/config|/share/webtop_kde|g' /defaults/* \
|
||||||
|
|||||||
Reference in New Issue
Block a user