New PACKAGES logic

organizr/Dockerfile

@@ -2,14 +2,14 @@ ARG BUILD_FROM
 ARG BUILD_VERSION
 FROM ${BUILD_FROM}
 ENV BASHIO_VERSION=0.14.3
+ENV PACKAGES="curl \
+  jq"
 
 RUN \
   ################
   # Install apps #
   ################
-  apk add --no-cache \
-  curl \
-  jq \
+  apk add --no-cache ${PACKAGES} \
   \
   ###################
   # Install bashio #
@@ -19,14 +19,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 \
   \

organizr/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