From 28eca160a4e5bf65dc34015104afaac116c2d025 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Mon, 22 Nov 2021 13:12:10 +0100 Subject: [PATCH] Suppress messages --- .../cont-init.d/00-aaa_dockerfile_backup.sh | 50 ++++----- .../scripts/00-aaa_dockerfile_backup.sh | 52 ++++----- .../scripts/00-aaa_dockerfile_backup.sh | 59 +++++----- .../scripts/00-aaa_dockerfile_backup.sh | 44 ++++---- .../cont-init.d/00-aaa_dockerfile_backup.sh | 58 +++++----- .../cont-init.d/00-aaa_dockerfile_backup.sh | 68 ++++++------ .../cont-init.d/00-aaa_dockerfile_backup.sh | 66 ++++++------ .../cont-init.d/00-aaa_dockerfile_backup.sh | 102 +++++++++--------- .../rootfs/script/00-aaa_dockerfile_backup.sh | 54 +++++----- 9 files changed, 278 insertions(+), 275 deletions(-) diff --git a/booksonic_air/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/booksonic_air/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh index b8d274361..4d07f6c06 100644 --- a/booksonic_air/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/booksonic_air/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -1,31 +1,31 @@ #!/bin/bash -# If dockerfile failed install manually +# If dockerfile failed install manually if [ ! -f "/usr/bin/bashio" ]; then echo "Bashio does not exist, executing script" + ( + ################ + # Install apps # + ################ + apt-get clean + apt-get update + apt-get install -y --no-install-recommends \ + jq \ + cifs-utils \ + keyutils \ + samba \ + smbclient + apt-get clean - ################ - # Install apps # - ################ - apt-get clean - apt-get update - apt-get install -y --no-install-recommends \ - jq \ - cifs-utils \ - keyutils \ - samba \ - smbclient - apt-get clean - - ################### - # Install bashio # - ################## - BASHIO_VERSION=0.13.1 - mkdir -p /tmp/bashio - curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | - tar -xzf - --strip 1 -C /tmp/bashio - mv /tmp/bashio/lib /usr/lib/bashio - ln -s /usr/lib/bashio/bashio /usr/bin/bashio - rm -rf /tmp/bashio - + ################### + # Install bashio # + ################## + BASHIO_VERSION=0.13.1 + mkdir -p /tmp/bashio + curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | + tar -xzf - --strip 1 -C /tmp/bashio + mv /tmp/bashio/lib /usr/lib/bashio + ln -s /usr/lib/bashio/bashio /usr/bin/bashio + rm -rf /tmp/bashio + ) >/dev/null echo "Bashio installed" fi diff --git a/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh b/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh index 75f4213a4..b1d788ec6 100644 --- a/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/cloudcommander/rootfs/scripts/00-aaa_dockerfile_backup.sh @@ -1,32 +1,32 @@ #!/bin/bash -# If dockerfile failed install manually +# If dockerfile failed install manually if [ ! -f "/usr/bin/bashio" ]; then echo "Bashio does not exist, executing script" + ( + ################ + # Install apps # + ################ + apt-get clean && + apt-get update && + apt-get install -y --no-install-recommends \ + jq \ + cifs-utils \ + keyutils \ + samba \ + smbclient \ + nginx && + apt-get clean - ################ - # Install apps # - ################ - apt-get clean \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - jq \ - cifs-utils \ - keyutils \ - samba \ - smbclient \ - nginx \ - && apt-get clean - - ################### - # Install bashio # - ################## - BASHIO_VERSION=0.13.1 - mkdir -p /tmp/bashio - curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | - tar -xzf - --strip 1 -C /tmp/bashio - mv /tmp/bashio/lib /usr/lib/bashio - ln -s /usr/lib/bashio/bashio /usr/bin/bashio - rm -rf /tmp/bashio - + ################### + # Install bashio # + ################## + BASHIO_VERSION=0.13.1 + mkdir -p /tmp/bashio + curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | + tar -xzf - --strip 1 -C /tmp/bashio + mv /tmp/bashio/lib /usr/lib/bashio + ln -s /usr/lib/bashio/bashio /usr/bin/bashio + rm -rf /tmp/bashio + ) >/dev/null echo "Bashio installed" fi diff --git a/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh b/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh index ba58702dd..996c8a32b 100644 --- a/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/filebrowser/rootfs/scripts/00-aaa_dockerfile_backup.sh @@ -1,37 +1,38 @@ #!/bin/bash -# If dockerfile failed install manually +# If dockerfile failed install manually if [ ! -f "/usr/bin/bashio" ]; then echo "Bashio does not exist, executing script" + ( + ################ + # Install apps # + ################ + apk add --no-cache \ + curl \ + jq \ + bash \ + cifs-utils \ + keyutils \ + samba \ + samba-client \ + bind-tools \ + nginx - ################ - # Install apps # - ################ - apk add --no-cache \ - curl \ - jq \ - bash \ - cifs-utils \ - keyutils \ - samba \ - samba-client \ - bind-tools \ - nginx + ################### + # Install bashio # + ################## + BASHIO_VERSION=0.13.1 + mkdir -p /tmp/bashio + curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | + tar -xzf - --strip 1 -C /tmp/bashio + mv /tmp/bashio/lib /usr/lib/bashio + ln -s /usr/lib/bashio/bashio /usr/bin/bashio + rm -rf /tmp/bashio - ################### - # Install bashio # - ################## - BASHIO_VERSION=0.13.1 - mkdir -p /tmp/bashio - curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | - tar -xzf - --strip 1 -C /tmp/bashio - mv /tmp/bashio/lib /usr/lib/bashio - ln -s /usr/lib/bashio/bashio /usr/bin/bashio - rm -rf /tmp/bashio - - ######################################## - # Correct upstream image folders links # - ######################################## - mkdir -p -m 777 /config/filebrowser || true + ######################################## + # Correct upstream image folders links # + ######################################## + mkdir -p -m 777 /config/filebrowser || true + ) >/dev/null echo "Bashio installed" fi diff --git a/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh b/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh index 0fc57b7ed..520542248 100644 --- a/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh +++ b/gazpar2mqtt/rootfs/scripts/00-aaa_dockerfile_backup.sh @@ -1,28 +1,28 @@ #!/bin/bash -# If dockerfile failed install manually +# If dockerfile failed install manually if [ ! -f "/usr/bin/bashio" ]; then echo "Bashio does not exist, executing script" + ( + ################ + # Install apps # + ################ + apt-get clean && + apt-get update && + apt-get install -y --no-install-recommends \ + jq \ + curl \ + yamllint - ################ - # Install apps # - ################ - apt-get clean && - apt-get update && - apt-get install -y --no-install-recommends \ - jq \ - curl \ - yamllint - - ################### - # Install bashio # - ################## - BASHIO_VERSION=0.13.1 - mkdir -p /tmp/bashio - curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | - tar -xzf - --strip 1 -C /tmp/bashio - mv /tmp/bashio/lib /usr/lib/bashio - ln -s /usr/lib/bashio/bashio /usr/bin/bashio - rm -rf /tmp/bashio - + ################### + # Install bashio # + ################## + BASHIO_VERSION=0.13.1 + mkdir -p /tmp/bashio + curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | + tar -xzf - --strip 1 -C /tmp/bashio + mv /tmp/bashio/lib /usr/lib/bashio + ln -s /usr/lib/bashio/bashio /usr/bin/bashio + rm -rf /tmp/bashio + ) >/dev/null echo "Bashio installed" fi diff --git a/jellyfin_test/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/jellyfin_test/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh index cb9c7d35f..3f6462a10 100644 --- a/jellyfin_test/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/jellyfin_test/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -2,36 +2,36 @@ # If dockerfile failed install manually if [ ! -f "/usr/bin/bashio" ]; then echo "Bashio does not exist, executing script" + ( + ################ + # Install apps # + ################ + apt-get update + apt-get install -y --no-install-recommends \ + jq \ + samba \ + smbclient \ + nginx + apt-get -y upgrade cifs-utils - ################ - # Install apps # - ################ - apt-get update - apt-get install -y --no-install-recommends \ - jq \ - samba \ - smbclient \ - nginx - apt-get -y upgrade cifs-utils - - # 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 - sed -i "s|/config|/config/jellyfin|g" /etc/services.d/jellyfin/run - sed -i "s|/config|/config/jellyfin|g" /etc/cont-init.d/10-adduser - sed -i "s|/config|/config/jellyfin|g" /etc/cont-init.d/30-config - - ################### - # Install bashio # - ################## - BASHIO_VERSION=0.13.1 - mkdir -p /tmp/bashio - curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | - tar -xzf - --strip 1 -C /tmp/bashio - mv /tmp/bashio/lib /usr/lib/bashio - ln -s /usr/lib/bashio/bashio /usr/bin/bashio - rm -rf /tmp/bashio + # 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 + sed -i "s|/config|/config/jellyfin|g" /etc/services.d/jellyfin/run + sed -i "s|/config|/config/jellyfin|g" /etc/cont-init.d/10-adduser + sed -i "s|/config|/config/jellyfin|g" /etc/cont-init.d/30-config + ################### + # Install bashio # + ################## + BASHIO_VERSION=0.13.1 + mkdir -p /tmp/bashio + curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | + tar -xzf - --strip 1 -C /tmp/bashio + mv /tmp/bashio/lib /usr/lib/bashio + ln -s /usr/lib/bashio/bashio /usr/bin/bashio + rm -rf /tmp/bashio + ) >/dev/null echo "Bashio installed" fi diff --git a/nextcloud/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/nextcloud/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 8a36b8e60..aae075979 100644 --- a/nextcloud/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/nextcloud/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -1,41 +1,41 @@ #!/bin/bash -# If dockerfile failed install manually +# If dockerfile failed install manually if [ ! -f "/usr/bin/bashio" ]; then echo "Bashio does not exist, executing script" - - ################ - # Install apps # - ################ - apk update && - apk add --no-cache \ - jq \ - curl \ - cifs-utils \ - keyutils \ - samba-client \ - samba || \ ( - apt-get clean && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - jq \ - curl \ - cifs-utils \ - keyutils \ - smbclient \ - samba - ) - - ################### - # Install bashio # - ################## - BASHIO_VERSION=0.13.1 - mkdir -p /tmp/bashio - curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | - tar -xzf - --strip 1 -C /tmp/bashio - mv /tmp/bashio/lib /usr/lib/bashio - ln -s /usr/lib/bashio/bashio /usr/bin/bashio - rm -rf /tmp/bashio + ################ + # Install apps # + ################ + apk update && + apk add --no-cache \ + jq \ + curl \ + cifs-utils \ + keyutils \ + samba-client \ + samba || + ( + apt-get clean && + apt-get update && + apt-get install -y --no-install-recommends \ + jq \ + curl \ + cifs-utils \ + keyutils \ + smbclient \ + samba + ) + ################### + # Install bashio # + ################## + BASHIO_VERSION=0.13.1 + mkdir -p /tmp/bashio + curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | + tar -xzf - --strip 1 -C /tmp/bashio + mv /tmp/bashio/lib /usr/lib/bashio + ln -s /usr/lib/bashio/bashio /usr/bin/bashio + rm -rf /tmp/bashio + ) >/dev/null echo "Bashio installed" fi diff --git a/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 0339a06c9..e2d1394ec 100644 --- a/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/papermerge/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -1,39 +1,39 @@ #!/bin/bash -# If dockerfile failed install manually +# If dockerfile failed install manually if [ ! -f "/usr/bin/bashio" ]; then echo "Bashio does not exist, executing script" + ( + ################ + # Install apps # + ################ + apt-get clean && + apt-get update && + apt-get install -y --no-install-recommends \ + jq \ + curl \ + cifs-utils \ + keyutils \ + smbclient \ + samba || + apk update && + apk add --no-cache \ + jq \ + curl \ + cifs-utils \ + keyutils \ + samba-client \ + samba - ################ - # Install apps # - ################ - apt-get clean && - apt-get update && - apt-get install -y --no-install-recommends \ - jq \ - curl \ - cifs-utils \ - keyutils \ - smbclient \ - samba || - apk update && - apk add --no-cache \ - jq \ - curl \ - cifs-utils \ - keyutils \ - samba-client \ - samba - - ################### - # Install bashio # - ################## - BASHIO_VERSION=0.13.1 - mkdir -p /tmp/bashio - curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | - tar -xzf - --strip 1 -C /tmp/bashio - mv /tmp/bashio/lib /usr/lib/bashio - ln -s /usr/lib/bashio/bashio /usr/bin/bashio - rm -rf /tmp/bashio - + ################### + # Install bashio # + ################## + BASHIO_VERSION=0.13.1 + mkdir -p /tmp/bashio + curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | + tar -xzf - --strip 1 -C /tmp/bashio + mv /tmp/bashio/lib /usr/lib/bashio + ln -s /usr/lib/bashio/bashio /usr/bin/bashio + rm -rf /tmp/bashio + ) >/dev/null echo "Bashio installed" fi diff --git a/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh b/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh index 6a25907b5..768a01954 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh @@ -1,62 +1,64 @@ #!/bin/bash -# If dockerfile failed install manually +# If dockerfile failed install manually if [ ! -f "/usr/bin/bashio" ]; then echo "Bashio does not exist, executing script" + ( + ################ + # Install apps # + ################ + apt-get clean \ + apt-get update \ + apt-get install -y \ + jq \ + curl \ + cifs-utils \ + keyutils \ + samba \ + smbclient \ + nginx \ + coreutils \ + openvpn + apt-get clean - ################ - # Install apps # - ################ - apt-get clean \ - apt-get update \ - apt-get install -y \ - jq \ - curl \ - cifs-utils \ - keyutils \ - samba \ - smbclient \ - nginx \ - coreutils \ - openvpn - apt-get clean + ################## + # Install tempio # + ################## + curl -L -f -s -o /usr/bin/tempio \ + "https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${BUILD_ARCH}" \ + chmod a+x /usr/bin/tempio - ################## - # Install tempio # - ################## - curl -L -f -s -o /usr/bin/tempio \ - "https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${BUILD_ARCH}" \ - chmod a+x /usr/bin/tempio + ################## + # Install bashio # + ################## + mkdir -p /tmp/bashio \ + curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | + tar -xzf - --strip 1 -C /tmp/bashio + mv /tmp/bashio/lib /usr/lib/bashio + ln -s /usr/lib/bashio/bashio /usr/bin/bashio + rm -rf /tmp/bashio - ################## - # Install bashio # - ################## - mkdir -p /tmp/bashio \ - curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | - tar -xzf - --strip 1 -C /tmp/bashio - mv /tmp/bashio/lib /usr/lib/bashio - ln -s /usr/lib/bashio/bashio /usr/bin/bashio - rm -rf /tmp/bashio + ######################################## + # Correct upstream image folders links # + ######################################## + # 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 upstream image folders links # - ######################################## - # 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 - # 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 - # 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 \ - echo 'WebUI\HostHeaderValidation=false' \ - echo 'WebUI\LocalHostAuth=false' >>/defaults/qBittorrent.conf \ - >>/defaults/qBittorrent.conf + # Remove fixed folders, allows connection to webUI + sed '11,13d' /defaults/qBittorrent.conf \ + echo 'WebUI\HostHeaderValidation=false' \ + echo 'WebUI\LocalHostAuth=false' >>/defaults/qBittorrent.conf \ + >>/defaults/qBittorrent.conf + ) >/dev/null + echo "Bashio installed" fi diff --git a/webtrees/rootfs/script/00-aaa_dockerfile_backup.sh b/webtrees/rootfs/script/00-aaa_dockerfile_backup.sh index 71e2d0d1c..2f8b8e5e7 100644 --- a/webtrees/rootfs/script/00-aaa_dockerfile_backup.sh +++ b/webtrees/rootfs/script/00-aaa_dockerfile_backup.sh @@ -1,34 +1,34 @@ #!/bin/bash -# If dockerfile failed install manually +# If dockerfile failed install manually if [ ! -f "/usr/bin/bashio" ]; then echo "Bashio does not exist, executing script" + ( + ################ + # Install apps # + ################ + apt-get clean && + apt-get update && + apt-get install -y \ + jq \ + curl && + apt-get clean - ################ - # Install apps # - ################ - apt-get clean && - apt-get update && - apt-get install -y \ - jq \ - curl && - apt-get clean - - ################ - # Modify image # - ################ - # Change data location - grep -rl "/var/www/webtrees" /etc/ | xargs sed -i 's|/var/www/webtrees|/data/webtrees|g' - - ################### - # Install bashio # - ################## - BASHIO_VERSION=0.13.1 - mkdir -p /tmp/bashio - curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | - tar -xzf - --strip 1 -C /tmp/bashio - mv /tmp/bashio/lib /usr/lib/bashio - ln -s /usr/lib/bashio/bashio /usr/bin/bashio - rm -rf /tmp/bashio + ################ + # Modify image # + ################ + # Change data location + grep -rl "/var/www/webtrees" /etc/ | xargs sed -i 's|/var/www/webtrees|/data/webtrees|g' + ################### + # Install bashio # + ################## + BASHIO_VERSION=0.13.1 + mkdir -p /tmp/bashio + curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" | + tar -xzf - --strip 1 -C /tmp/bashio + mv /tmp/bashio/lib /usr/lib/bashio + ln -s /usr/lib/bashio/bashio /usr/bin/bashio + rm -rf /tmp/bashio + ) >/dev/null echo "Bashio installed" fi