New PACKAGES logic

jackett/Dockerfile

@@ -2,12 +2,18 @@ ARG BUILD_FROM
 ARG BUILD_VERSION
 FROM ${BUILD_FROM}
 ENV BASHIO_VERSION=0.14.3
+ENV PACKAGES="curl"
 
 RUN \
+    ################
+    # Install apps #
+    ################
+    apk add --no-cache ${PACKAGES} \
+    \ 
     ##################
     # Install bashio #
     ##################
-    curl -J -L -o /tmp/bashio.tar.gz \
+    && 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 \
@@ -16,7 +22,7 @@ RUN \
     \
     && mv /tmp/bashio/lib /usr/lib/bashio \
     && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
-    && rm -fr /tmp/bashio.tar.gz 
+    && rm -fr /tmp/bashio.tar.gz || true
 
 # use /data instead of /config for hass.io environment
 RUN sed -i "s|/config|/config/jackett|g" /etc/services.d/jackett/run \

jackett/root/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+# If dockerfile failed install manually
+if [ ! -f "/usr/bin/bashio" ]; then
+    echo "Bashio does not exist, executing script"
+    (
+        ################
+        # Install apps #
+        ################
+        PACKAGES="${PACKAGES:="curl"}"
+        
+        apt-get clean \
+        && apt-get update \
+        && apt-get install -y --no-install-recommends ${PACKAGES} 2>/dev/null \
+        || apk add --no-cache ${PACKAGES}
+
+        ###################
+        # 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
+
+    ) >/dev/null
+
+fi