New PACKAGES logic

resiliosync/Dockerfile

@@ -2,6 +2,12 @@ ARG BUILD_FROM
 ARG BUILD_VERSION
 FROM ${BUILD_FROM}
 ENV BASHIO_VERSION=0.14.3
+ENV PACKAGES="jq \
+    curl \
+    cifs-utils \
+    keyutils \
+    samba \
+    smbclient"
 
 RUN \
     ################
@@ -9,13 +15,7 @@ RUN \
     ################
     apt-get clean \
     && apt-get update \
-    && apt-get install -y --no-install-recommends \
-    jq \
-    curl \
-    cifs-utils \
-    keyutils \
-    samba \
-    smbclient \
+    && apt-get install -y --no-install-recommends ${PACKAGES} \
     \
     ##################
     # Install bashio #

resiliosync/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,29 +6,23 @@ if [ ! -f "/usr/bin/bashio" ]; then
         ################
         # Install apps #
         ################
+        PACKAGES="${PACKAGES:="curl"}"
+        
         apt-get clean \
-            apt-get update \
-            apt-get install -y --no-install-recommends \
-            jq \
-            curl \
-            cifs-utils \
-            keyutils \
-            samba \
-            smbclient
+        && apt-get update \
+        && apt-get install -y --no-install-recommends ${PACKAGES} 2>/dev/null \
+        || apk add --no-cache ${PACKAGES}
 
-        ##################
+        ###################
         # Install bashio #
         ##################
-        curl -J -L -o /tmp/bashio.tar.gz \
-            "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" &&
-            mkdir /tmp/bashio &&
-            tar zxvf \
-                /tmp/bashio.tar.gz \
-                --strip 1 -C /tmp/bashio &&
-            mv /tmp/bashio/lib /usr/lib/bashio &&
-            ln -s /usr/lib/bashio/bashio /usr/bin/bashio &&
-            rm -fr \
-                /tmp/*
+        
+        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