From e70fca9ba114444ae47b092d4249ea8039df0318 Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre.pary@gmail.com>
Date: Mon, 6 Dec 2021 15:32:28 +0100
Subject: [PATCH] remove tempio

---
 inadyn/Dockerfile                             |  1 -
 qbittorrent/Dockerfile                        | 37 ++++++--------
 .../cont-init.d/00-aaa_dockerfile_backup.sh   | 49 +++----------------
 3 files changed, 22 insertions(+), 65 deletions(-)

diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile
index 94661000e..f727640e8 100644
--- a/inadyn/Dockerfile
+++ b/inadyn/Dockerfile
@@ -2,7 +2,6 @@ FROM troglobit/inadyn:latest
 
 # Base system
 ENV BASHIO_VERSION=0.14.3
-ARG TEMPIO_VERSION=2021.01.0
 ARG BUILD_ARCH
 
 ENV LANG='C.UTF-8'\
diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile
index 5ee97cec4..5f3289a31 100644
--- a/qbittorrent/Dockerfile
+++ b/qbittorrent/Dockerfile
@@ -4,17 +4,9 @@ FROM ${BUILD_FROM}
 
 # Base system
 ENV BASHIO_VERSION=0.14.3
-ARG TEMPIO_VERSION=2021.01.0
+ENV BUILD_ARCH=$BUILD_ARCH
 ARG BUILD_ARCH
-
-RUN \
-    ################
-    # Install apps #
-    ################
-    apt-get clean \
-    && apt-get update \
-    && apt-get install -y \
-    jq \
+ENV PACKAGES="jq \
     curl \
     cifs-utils \
     keyutils \
@@ -22,15 +14,16 @@ RUN \
     smbclient \
     nginx \
     coreutils \
-    openvpn \
+    openvpn"
+
+RUN \
+    ################
+    # Install apps #
+    ################
+    apt-get clean \
+    && apt-get update \
+    && apt-get install -y ${PACKAGES} \
     && 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 \
     \
     ##############
     # STATISTICS #
@@ -46,14 +39,14 @@ RUN \
     | 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 \
-    \
+    && rm -rf /tmp/bashio || true
+
+RUN \
     ########################################
     # 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/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 \
     \
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 dd2e31c50..712c49e79 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,5 +1,4 @@
 #!/bin/bash
-
 # If dockerfile failed install manually
 if [ ! -f "/usr/bin/bashio" ]; then
     echo "Bashio does not exist, executing script"
@@ -7,57 +6,23 @@ if [ ! -f "/usr/bin/bashio" ]; then
         ################
         # Install apps #
         ################
+        PACKAGES="${PACKAGES:="curl"}"
+        
         apt-get clean \
-        apt-get update \
-        apt-get install -y \
-        jq \
-        curl \
-        cifs-utils \
-        keyutils \
-        samba \
-        smbclient \
-        nginx \
-        coreutils \
-        openvpn
-        apt-get clean
+        && apt-get update \
+        && apt-get install -y $PACKAGES 2>/dev/null \
+        || apk add --no-cache $PACKAGES
 
-        ##################
-        # 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 \
+        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 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
-        echo 'WebUI\HostHeaderValidation=false' >>/defaults/qBittorrent.conf
-        echo 'WebUI\LocalHostAuth=false' >>/defaults/qBittorrent.conf
-
     ) >/dev/null
 
 fi