diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile index 28f033d95..0e47e8a6b 100644 --- a/addons_updater/Dockerfile +++ b/addons_updater/Dockerfile @@ -36,6 +36,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile index 7d66f7205..b320a5896 100644 --- a/arpspoof/Dockerfile +++ b/arpspoof/Dockerfile @@ -35,6 +35,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh" diff --git a/autobrr/Dockerfile b/autobrr/Dockerfile index 14b0395b3..2dddbc7e0 100644 --- a/autobrr/Dockerfile +++ b/autobrr/Dockerfile @@ -40,6 +40,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/baikal/Dockerfile b/baikal/Dockerfile index 31dbf8e15..2b5d67eb2 100644 --- a/baikal/Dockerfile +++ b/baikal/Dockerfile @@ -39,6 +39,9 @@ RUN \ # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index 536e64a88..6412b5731 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -40,6 +40,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/binance-trading-bot/Dockerfile b/binance-trading-bot/Dockerfile index 35c3aa47e..a03a5906c 100644 --- a/binance-trading-bot/Dockerfile +++ b/binance-trading-bot/Dockerfile @@ -28,13 +28,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 -################## -# 3 Install apps # -################## - -# Add rootfs -COPY rootfs/ / - # Install trading view ENV FLASK_APP=main.py ENV FLASK_ENV=production @@ -55,6 +48,16 @@ RUN \ && apk add mongodb mongodb-tools --no-cache >/dev/null \ && sed -i "/v3.9/d" /etc/apk/repositories +################## +# 3 Install apps # +################## + +# Add rootfs +COPY rootfs/ / + +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh" diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index ea0504d37..c0d2aa0bc 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -43,6 +43,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/browserless_chrome/Dockerfile b/browserless_chrome/Dockerfile index f19df6eda..61173595b 100644 --- a/browserless_chrome/Dockerfile +++ b/browserless_chrome/Dockerfile @@ -37,6 +37,9 @@ USER root # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/calibre/Dockerfile b/calibre/Dockerfile index 47512b7d6..87c8c844c 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -49,6 +49,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index 62eb6fd08..be0259264 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -51,6 +51,9 @@ RUN \ # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/changedetection.io/Dockerfile b/changedetection.io/Dockerfile index 9f3446667..d46c51074 100644 --- a/changedetection.io/Dockerfile +++ b/changedetection.io/Dockerfile @@ -41,6 +41,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh" diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile index d854ba39f..2b4cde25a 100644 --- a/cloudcommander/Dockerfile +++ b/cloudcommander/Dockerfile @@ -34,6 +34,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/codex/Dockerfile b/codex/Dockerfile index 26cf3e765..5b9aba078 100644 --- a/codex/Dockerfile +++ b/codex/Dockerfile @@ -34,6 +34,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-local_mounts.sh 00-smb_mounts.sh" diff --git a/comixed/Dockerfile b/comixed/Dockerfile index a507fbba0..6f23bda16 100644 --- a/comixed/Dockerfile +++ b/comixed/Dockerfile @@ -50,6 +50,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-local_mounts.sh 00-smb_mounts.sh" diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 12e2406e1..e721c0460 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -48,6 +48,9 @@ RUN sed -i '5a echo "Data location moved. Please wait while elasticsearch starts # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/emby/Dockerfile b/emby/Dockerfile index b11d99214..353a8d324 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -39,6 +39,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile index 88fdc4f6b..87e2a2a4d 100644 --- a/enedisgateway2mqtt/Dockerfile +++ b/enedisgateway2mqtt/Dockerfile @@ -34,6 +34,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh" diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile index 61fea7f1a..6bd423a7d 100644 --- a/enedisgateway2mqtt_dev/Dockerfile +++ b/enedisgateway2mqtt_dev/Dockerfile @@ -34,6 +34,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh" diff --git a/epicgamesfree/Dockerfile b/epicgamesfree/Dockerfile index e898fa3ef..dc097abc4 100644 --- a/epicgamesfree/Dockerfile +++ b/epicgamesfree/Dockerfile @@ -37,6 +37,9 @@ RUN sed -i "1a /./ha_entrypoint.sh" /usr/local/bin/docker-entrypoint.sh # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile index 0548bd0a3..3beaf3304 100644 --- a/filebrowser/Dockerfile +++ b/filebrowser/Dockerfile @@ -34,6 +34,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index b719e0635..6b4855d49 100644 --- a/fireflyiii/Dockerfile +++ b/fireflyiii/Dockerfile @@ -46,6 +46,9 @@ RUN \ # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 01-config_yaml.sh" diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile index 6ae06e6fc..7a293eace 100644 --- a/fireflyiii_data_importer/Dockerfile +++ b/fireflyiii_data_importer/Dockerfile @@ -42,6 +42,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 01-config_yaml.sh" diff --git a/fireflyiii_fints_importer/Dockerfile b/fireflyiii_fints_importer/Dockerfile index 7e6c954e4..c70d5f3c9 100644 --- a/fireflyiii_fints_importer/Dockerfile +++ b/fireflyiii_fints_importer/Dockerfile @@ -35,6 +35,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile index 5e5c814ec..a3b1afb76 100644 --- a/flaresolverr/Dockerfile +++ b/flaresolverr/Dockerfile @@ -36,6 +36,9 @@ USER root # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/flexget/Dockerfile b/flexget/Dockerfile index f3f2006bd..144f9b359 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -50,6 +50,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh" diff --git a/free_games_claimer/Dockerfile b/free_games_claimer/Dockerfile index a41caa54e..316ff4e73 100644 --- a/free_games_claimer/Dockerfile +++ b/free_games_claimer/Dockerfile @@ -34,6 +34,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile index 7f7cffd1d..dc05aa929 100644 --- a/gazpar2mqtt/Dockerfile +++ b/gazpar2mqtt/Dockerfile @@ -37,6 +37,9 @@ ENV TZ=Europe/Paris # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 01-config_yaml.sh" diff --git a/gitea/Dockerfile b/gitea/Dockerfile index 70aca4a96..e5ad1df2a 100644 --- a/gitea/Dockerfile +++ b/gitea/Dockerfile @@ -37,6 +37,9 @@ USER root # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 00-global_var.sh 01-custom_script.sh" diff --git a/grav/Dockerfile b/grav/Dockerfile index 22e1373ba..a6a89a855 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -40,6 +40,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile index 594bf5c84..00758cdfc 100644 --- a/guacamole/Dockerfile +++ b/guacamole/Dockerfile @@ -67,6 +67,9 @@ RUN \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/immich/Dockerfile b/immich/Dockerfile index 4ebab5206..e90ccd77c 100644 --- a/immich/Dockerfile +++ b/immich/Dockerfile @@ -49,6 +49,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile index 44f9f2cc5..1e795d2de 100644 --- a/inadyn/Dockerfile +++ b/inadyn/Dockerfile @@ -38,6 +38,9 @@ ENV LANG='C.UTF-8'\ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 7d5440e27..8357c8f51 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -42,6 +42,9 @@ ENV XDG_CONFIG_HOME="/config/addons_config" # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index f677705f9..cc8949e00 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -48,6 +48,9 @@ RUN \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/jellyseerr/Dockerfile b/jellyseerr/Dockerfile index 61597e275..0236d44eb 100644 --- a/jellyseerr/Dockerfile +++ b/jellyseerr/Dockerfile @@ -46,6 +46,9 @@ RUN \ # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/joal/Dockerfile b/joal/Dockerfile index 02047f944..f765728b2 100644 --- a/joal/Dockerfile +++ b/joal/Dockerfile @@ -47,13 +47,8 @@ RUN \ # Add rootfs COPY rootfs/ / -# Manual apps -ENV PACKAGES="jq \ - nginx" - -# Automatic apps & bashio -ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh" -RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" @@ -62,6 +57,13 @@ ARG MODULES="00-banner.sh 01-custom_script.sh" ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh" RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh +# Manual apps +ENV PACKAGES="jq nginx" + +# Automatic apps & bashio +ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh" +RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh + ################ # 4 Entrypoint # ################ diff --git a/joplin/Dockerfile b/joplin/Dockerfile index 343a30e08..60cf19192 100644 --- a/joplin/Dockerfile +++ b/joplin/Dockerfile @@ -42,6 +42,9 @@ ENV \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh" diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index d7fbb24f0..ae30556be 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -39,6 +39,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh 00-deprecated.sh" diff --git a/linkwarden/Dockerfile b/linkwarden/Dockerfile index 108f5b1b2..aea21d334 100644 --- a/linkwarden/Dockerfile +++ b/linkwarden/Dockerfile @@ -55,6 +55,9 @@ RUN \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="" diff --git a/mealie/Dockerfile b/mealie/Dockerfile index 003f5906c..973e77093 100644 --- a/mealie/Dockerfile +++ b/mealie/Dockerfile @@ -39,6 +39,9 @@ RUN grep -rl "/app/data" /app | xargs sed -i 's|/app/data|/config/addons_config/ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index 658d4117f..2e34228c2 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -39,6 +39,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 8a32483d3..7c52bbc60 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -71,6 +71,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index 9fd21ba82..ccb913179 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -39,6 +39,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/omada/Dockerfile b/omada/Dockerfile index b3abdcf6b..f000c25e6 100644 --- a/omada/Dockerfile +++ b/omada/Dockerfile @@ -38,6 +38,9 @@ RUN sed -i '1a /./ha_entrypoint.sh' /entrypoint.sh # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/omada_v3/Dockerfile b/omada_v3/Dockerfile index 09c928cb9..5062b4d3d 100644 --- a/omada_v3/Dockerfile +++ b/omada_v3/Dockerfile @@ -44,6 +44,9 @@ RUN echo "Adding symlinks to entrypoint" \ # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/ombi/Dockerfile b/ombi/Dockerfile index 9b6723079..f58834e7a 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -39,6 +39,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/organizr/Dockerfile b/organizr/Dockerfile index ed9262d89..ae8473402 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -38,6 +38,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/overleaf/Dockerfile b/overleaf/Dockerfile index 2542ab5ee..b56abd44e 100644 --- a/overleaf/Dockerfile +++ b/overleaf/Dockerfile @@ -32,13 +32,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ RUN if [ -f /config/settings.js ]; then sed -i "s|/var/lib/sharelatex/data|/config|g" /config/settings.js; fi && \ if [ -f /etc/sharelatex/settings.js ]; then sed -i "s|/var/lib/sharelatex/data|/config|g" /etc/sharelatex/settings.js; fi -################## -# 3 Install apps # -################## - -# Add rootfs -COPY rootfs/ / - RUN \ apt-get install -y gnupg curl && \ curl -fsSL https://www.mongodb.org/static/pgp/server-7.0.asc | \ @@ -48,6 +41,16 @@ RUN \ apt-get update && \ apt-get install -y mongodb-org +################## +# 3 Install apps # +################## + +# Copy local files +COPY rootfs/ / + +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh" diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index 681d7c326..e2403fd18 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -40,6 +40,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index c9b4de65b..e0d9395b6 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -47,6 +47,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-smb_mounts.sh" diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile index 26a48d121..7ebfd4d30 100644 --- a/photoprism/Dockerfile +++ b/photoprism/Dockerfile @@ -40,6 +40,9 @@ RUN \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 01-config_yaml.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index 50b3380d7..39e52b607 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -39,6 +39,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/plex/Dockerfile b/plex/Dockerfile index b4acbdf46..9fa535cb9 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -51,6 +51,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index 5c0b01a73..92ff28353 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -48,6 +48,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh" diff --git a/portainer/Dockerfile b/portainer/Dockerfile index 4b39e8945..20d1a847b 100644 --- a/portainer/Dockerfile +++ b/portainer/Dockerfile @@ -58,6 +58,9 @@ RUN \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/portainer_agent/Dockerfile b/portainer_agent/Dockerfile index 85118220d..c2ff04273 100644 --- a/portainer_agent/Dockerfile +++ b/portainer_agent/Dockerfile @@ -45,6 +45,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh" diff --git a/postgres/Dockerfile b/postgres/Dockerfile index 6a71ea899..2894abaec 100644 --- a/postgres/Dockerfile +++ b/postgres/Dockerfile @@ -41,6 +41,9 @@ RUN \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh" diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index 56ed1c0e6..6da065512 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -39,6 +39,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh 00-deprecated.sh" diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index 746da13aa..19b635f73 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -95,6 +95,9 @@ RUN \ # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh 90-dns_set.sh" diff --git a/radarr/Dockerfile b/radarr/Dockerfile index 05e60da18..2ebf68ab5 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -39,6 +39,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 00-local_mounts.sh 00-smb_mounts.sh 00-deprecated.sh" diff --git a/readarr/Dockerfile b/readarr/Dockerfile index edd974586..db34d70fe 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -40,6 +40,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 00-local_mounts.sh 00-smb_mounts.sh 00-deprecated.sh" diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index bde57d3db..df4662247 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -39,6 +39,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index de4fa4540..82d763e28 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -59,6 +59,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/sabnzbd/Dockerfile b/sabnzbd/Dockerfile index 164e498ff..3154554c0 100644 --- a/sabnzbd/Dockerfile +++ b/sabnzbd/Dockerfile @@ -39,6 +39,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile index 935dd6bf3..490f660e8 100644 --- a/scrutiny/Dockerfile +++ b/scrutiny/Dockerfile @@ -27,11 +27,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 -RUN \ - if [ -d /bin ]; then cp -rn /bin/* /usr/bin/; fi && \ - rm -r /bin && \ - ln -s /usr/bin /bin - ################## # 3 Install apps # ################## @@ -39,6 +34,9 @@ RUN \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile index 77f7381fb..17299ca75 100644 --- a/scrutiny_fa/Dockerfile +++ b/scrutiny_fa/Dockerfile @@ -34,6 +34,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/seafile/Dockerfile b/seafile/Dockerfile index 0abdc0b1b..c20bb682d 100644 --- a/seafile/Dockerfile +++ b/seafile/Dockerfile @@ -40,6 +40,9 @@ USER root # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 01-config_yaml.sh 00-global_var.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/signalk/Dockerfile b/signalk/Dockerfile index 158807de0..76c7be71a 100644 --- a/signalk/Dockerfile +++ b/signalk/Dockerfile @@ -43,6 +43,9 @@ RUN for file in $(grep -sril "/home/node/.signalk" /etc /usr /home); do \ # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 01-config_yaml.sh" diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index 76b8a57e5..7567ccaf2 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -40,6 +40,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 00-local_mounts.sh 00-smb_mounts.sh 00-deprecated.sh" diff --git a/sponsorblockcast/Dockerfile b/sponsorblockcast/Dockerfile index 771649b41..9c1e0edf1 100644 --- a/sponsorblockcast/Dockerfile +++ b/sponsorblockcast/Dockerfile @@ -36,6 +36,9 @@ USER root # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/spotweb/Dockerfile b/spotweb/Dockerfile index 0058a6d45..43d8a33ae 100644 --- a/spotweb/Dockerfile +++ b/spotweb/Dockerfile @@ -83,15 +83,18 @@ RUN apk -U update && \ && mkdir /app/cache \ && mkdir /var/tmp/nginx +# Corrects permissions for /app directory +RUN if [ -d /app ]; then chown -R nginx /app; fi + ################## # 3 Install apps # ################## -# Add rootfs +# Copy local files COPY rootfs/ / -# Corrects permissions for /app directory -RUN if [ -d /app ]; then chown -R nginx /app; fi +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi # Modules ARG MODULES="01-custom_script.sh" diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile index 727c496fe..0c4cf08a5 100644 --- a/tandoor_recipes/Dockerfile +++ b/tandoor_recipes/Dockerfile @@ -34,6 +34,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/tdarr/Dockerfile b/tdarr/Dockerfile index 4dbbc233c..cb03408ce 100644 --- a/tdarr/Dockerfile +++ b/tdarr/Dockerfile @@ -34,6 +34,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/teamspeak/Dockerfile b/teamspeak/Dockerfile index 38ebf57ab..e5ace5532 100644 --- a/teamspeak/Dockerfile +++ b/teamspeak/Dockerfile @@ -41,6 +41,9 @@ VOLUME [ "/data:/var/ts3server/" ] # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/transmission/Dockerfile b/transmission/Dockerfile index 99ee74403..7ea462140 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -50,6 +50,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 90-dns_set.sh 00-local_mounts.sh 00-smb_mounts.sh " diff --git a/transmission_openvpn/Dockerfile b/transmission_openvpn/Dockerfile index ecde68094..ccbe867bb 100644 --- a/transmission_openvpn/Dockerfile +++ b/transmission_openvpn/Dockerfile @@ -40,6 +40,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 90-dns_set.sh 00-local_mounts.sh 00-smb_mounts.sh " diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index c4e9f0579..7f1a6ff3d 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -50,6 +50,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile index 97e34c5ed..825c0d4aa 100644 --- a/unpackerr/Dockerfile +++ b/unpackerr/Dockerfile @@ -38,6 +38,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index 6c03df080..1514ea45c 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -49,6 +49,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh 90-dns_set.sh" diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile index cbbfd0914..dfa24b741 100644 --- a/webtrees/Dockerfile +++ b/webtrees/Dockerfile @@ -46,6 +46,9 @@ RUN \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 01-config_yaml.sh 00-local_mounts.sh 00-smb_mounts.sh" diff --git a/wger/Dockerfile b/wger/Dockerfile index adf47ddf1..fd51c3683 100644 --- a/wger/Dockerfile +++ b/wger/Dockerfile @@ -46,6 +46,9 @@ RUN echo "wger ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 01-config_yaml.sh" diff --git a/whatsapper/Dockerfile b/whatsapper/Dockerfile index b28a0bd0f..2f1c0fd95 100644 --- a/whatsapper/Dockerfile +++ b/whatsapper/Dockerfile @@ -33,6 +33,12 @@ USER root # 3 Install apps # ################## +# Copy local files +COPY rootfs/ / + +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 00-global_var.sh 01-custom_script.sh" diff --git a/whatsapper/etc/null b/whatsapper/etc/null new file mode 100644 index 000000000..e69de29bb diff --git a/whoogle/Dockerfile b/whoogle/Dockerfile index 41df58569..882f647bc 100644 --- a/whoogle/Dockerfile +++ b/whoogle/Dockerfile @@ -40,6 +40,9 @@ RUN \ # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh" diff --git a/xteve/Dockerfile b/xteve/Dockerfile index 5e4686b4d..902430031 100644 --- a/xteve/Dockerfile +++ b/xteve/Dockerfile @@ -40,6 +40,9 @@ RUN cp -vnpr /home/xteve* /data || true # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile index d8826dfe9..eb3bc052a 100644 --- a/zoneminder/Dockerfile +++ b/zoneminder/Dockerfile @@ -45,6 +45,9 @@ RUN sed -i 's|/etc/zm.conf|/config/addons_config/zoneminder/zm.conf|g' /usr/loca # Copy local files COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh" diff --git a/zzz_archived_bitwarden/Dockerfile b/zzz_archived_bitwarden/Dockerfile index 75654a1d0..e85c431d2 100644 --- a/zzz_archived_bitwarden/Dockerfile +++ b/zzz_archived_bitwarden/Dockerfile @@ -42,6 +42,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-deprecated.sh" diff --git a/zzz_archived_code-server/Dockerfile b/zzz_archived_code-server/Dockerfile index 6c532383b..02cf0fc9b 100644 --- a/zzz_archived_code-server/Dockerfile +++ b/zzz_archived_code-server/Dockerfile @@ -40,6 +40,9 @@ RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGL # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh 00-deprecated.sh" diff --git a/zzz_archived_paperless_ngx/Dockerfile b/zzz_archived_paperless_ngx/Dockerfile index d647a303c..9a947364f 100644 --- a/zzz_archived_paperless_ngx/Dockerfile +++ b/zzz_archived_paperless_ngx/Dockerfile @@ -38,6 +38,9 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Add rootfs COPY rootfs/ / +# Uses /bin for compatibility purposes +RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then if [ -d /bin ]; then cp -rn /bin/* /usr/bin/ && rm -r /bin; fi; ln -s /usr/bin /bin; fi + # Modules ARG MODULES="00-banner.sh 00-local_mounts.sh 00-smb_mounts.sh 01-custom_script.sh"