mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-06-15 11:59:11 +02:00
Merge branch 'master' of https://github.com/alexbelgium/hassio-addons
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
É#!/usr/bin/with-contenv bashio
|
#!/usr/bin/with-contenv bashio
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
|
|
||||||
###############
|
###############
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
###############
|
###############
|
||||||
|
|
||||||
if bashio::config.true 'silent'; then
|
if bashio::config.true 'silent'; then
|
||||||
APPEND=' > /dev/null'
|
APPEND=' >/dev/null'
|
||||||
sed -i '$s|$|'"$APPEND"'|' /etc/s6-overlay/s6-rc.d/*/run
|
sed -i '$s|$|'"$APPEND"'|' /etc/s6-overlay/s6-rc.d/*/run
|
||||||
bashio::log.info 'Silent mode activated, all logs from emby server are hidden. Disable this option if you need to troubleshoot the addon.'
|
bashio::log.info 'Silent mode activated, all logs from emby server are hidden. Disable this option if you need to troubleshoot the addon.'
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|||||||
|
|
||||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||||
|
|
||||||
# hadolint ignore=SC2016
|
# hadolint ignore=SC2016,SC2086
|
||||||
RUN \
|
RUN \
|
||||||
# Set password
|
# Set password
|
||||||
files=$(grep -sril "set FG_WEBUI_PASSWD" /etc/s6-overlay/s6-rc.d) \
|
files=$(grep -sril "set FG_WEBUI_PASSWD" /etc/s6-overlay/s6-rc.d) \
|
||||||
@@ -39,7 +39,7 @@ RUN \
|
|||||||
|
|
||||||
# Global LSIO modifications
|
# Global LSIO modifications
|
||||||
ARG CONFIGLOCATION="/config/addons_config/flexget"
|
ARG CONFIGLOCATION="/config/addons_config/flexget"
|
||||||
# hadolint ignore=SC2015, SC2013
|
# hadolint ignore=SC2015,SC2013,SC2236
|
||||||
RUN \
|
RUN \
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
|
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ ENV NEXTCLOUD_PATH="/data/config/www/nextcloud"
|
|||||||
|
|
||||||
# Global LSIO modifications
|
# Global LSIO modifications
|
||||||
ARG CONFIGLOCATION="/data/config"
|
ARG CONFIGLOCATION="/data/config"
|
||||||
# shellcheck disable=SC2046
|
# shellcheck disable=SC2046,SC2013
|
||||||
RUN \
|
RUN \
|
||||||
# Remove upstream files
|
# Remove upstream files
|
||||||
rm -rf /etc/cont-init.d/10-adduser /etc/cont-init.d/30-keygen /etc/cont-init.d/40-config /etc/cont-init.d/50-install /etc/cont-init.d/60-memcache /etc/cont-init.d/70-aliases \
|
rm -rf /etc/cont-init.d/10-adduser /etc/cont-init.d/30-keygen /etc/cont-init.d/40-config /etc/cont-init.d/50-install /etc/cont-init.d/60-memcache /etc/cont-init.d/70-aliases \
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|||||||
S6_SERVICES_GRACETIME=0
|
S6_SERVICES_GRACETIME=0
|
||||||
|
|
||||||
# Image specific modifications
|
# Image specific modifications
|
||||||
# hadolint ignore=SC2016
|
# hadolint ignore=SC2016,SC2086
|
||||||
RUN \
|
RUN \
|
||||||
# CORRECT PLEX CLAIM
|
# CORRECT PLEX CLAIM
|
||||||
file=$(grep -sril 'Server claimed successfully' /etc) \
|
file=$(grep -sril 'Server claimed successfully' /etc) \
|
||||||
@@ -38,7 +38,7 @@ RUN \
|
|||||||
|
|
||||||
# Global LSIO modifications
|
# Global LSIO modifications
|
||||||
ARG CONFIGLOCATION="/config"
|
ARG CONFIGLOCATION="/config"
|
||||||
# hadolint ignore=SC2015, SC2013
|
# hadolint ignore=SC2015,SC2013,SC2236
|
||||||
RUN \
|
RUN \
|
||||||
# Avoid custom-init.d duplications
|
# Avoid custom-init.d duplications
|
||||||
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
|
for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f "$file"; done \
|
||||||
|
|||||||
Reference in New Issue
Block a user