mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-07-21 05:20:31 +02:00
Better module code
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
|
||||
ARG BUILD_FROM
|
||||
ARG BUILD_VERSION
|
||||
ARG BUILD_UPSTREAM="14.3.9.99202110311443-7435-01519b5e7ubuntu20.04.1-ls166"
|
||||
ARG BUILD_UPSTREAM="14.3.9.99202110311443-7435-01519b5e7ubuntu20.04.1-ls166"
|
||||
FROM ${BUILD_FROM}-$BUILD_UPSTREAM
|
||||
|
||||
##################
|
||||
@@ -37,15 +37,15 @@ RUN \
|
||||
&& 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 \
|
||||
# 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 \
|
||||
&& sed '11,13d' /defaults/qBittorrent.conf \
|
||||
&& echo 'WebUI\HostHeaderValidation=false' >> /defaults/qBittorrent.conf \
|
||||
&& echo 'WebUI\LocalHostAuth=false' >> /defaults/qBittorrent.conf || true
|
||||
|
||||
@@ -55,7 +55,7 @@ RUN \
|
||||
# Copy local files
|
||||
COPY rootfs/ /
|
||||
|
||||
# Manual apps
|
||||
# Manual apps
|
||||
ARG PACKAGES=""
|
||||
|
||||
# Automatic apps & bashio
|
||||
@@ -70,11 +70,13 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
|
||||
ARG MODULES="00-banner.sh 92-local_mounts.sh 92-smb_mounts.sh 90-dns_set.sh"
|
||||
|
||||
# Automatic modules download
|
||||
RUN mkdir -p /tmpscripts /etc/cont-init.d && \
|
||||
for scripts in $MODULES; do curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/$scripts" -o /tmpscripts/"$scripts"; done && \
|
||||
if [ -d /etc/cont-init.d ]; then /bin/cp -rf /tmpscripts/* /etc/cont-init.d/ && chmod -R 755 /etc/cont-init.d; fi && \
|
||||
if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
|
||||
rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
|
||||
RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); fi && \
|
||||
if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl); fi && \
|
||||
mkdir -p /tmpscripts /etc/cont-init.d && \
|
||||
for scripts in $MODULES; do curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/$scripts" -o /tmpscripts/"$scripts"; done && \
|
||||
if [ -d /etc/cont-init.d ]; then /bin/cp -rf /tmpscripts/* /etc/cont-init.d/ && chmod -R 755 /etc/cont-init.d; fi && \
|
||||
if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \
|
||||
rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE
|
||||
|
||||
################
|
||||
# 4 Entrypoint #
|
||||
|
||||
Reference in New Issue
Block a user