Merge pull request #92 from buanet/beta

Beta to stable

.VERSION

@@ -1 +1 @@
-v4.1.0
+v4.2.0

README.md

@@ -61,23 +61,31 @@ The following will give a short overview.
 ### Environment variables
 
 To configure the ioBroker container on startup it is possible to set some environment variables.
+You do not have to declare every single variable when stting up your container. Variables you do not set will come up with their default value.
+
+**Important: In v4.2.0 the ENVs "ADMINPORT" and "REDIS" were renamed/ reorganized. For Details see the following table!**
 
 |env|default|description|
 |---|---|---|
-|ADMINPORT|8081|Sets ioBroker adminport on startup|
 |AVAHI|false|Installs and activates avahi-daemon for supporting yahka-adapter, can be "true" or "false"|
+|IOB_ADMINPORT|8081|Sets ioBroker adminport on startup|
+|IOB_OBJECTSDB_HOST|127.0.0.1|Sets hostname for ioBroker objects db|
+|IOB_OBJECTSDB_PORT|9001|Sets port for ioBroker objects db|
+|IOB_OBJECTSDB_TYPE|file|Sets type of ioBroker objects db, cloud be "file", "redis" or "couch"|
+|IOB_STATESDB_HOST|127.0.0.1|Sets hostname for ioBroker states db|
+|IOB_STATESDB_PORT|9000|Sets port for ioBroker states db|
+|IOB_STATESDB_TYPE|file|Sets type of ioBroker states db, could be "file" or "redis"|
 |LANG|de_DE.UTF‑8|The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8|
 |LANGUAGE|de_DE:de|The following locales are pre-generated: de_DE:de, en_US:en|
 |LC_ALL|de_DE.UTF-8|The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8|
 |PACKAGES|vi|Installs additional packages to your container needed by some adapters, packages should be seperated by whitespace like "package1 package2 package3"|
-|REDIS|false|Activates the uses of redis as states-db on startup, fill with "hostname:port" to set redis connection, redis db has to be set up seperately (e.g. in another container)|
 |SETGID|1000|For security reasons it might be useful to specify the gid of the containers iobroker user to match an existing group on the docker host|
 |SETUID|1000|For security reasons it might be useful to specify the uid of the containers iobroker user to match an existing user on the docker host|
 |TZ|Europe/Berlin|All valid Linux-timezones|
 |USBDEVICES|none|Sets relevant permissions on mounted devices like "/dev/ttyACM0", for more than one device separate with ";" like "/dev/ttyACM0;/dev/ttyACM1"|
 |ZWAVE|false|Will install openzwave to support zwave-adapter, can be "true" or "false"|
 
-### Mounting Folder/ Volume
+### Mounting folder/ volume
 
 It is possible to mount an empty folder to /opt/iobroker during first startup of the container. The Startupscript will check this folder and restore content if it is empty.
 Since v4.1.0 it is also possible mount a folder filled up with an iobroker backup file (created with backitup adapter) named like this: "iobroker_2020_01_06-01_09_10_backupiobroker.tar.gz".
@@ -88,19 +96,59 @@ Note: It is absolutely recommended to use a mounted folder or persistent volume
 You can also mount a folder containing an existing ioBroker-installation (e.g. when moving an existing installation to docker).
 But watch for the used node version. If the existing installation runs with another major version of node you have do perform additional steps. For more Details see the "Important notice" on top.
 
-### Permission Fixer
+**Important: If the folder you mount to /opt/iobroker in your container is placed on a mounted device, partition or other storage, the mountpoint on your host should NOT have the "noexec" flag activated. Otherwise you may get problems executing ioBroker inside the container!**   
+
+### Permission fixer
 
 After some issues with permissions related to the use of a dedicated user for ioBroker, I added some code for fixing permissions on container startup. This might take a few minutes on first startup. Please take a look at the container logs and be patient!
 
+### Userdefined startup scripts (advanced setting/ beta status)
+
+In some cases it migth be helpful to add some script code to the startup script of the container. This is now possible by mounting an additional folder to the container and place a userscript in there.
+The folder containing your userscripts must be mounted under /opt/userscripts inside the container. If you mount an empty folder you will get two example scripts to be restored in that folder. Just try it out.
+
+Basically there are two different scripts which will be read and called by the startup script. One that will only be called once at the first start of the container (userscript_firststart.sh) and one which will be called for every start of the container (userscript_everystart.sh).
+
+Hint:
+To get familiar with that feature try the following: Create a Container, mount an empty folder to /opt/userscripts, start your container. Two scripts will be restored into the empty folder. Rename the example scripts by simply removing "\_example". Restart your container and take a look at the Log. In "Step 4 of 5: Applying special settings" you will see the messages generated by the example userscripts.
+
+## Miscellaneous
+
+### Subscribe to updates
+
+If you want the newest updates about the image and my tutorials at https://buanet.de/tutorials you can simply subscribe to my new "news and updates" channel (only in german) on Telegram.
+You will find the channel here: https://t.me/buanet_tutorials
+
+### Support the project
+
+The easiest way to support this project is to leave me some likes/ stars on github and docker hub!<br>
+If you want to give something back, feel free to take a look into the [open issues](https://github.com/buanet/docker-iobroker/issues) or the [ioBroker forum thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) and helping me answering questions, fixing bugs or adding new features!<br>
+And if you want to buy me a beer instead, you can do this here: <a href="https://www.paypal.me/buanet" target="_blank"><img src="https://buanet.de/wp-content/uploads/2017/08/pp128.png" height="20" width="20"></a><br>
+Thank you!
+
 ## Changelog
 
+### v4.2.0 (2020-04-14)
+* v4.1.4beta (2020-04-07)
+  * switching base image to buster
+  * optimizing installation of packages defined by ENV "PACKAGES"
+* v4.1.3beta (2020-02-08)
+  * renamed ENV for adminport (new "IOB_ADMINPORT)")
+  * added new ENVs for "iobroker setup custom" (replacing "REDIS")
+  * enhancements in startupscript logging
+* v4.1.2beta (2020-02-02)
+  * added feature for running userdefined scripts on startup
+  * small fix for permissions issues on some systems
+* v4.1.1beta (2020-01-17)
+  * updated openzwave to version 1.6.1007
+
 ### v4.1.0 (2020-01-17)
 * improved readme.md
 * v4.0.3beta (2020-01-06)
   * added support to restore backup on startup
   * small fixes according to "docker best practices"
 * v4.0.2beta (2019-12-10)
-  * added env for activating redis
+  * ~~added env for activating redis~~
   * enhancements in startupscript and dockerfile
 * v4.0.1beta (2019-11-25)
   * added env for iobroker admin port

aarch64/Dockerfile

@@ -1,7 +1,7 @@
-FROM balenalib/aarch64-debian:stretch
+FROM balenalib/aarch64-debian:buster
 
 LABEL maintainer="Andre Germann" \
-      url="<https://buanet.de>"
+      url="https://buanet.de"
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -14,6 +14,7 @@ RUN apt-get update && apt-get install -y \
     git \
     gnupg2 \
     gosu \
+    jq \
     libavahi-compat-libdnssd-dev \
     libcap2-bin \
     libpam0g-dev \
@@ -39,9 +40,11 @@ RUN sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
     && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
     && locale-gen
 
-# Create scripts directory and copy scripts
+# Create scripts directorys and copy scripts
 RUN mkdir -p /opt/scripts/ \
-    && chmod 777 /opt/scripts/
+    && mkdir -p /opt/userscripts/ \
+    && chmod 777 /opt/scripts/ \
+    && chmod 777 /opt/userscripts/
 WORKDIR /opt/scripts/
 COPY scripts/iobroker_startup.sh iobroker_startup.sh
 COPY scripts/setup_avahi.sh setup_avahi.sh
@@ -49,7 +52,11 @@ COPY scripts/setup_packages.sh setup_packages.sh
 COPY scripts/setup_zwave.sh setup_zwave.sh
 RUN chmod +x iobroker_startup.sh \
     && chmod +x setup_avahi.sh \
-    && chmod +x setup_packages.sh
+    && chmod +x setup_packages.sh \
+    && chmod +x setup_zwave.sh
+WORKDIR /opt/userscripts/
+COPY scripts/userscript_firststart_example.sh userscript_firststart_example.sh
+COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
 
 # Install ioBroker
 WORKDIR /
@@ -63,27 +70,23 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
-# Backup initial ioBroker-folder
+# Backup initial ioBroker and userscript folder
-RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker
+RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
+    && tar -cf /opt/initial_userscripts.tar /opt/userscripts
 
 # Setting up iobroker-user (shell and home directory)
 RUN chsh -s /bin/bash iobroker \
     && usermod --home /opt/iobroker iobroker
 
 # Setting up ENVs
-ENV ADMINPORT=8081 \
+ENV DEBIAN_FRONTEND="teletype" \
-    AVAHI="false" \
-    DEBIAN_FRONTEND="teletype" \
     LANG="de_DE.UTF-8" \
     LANGUAGE="de_DE:de" \
     LC_ALL="de_DE.UTF-8" \
     PACKAGES="vi" \
-    REDIS="false" \
     SETGID=1000 \
     SETUID=1000 \
-    TZ="Europe/Berlin" \
+    TZ="Europe/Berlin"
-    USBDEVICES="none" \
-    ZWAVE="false"
 
 # Run startup-script
-ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"]
+ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]

aarch64/scripts/iobroker_startup.sh

@@ -1,12 +1,17 @@
 #!/bin/bash
 
 # Reading ENV
-adminport=$ADMINPORT
+adminport=$IOB_ADMINPORT
 avahi=$AVAHI
-gid=$SETGID
+objectsdbhost=$IOB_OBJECTSDB_HOST
+objectsdbport=$IOB_OBJECTSDB_PORT
+objectsdbtype=$IOB_OBJECTSDB_TYPE
 packages=$PACKAGES
-redis=$REDIS
+setgid=$SETGID
-uid=$SETUID
+setuid=$SETUID
+statesdbhost=$IOB_STATESDB_HOST
+statesdbport=$IOB_STATESDB_PORT
+statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
@@ -37,23 +42,23 @@ echo -n "-----               " && echo -n "$(printf "%-10s %-23s" node: $(node -
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" npm: $(npm -v))" && echo " -----"
 echo "-----                                                  -----"
 echo "-----                       ENV                        -----"
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $ADMINPORT)" && echo " -----"
+if [ "$adminport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $adminport)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" AVAHI: $AVAHI)" && echo " -----"
+if [ "$avahi" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" AVAHI: $avahi)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" PACKAGES: $PACKAGES)" && echo " -----"
+if [ "$objectsdbhost" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" REDIS: $REDIS)" && echo " -----"
+if [ "$objectsdbport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETGID: $SETGID)" && echo " -----"
+if [ "$objectsdbtype" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETUID: $SETUID)" && echo " -----"
+if [ "$packages" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" PACKAGES: $packages)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $USBDEVICES)" && echo " -----"
+if [ "$setgid" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETGID: $setgid)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ZWAVE: $ZWAVE)" && echo " -----"
+if [ "$setuid" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETUID: $setuid)" && echo " -----"; fi
+if [ "$statesdbhost" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_HOST: $statesdbhost)" && echo " -----"; fi
+if [ "$statesdbport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_PORT: $statesdbport)" && echo " -----"; fi
+if [ "$statesdbtype" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_TYPE: $statesdbtype)" && echo " -----"; fi
+if [ "$usbdevices" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $usbdevices)" && echo " -----"; fi
+if [ "$zwave" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ZWAVE: $zwave)" && echo " -----"; fi
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
 
-# Not in use
-# if [ -f /opt/.firstrun ]
-# rm -f /opt/.firstrun
-
-
 #####
 # STEP 1 - Preparing container
 #####
@@ -62,31 +67,30 @@ echo "-----         Step 1 of 5: Preparing container         -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-# Installing additional packages
+# Installing additional packages and setting uid/gid
-if [ "$packages" != "" ]
+if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
 then
+  if [ "$packages" != "" ]
+  then
     echo "Installing additional packages is set by ENV."
     echo "The following packages will be installed:" $packages"..."
     echo $packages > /opt/scripts/.packages
-  sh /opt/scripts/setup_packages.sh > /opt/scripts/setup_packages.log 2>&1
+    bash /opt/scripts/setup_packages.sh
     echo "Done."
-else
+    echo ' '
-  echo "There are no additional packages defined."
+  fi
-fi
+  if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
-echo ' '
+  then
-
-# Checking and setting uid/gid
-if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $gid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $uid ]
-then 
     echo "Different UID and/ or GID is set by ENV."
-  echo "Changing UID to "$uid" and GID to "$gid"..."
+    echo "Changing UID to "$setuid" and GID to "$setgid"..."
-  usermod -u $uid iobroker
+    usermod -u $setuid iobroker
-  groupmod -g $gid iobroker
+    groupmod -g $setgid iobroker
     echo "Done."
+    echo ' '
+  fi
 else
-  echo "There are no changes in UID/ GID needed."
+  echo "Nothing to do here."
 fi
-echo ' '
 
 # Change directory for next steps
 cd /opt/iobroker
@@ -144,8 +148,8 @@ echo ' '
 
 # (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts"
 echo "(Re)Setting folder permissions (This might take a while! Please be patient!)..."
-  chown -R $uid:$gid /opt/iobroker
+  chown -R $setuid:$setgid /opt/iobroker
-  chown -R $uid:$gid /opt/scripts
+  chown -R $setuid:$setgid /opt/scripts
 echo "Done."
 echo ' '
 
@@ -162,15 +166,15 @@ if [ -f /opt/iobroker/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    sh /opt/iobroker/iobroker host $(cat /opt/iobroker/.install_host)
+    bash iobroker host $(cat /opt/iobroker/.install_host)
     rm -f /opt/iobroker/.install_host
   echo 'Done.'
   echo ' '
-elif [ $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
+elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
 then
   echo "Hostname in ioBroker does not match the hostname of this container."
   echo "Updating hostname to " $(hostname)"..."
-    sh /opt/iobroker/iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+    bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
   echo 'Done.'
   echo ' '
 fi
@@ -188,41 +192,55 @@ echo "Some adapters have special requirements/ settings which can be activated b
 echo "For more information take a look at readme.md on Github!"
 echo ' '
 
+
 # Checking ENV for Adminport
-if [ "$adminport" != $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ]
+if [ "$adminport" != "" ]
 then
+  if [ "$adminport" != $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ]
+  then
     echo "Adminport set by ENV does not match port configured in ioBroker installation."
-  echo "Setting Adminport to" $adminport"..."
+    echo "Setting Adminport to \""$adminport"\"..."
-    iobroker set admin.0 --port $adminport
+    bash iobroker set admin.0 --port $adminport
     echo 'Done.'
     echo ' '
+  fi
 fi
 
+
 # Checking ENV for AVAHI
-if [ "$avahi" = "true" ]
+if [ "$avahi" != "" ]
 then
+  if [ "$avahi" = "true" ]
+  then
     echo "Avahi-daemon is activated by ENV."
-  chmod 764 /opt/scripts/setup_avahi.sh
+    chmod 755 /opt/scripts/setup_avahi.sh
-  sh /opt/scripts/setup_avahi.sh
+    bash /opt/scripts/setup_avahi.sh
     echo "Done."
     echo ' '
+  fi
 fi
 
+
 # Checking ENV for Z-WAVE
-if [ "$zwave" = "true" ]
+if [ "$zwave" != "" ]
 then
+  if [ "$zwave" = "true" ]
+  then
     echo "Z-Wave is activated by ENV."
-  chmod 764 /opt/scripts/setup_zwave.sh
+    chmod 755 /opt/scripts/setup_zwave.sh
-  sh /opt/scripts/setup_zwave.sh
+    bash /opt/scripts/setup_zwave.sh
     echo "Done."
     echo ' '
+  fi
 fi
 
-# checking ENV for USBDEVICES
-if [ "$usbdevices" != "none" ]
-then
-  echo "Usb-device-support is activated by ENV."
 
+# checking ENV for USBDEVICES
+if [ "$usbdevices" != "" ]
+then
+  if [ "$usbdevices" != "none" ]
+  then
+    echo "Usb-device-support is activated by ENV."
     IFS=';' read -ra devicearray <<< "$usbdevices"
       for i in "${devicearray[@]}"
       do
@@ -232,24 +250,110 @@ then
       done
     echo "Done."
     echo ' '
+  fi
 fi
 
-# Checking ENV for REDIS
+
-if [ "$redis" != "false" ]
+# Checking ENVs for custom setup of objects db
+if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ]
 then
-  echo "Connection to Redis is configured by ENV."
+  if [ "$objectsdbtype" != $(jq '.objects.type' /opt/iobroker/iobroker-data/iobroker.json) ]
-  echo "Installing prerequisites..."
+  then
-  apt-get update 2>&1> /dev/null && apt-get install -y jq 2>&1> /dev/null && rm -rf /var/lib/apt/lists/* 2>&1> /dev/null
+    echo "ENV IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation."
-  redisserver=$(echo $redis | sed -E  's/(.*):(.*)/\1/')
+    echo "Setting type of objects db to \""$objectsdbtype"\"..."
-  redisport=$(echo $redis | sed -E  's/(.*):(.*)/\2/')
+    jq --arg objectsdbtype "$objectsdbtype" '.objects.type = $objectsdbtype' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
-  echo "Setting configuration for Redis (Server: "$redisserver", Port: "$redisport") in ioBroker..."
-  cd /opt/iobroker/iobroker-data
-  jq --arg redisserver "$redisserver" --arg redisport "$redisport" '.states.type = "redis" | .states.host = $redisserver | .states.port = $redisport' iobroker.json > iobroker.json.tmp && mv iobroker.json.tmp iobroker.json
-  cd /opt/iobroker
     echo "Done."
+  else
+    echo "ENV IOB_OBJECTSDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
+  if [ "$objectsdbhost" != $(jq '.objects.host' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_OBJECTSDB_HOST is set and value is different from detected ioBroker installation."
+    echo "Setting host of objects db to \""$objectsdbhost"\"..."
+    jq --arg objectsdbhost "$objectsdbhost" '.objects.host = $objectsdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
+    echo "Done."
+  else
+    echo "ENV IOB_OBJECTSDB_HOST is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
+  if [ "$objectsdbport" != $(jq '.objects.port' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_OBJECTSDB_PORT is set and value is different from detected ioBroker installation."
+    echo "Setting port of objects db to \""$objectsdbport"\"..."
+    jq --arg objectsdbport "$objectsdbport" '.objects.port = $objectsdbport' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
+    echo "Done."
+  else
+    echo "ENV IOB_OBJECTSDB_PORT is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
   echo ' '
 fi
 
+
+# Checking ENVs for custom setup of states db#
+if [ "$statesdbtype" != "" ] || [ "$statesdbhost" != "" ] || [ "$statesdbport" != "" ]
+then
+  if [ "$statesdbtype" != $(jq '.states.type' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_STATESDB_TYPE is set and value is different from detected ioBroker installation."
+    echo "Setting type of states db to \""$statesdbtype"\"..."
+    jq --arg statesdbtype "$statesdbtype" '.states.type = $statesdbtype' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
+    echo "Done."
+  else
+    echo "ENV IOB_STATESDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
+  if [ "$statesdbhost" != $(jq '.states.host' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_STATESDB_HOST is set and value is different from detected ioBroker installation."
+    echo "Setting host of states db to \""$statesdbhost"\"..."
+    jq --arg statesdbhost "$statesdbhost" '.states.host = $statesdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
+    echo "Done."
+  else
+    echo "ENV IOB_STATESDB_HOST is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
+  if [ "$statesdbport" != $(jq '.states.port' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_STATESDB_PORT is set and value is different from detected ioBroker installation."
+    echo "Setting port of states db to \""$statesdbport"\"..."
+    jq --arg statesdbport "$statesdbport" '.states.port = $statesdbport' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
+    echo "Done."
+  else
+    echo "ENV IOB_STATESDB_PORT is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
+  echo ' '
+fi
+
+
+# Checking for Userscripts in /opt/userscripts
+if [ `find /opt/userscripts -type f | wc -l` -lt 1 ]
+then
+  echo "There is no data detected in /opt/userscripts. Restoring exapmple userscripts..."
+  tar -xf /opt/initial_userscripts.tar -C /
+  chmod 755 /opt/userscripts/userscript_firststart_example.sh
+  chmod 755 /opt/userscripts/userscript_everystart_example.sh
+  echo "Done."
+  echo ' '
+elif [ -f /opt/userscripts/userscript_firststart.sh ] || [ -f /opt/userscripts/userscript_everystart.sh ]
+then
+  if [ -f /opt/userscripts/userscript_firststart.sh ] && [ -f /opt/.firstrun ]
+  then
+    echo "Userscript for first start detected and this is the first start of a new container."
+    echo "Running userscript_firststart.sh..."
+    chmod 755 /opt/userscripts/userscript_firststart.sh
+    bash /opt/userscripts/userscript_firststart.sh
+    rm -f /opt/.firstrun
+    echo "Done."
+    echo ' '
+  fi
+  if [ -f /opt/userscripts/userscript_everystart.sh ]
+  then
+    echo "Userscript for every start detected. Running userscript_everystart.sh..."
+    chmod 755 /opt/userscripts/userscript_everystart.sh
+    bash /opt/userscripts/userscript_everystart.sh
+    echo "Done."
+    echo ' '
+  fi
+fi
+
+
 sleep 5
 
 

aarch64/scripts/setup_packages.sh

@@ -1,7 +1,12 @@
 #!/bin/bash
 
-apt-get update
+apt-get -qq update
-apt-get install -y  $(cat /opt/scripts/.packages)
+
+packages=$(cat /opt/scripts/.packages)
+for i in $packages; do
+  sudo apt-get -qq -y install $i
+done
+
 rm -rf /var/lib/apt/lists/*
 rm -f /opt/scripts/.packages
 

aarch64/scripts/setup_zwave.sh

@@ -8,9 +8,9 @@ then
 else
   echo "Openzwave is NOT installed. Going to install it now..."
   cd /opt
-  curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.945.tar.gz
+  curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.1007.tar.gz
-  tar -xf openzwave-1.6.945.tar.gz && rm openzwave-1.6.945.tar.gz
+  tar -xf openzwave-1.6.1007.tar.gz && rm openzwave-1.6.1007.tar.gz
-  cd openzwave-1.6.945 && make > /dev/null 2>&1 && make install > /dev/null 2>&1
+  cd openzwave-1.6.1007 && make > /dev/null 2>&1 && make install > /dev/null 2>&1
   ldconfig /usr/local/lib64
   cd /opt/iobroker
   # echo "Openzwave is now installed..."

aarch64/scripts/userscript_everystart_example.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# This is an example script file.
+# To run the Script on every start of the container you have to rename it to userscript_everystart.sh.
+
+# You can add your advanced script code here!
+
+echo ' '
+echo "I'm your startscript userscript_everystart.sh. I will run on EVERY container startup."
+echo ' '
+
+
+exit 0

aarch64/scripts/userscript_firststart_example.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# This is an example script file.
+# To run the Script on the first start of a new container you have to rename it to userscript_firststart.sh.
+
+# You can add your advanced script code here!
+
+echo ' '
+echo "I'm your startscript userscript_firststart.sh. I will run only on the FIRST startup of the container."
+echo ' '
+
+exit 0

amd64/Dockerfile

@@ -1,7 +1,7 @@
-FROM debian:stretch
+FROM amd64/debian:buster
 
 LABEL maintainer="Andre Germann" \
-      url="<https://buanet.de>"
+      url="https://buanet.de"
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -14,6 +14,7 @@ RUN apt-get update && apt-get install -y \
     git \
     gnupg2 \
     gosu \
+    jq \
     libavahi-compat-libdnssd-dev \
     libcap2-bin \
     libpam0g-dev \
@@ -39,9 +40,11 @@ RUN sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
     && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
     && locale-gen
 
-# Create scripts directory and copy scripts
+# Create scripts directorys and copy scripts
 RUN mkdir -p /opt/scripts/ \
-    && chmod 777 /opt/scripts/
+    && mkdir -p /opt/userscripts/ \
+    && chmod 777 /opt/scripts/ \
+    && chmod 777 /opt/userscripts/
 WORKDIR /opt/scripts/
 COPY scripts/iobroker_startup.sh iobroker_startup.sh
 COPY scripts/setup_avahi.sh setup_avahi.sh
@@ -49,7 +52,11 @@ COPY scripts/setup_packages.sh setup_packages.sh
 COPY scripts/setup_zwave.sh setup_zwave.sh
 RUN chmod +x iobroker_startup.sh \
     && chmod +x setup_avahi.sh \
-    && chmod +x setup_packages.sh
+    && chmod +x setup_packages.sh \
+    && chmod +x setup_zwave.sh
+WORKDIR /opt/userscripts/
+COPY scripts/userscript_firststart_example.sh userscript_firststart_example.sh
+COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
 
 # Install ioBroker
 WORKDIR /
@@ -63,27 +70,23 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
-# Backup initial ioBroker-folder
+# Backup initial ioBroker and userscript folder
-RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker
+RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
+    && tar -cf /opt/initial_userscripts.tar /opt/userscripts
 
 # Setting up iobroker-user (shell and home directory)
 RUN chsh -s /bin/bash iobroker \
     && usermod --home /opt/iobroker iobroker
 
 # Setting up ENVs
-ENV ADMINPORT=8081 \
+ENV DEBIAN_FRONTEND="teletype" \
-    AVAHI="false" \
-    DEBIAN_FRONTEND="teletype" \
     LANG="de_DE.UTF-8" \
     LANGUAGE="de_DE:de" \
     LC_ALL="de_DE.UTF-8" \
     PACKAGES="vi" \
-    REDIS="false" \
     SETGID=1000 \
     SETUID=1000 \
-    TZ="Europe/Berlin" \
+    TZ="Europe/Berlin"
-    USBDEVICES="none" \
-    ZWAVE="false"
 
 # Run startup-script
-ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"]
+ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]

amd64/scripts/iobroker_startup.sh

@@ -1,12 +1,17 @@
 #!/bin/bash
 
 # Reading ENV
-adminport=$ADMINPORT
+adminport=$IOB_ADMINPORT
 avahi=$AVAHI
-gid=$SETGID
+objectsdbhost=$IOB_OBJECTSDB_HOST
+objectsdbport=$IOB_OBJECTSDB_PORT
+objectsdbtype=$IOB_OBJECTSDB_TYPE
 packages=$PACKAGES
-redis=$REDIS
+setgid=$SETGID
-uid=$SETUID
+setuid=$SETUID
+statesdbhost=$IOB_STATESDB_HOST
+statesdbport=$IOB_STATESDB_PORT
+statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
@@ -37,23 +42,23 @@ echo -n "-----               " && echo -n "$(printf "%-10s %-23s" node: $(node -
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" npm: $(npm -v))" && echo " -----"
 echo "-----                                                  -----"
 echo "-----                       ENV                        -----"
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $ADMINPORT)" && echo " -----"
+if [ "$adminport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $adminport)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" AVAHI: $AVAHI)" && echo " -----"
+if [ "$avahi" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" AVAHI: $avahi)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" PACKAGES: $PACKAGES)" && echo " -----"
+if [ "$objectsdbhost" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" REDIS: $REDIS)" && echo " -----"
+if [ "$objectsdbport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETGID: $SETGID)" && echo " -----"
+if [ "$objectsdbtype" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETUID: $SETUID)" && echo " -----"
+if [ "$packages" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" PACKAGES: $packages)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $USBDEVICES)" && echo " -----"
+if [ "$setgid" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETGID: $setgid)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ZWAVE: $ZWAVE)" && echo " -----"
+if [ "$setuid" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETUID: $setuid)" && echo " -----"; fi
+if [ "$statesdbhost" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_HOST: $statesdbhost)" && echo " -----"; fi
+if [ "$statesdbport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_PORT: $statesdbport)" && echo " -----"; fi
+if [ "$statesdbtype" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_TYPE: $statesdbtype)" && echo " -----"; fi
+if [ "$usbdevices" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $usbdevices)" && echo " -----"; fi
+if [ "$zwave" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ZWAVE: $zwave)" && echo " -----"; fi
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
 
-# Not in use
-# if [ -f /opt/.firstrun ]
-# rm -f /opt/.firstrun
-
-
 #####
 # STEP 1 - Preparing container
 #####
@@ -62,31 +67,30 @@ echo "-----         Step 1 of 5: Preparing container         -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-# Installing additional packages
+# Installing additional packages and setting uid/gid
-if [ "$packages" != "" ]
+if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
 then
+  if [ "$packages" != "" ]
+  then
     echo "Installing additional packages is set by ENV."
     echo "The following packages will be installed:" $packages"..."
     echo $packages > /opt/scripts/.packages
-  sh /opt/scripts/setup_packages.sh > /opt/scripts/setup_packages.log 2>&1
+    bash /opt/scripts/setup_packages.sh
     echo "Done."
-else
+    echo ' '
-  echo "There are no additional packages defined."
+  fi
-fi
+  if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
-echo ' '
+  then
-
-# Checking and setting uid/gid
-if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $gid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $uid ]
-then 
     echo "Different UID and/ or GID is set by ENV."
-  echo "Changing UID to "$uid" and GID to "$gid"..."
+    echo "Changing UID to "$setuid" and GID to "$setgid"..."
-  usermod -u $uid iobroker
+    usermod -u $setuid iobroker
-  groupmod -g $gid iobroker
+    groupmod -g $setgid iobroker
     echo "Done."
+    echo ' '
+  fi
 else
-  echo "There are no changes in UID/ GID needed."
+  echo "Nothing to do here."
 fi
-echo ' '
 
 # Change directory for next steps
 cd /opt/iobroker
@@ -144,8 +148,8 @@ echo ' '
 
 # (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts"
 echo "(Re)Setting folder permissions (This might take a while! Please be patient!)..."
-  chown -R $uid:$gid /opt/iobroker
+  chown -R $setuid:$setgid /opt/iobroker
-  chown -R $uid:$gid /opt/scripts
+  chown -R $setuid:$setgid /opt/scripts
 echo "Done."
 echo ' '
 
@@ -162,15 +166,15 @@ if [ -f /opt/iobroker/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    sh /opt/iobroker/iobroker host $(cat /opt/iobroker/.install_host)
+    bash iobroker host $(cat /opt/iobroker/.install_host)
     rm -f /opt/iobroker/.install_host
   echo 'Done.'
   echo ' '
-elif [ $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
+elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
 then
   echo "Hostname in ioBroker does not match the hostname of this container."
   echo "Updating hostname to " $(hostname)"..."
-    sh /opt/iobroker/iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+    bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
   echo 'Done.'
   echo ' '
 fi
@@ -188,41 +192,55 @@ echo "Some adapters have special requirements/ settings which can be activated b
 echo "For more information take a look at readme.md on Github!"
 echo ' '
 
+
 # Checking ENV for Adminport
-if [ "$adminport" != $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ]
+if [ "$adminport" != "" ]
 then
+  if [ "$adminport" != $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ]
+  then
     echo "Adminport set by ENV does not match port configured in ioBroker installation."
-  echo "Setting Adminport to" $adminport"..."
+    echo "Setting Adminport to \""$adminport"\"..."
-    iobroker set admin.0 --port $adminport
+    bash iobroker set admin.0 --port $adminport
     echo 'Done.'
     echo ' '
+  fi
 fi
 
+
 # Checking ENV for AVAHI
-if [ "$avahi" = "true" ]
+if [ "$avahi" != "" ]
 then
+  if [ "$avahi" = "true" ]
+  then
     echo "Avahi-daemon is activated by ENV."
-  chmod 764 /opt/scripts/setup_avahi.sh
+    chmod 755 /opt/scripts/setup_avahi.sh
-  sh /opt/scripts/setup_avahi.sh
+    bash /opt/scripts/setup_avahi.sh
     echo "Done."
     echo ' '
+  fi
 fi
 
+
 # Checking ENV for Z-WAVE
-if [ "$zwave" = "true" ]
+if [ "$zwave" != "" ]
 then
+  if [ "$zwave" = "true" ]
+  then
     echo "Z-Wave is activated by ENV."
-  chmod 764 /opt/scripts/setup_zwave.sh
+    chmod 755 /opt/scripts/setup_zwave.sh
-  sh /opt/scripts/setup_zwave.sh
+    bash /opt/scripts/setup_zwave.sh
     echo "Done."
     echo ' '
+  fi
 fi
 
-# checking ENV for USBDEVICES
-if [ "$usbdevices" != "none" ]
-then
-  echo "Usb-device-support is activated by ENV."
 
+# checking ENV for USBDEVICES
+if [ "$usbdevices" != "" ]
+then
+  if [ "$usbdevices" != "none" ]
+  then
+    echo "Usb-device-support is activated by ENV."
     IFS=';' read -ra devicearray <<< "$usbdevices"
       for i in "${devicearray[@]}"
       do
@@ -232,24 +250,110 @@ then
       done
     echo "Done."
     echo ' '
+  fi
 fi
 
-# Checking ENV for REDIS
+
-if [ "$redis" != "false" ]
+# Checking ENVs for custom setup of objects db
+if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ]
 then
-  echo "Connection to Redis is configured by ENV."
+  if [ "$objectsdbtype" != $(jq '.objects.type' /opt/iobroker/iobroker-data/iobroker.json) ]
-  echo "Installing prerequisites..."
+  then
-  apt-get update 2>&1> /dev/null && apt-get install -y jq 2>&1> /dev/null && rm -rf /var/lib/apt/lists/* 2>&1> /dev/null
+    echo "ENV IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation."
-  redisserver=$(echo $redis | sed -E  's/(.*):(.*)/\1/')
+    echo "Setting type of objects db to \""$objectsdbtype"\"..."
-  redisport=$(echo $redis | sed -E  's/(.*):(.*)/\2/')
+    jq --arg objectsdbtype "$objectsdbtype" '.objects.type = $objectsdbtype' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
-  echo "Setting configuration for Redis (Server: "$redisserver", Port: "$redisport") in ioBroker..."
-  cd /opt/iobroker/iobroker-data
-  jq --arg redisserver "$redisserver" --arg redisport "$redisport" '.states.type = "redis" | .states.host = $redisserver | .states.port = $redisport' iobroker.json > iobroker.json.tmp && mv iobroker.json.tmp iobroker.json
-  cd /opt/iobroker
     echo "Done."
+  else
+    echo "ENV IOB_OBJECTSDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
+  if [ "$objectsdbhost" != $(jq '.objects.host' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_OBJECTSDB_HOST is set and value is different from detected ioBroker installation."
+    echo "Setting host of objects db to \""$objectsdbhost"\"..."
+    jq --arg objectsdbhost "$objectsdbhost" '.objects.host = $objectsdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
+    echo "Done."
+  else
+    echo "ENV IOB_OBJECTSDB_HOST is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
+  if [ "$objectsdbport" != $(jq '.objects.port' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_OBJECTSDB_PORT is set and value is different from detected ioBroker installation."
+    echo "Setting port of objects db to \""$objectsdbport"\"..."
+    jq --arg objectsdbport "$objectsdbport" '.objects.port = $objectsdbport' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
+    echo "Done."
+  else
+    echo "ENV IOB_OBJECTSDB_PORT is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
   echo ' '
 fi
 
+
+# Checking ENVs for custom setup of states db#
+if [ "$statesdbtype" != "" ] || [ "$statesdbhost" != "" ] || [ "$statesdbport" != "" ]
+then
+  if [ "$statesdbtype" != $(jq '.states.type' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_STATESDB_TYPE is set and value is different from detected ioBroker installation."
+    echo "Setting type of states db to \""$statesdbtype"\"..."
+    jq --arg statesdbtype "$statesdbtype" '.states.type = $statesdbtype' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
+    echo "Done."
+  else
+    echo "ENV IOB_STATESDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
+  if [ "$statesdbhost" != $(jq '.states.host' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_STATESDB_HOST is set and value is different from detected ioBroker installation."
+    echo "Setting host of states db to \""$statesdbhost"\"..."
+    jq --arg statesdbhost "$statesdbhost" '.states.host = $statesdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
+    echo "Done."
+  else
+    echo "ENV IOB_STATESDB_HOST is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
+  if [ "$statesdbport" != $(jq '.states.port' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_STATESDB_PORT is set and value is different from detected ioBroker installation."
+    echo "Setting port of states db to \""$statesdbport"\"..."
+    jq --arg statesdbport "$statesdbport" '.states.port = $statesdbport' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
+    echo "Done."
+  else
+    echo "ENV IOB_STATESDB_PORT is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
+  echo ' '
+fi
+
+
+# Checking for Userscripts in /opt/userscripts
+if [ `find /opt/userscripts -type f | wc -l` -lt 1 ]
+then
+  echo "There is no data detected in /opt/userscripts. Restoring exapmple userscripts..."
+  tar -xf /opt/initial_userscripts.tar -C /
+  chmod 755 /opt/userscripts/userscript_firststart_example.sh
+  chmod 755 /opt/userscripts/userscript_everystart_example.sh
+  echo "Done."
+  echo ' '
+elif [ -f /opt/userscripts/userscript_firststart.sh ] || [ -f /opt/userscripts/userscript_everystart.sh ]
+then
+  if [ -f /opt/userscripts/userscript_firststart.sh ] && [ -f /opt/.firstrun ]
+  then
+    echo "Userscript for first start detected and this is the first start of a new container."
+    echo "Running userscript_firststart.sh..."
+    chmod 755 /opt/userscripts/userscript_firststart.sh
+    bash /opt/userscripts/userscript_firststart.sh
+    rm -f /opt/.firstrun
+    echo "Done."
+    echo ' '
+  fi
+  if [ -f /opt/userscripts/userscript_everystart.sh ]
+  then
+    echo "Userscript for every start detected. Running userscript_everystart.sh..."
+    chmod 755 /opt/userscripts/userscript_everystart.sh
+    bash /opt/userscripts/userscript_everystart.sh
+    echo "Done."
+    echo ' '
+  fi
+fi
+
+
 sleep 5
 
 

amd64/scripts/setup_packages.sh

@@ -1,7 +1,12 @@
 #!/bin/bash
 
-apt-get update
+apt-get -qq update
-apt-get install -y  $(cat /opt/scripts/.packages)
+
+packages=$(cat /opt/scripts/.packages)
+for i in $packages; do
+  sudo apt-get -qq -y install $i
+done
+
 rm -rf /var/lib/apt/lists/*
 rm -f /opt/scripts/.packages
 

amd64/scripts/setup_zwave.sh

@@ -8,9 +8,9 @@ then
 else
   echo "Openzwave is NOT installed. Going to install it now..."
   cd /opt
-  curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.945.tar.gz
+  curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.1007.tar.gz
-  tar -xf openzwave-1.6.945.tar.gz && rm openzwave-1.6.945.tar.gz
+  tar -xf openzwave-1.6.1007.tar.gz && rm openzwave-1.6.1007.tar.gz
-  cd openzwave-1.6.945 && make > /dev/null 2>&1 && make install > /dev/null 2>&1
+  cd openzwave-1.6.1007 && make > /dev/null 2>&1 && make install > /dev/null 2>&1
   ldconfig /usr/local/lib64
   cd /opt/iobroker
   # echo "Openzwave is now installed..."

amd64/scripts/userscript_everystart_example.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# This is an example script file.
+# To run the Script on every start of the container you have to rename it to userscript_everystart.sh.
+
+# You can add your advanced script code here!
+
+echo ' '
+echo "I'm your startscript userscript_everystart.sh. I will run on EVERY container startup."
+echo ' '
+
+
+exit 0

amd64/scripts/userscript_firststart_example.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# This is an example script file.
+# To run the Script on the first start of a new container you have to rename it to userscript_firststart.sh.
+
+# You can add your advanced script code here!
+
+echo ' '
+echo "I'm your startscript userscript_firststart.sh. I will run only on the FIRST startup of the container."
+echo ' '
+
+exit 0

armv7hf/Dockerfile

@@ -1,7 +1,7 @@
-FROM balenalib/armv7hf-debian:stretch
+FROM balenalib/armv7hf-debian:buster
 
 LABEL maintainer="Andre Germann" \
-      url="<https://buanet.de>"
+      url="https://buanet.de"
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -14,6 +14,7 @@ RUN apt-get update && apt-get install -y \
     git \
     gnupg2 \
     gosu \
+    jq \
     libavahi-compat-libdnssd-dev \
     libcap2-bin \
     libpam0g-dev \
@@ -39,9 +40,11 @@ RUN sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
     && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
     && locale-gen
 
-# Create scripts directory and copy scripts
+# Create scripts directorys and copy scripts
 RUN mkdir -p /opt/scripts/ \
-    && chmod 777 /opt/scripts/
+    && mkdir -p /opt/userscripts/ \
+    && chmod 777 /opt/scripts/ \
+    && chmod 777 /opt/userscripts/
 WORKDIR /opt/scripts/
 COPY scripts/iobroker_startup.sh iobroker_startup.sh
 COPY scripts/setup_avahi.sh setup_avahi.sh
@@ -49,7 +52,11 @@ COPY scripts/setup_packages.sh setup_packages.sh
 COPY scripts/setup_zwave.sh setup_zwave.sh
 RUN chmod +x iobroker_startup.sh \
     && chmod +x setup_avahi.sh \
-    && chmod +x setup_packages.sh
+    && chmod +x setup_packages.sh \
+    && chmod +x setup_zwave.sh
+WORKDIR /opt/userscripts/
+COPY scripts/userscript_firststart_example.sh userscript_firststart_example.sh
+COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
 
 # Install ioBroker
 WORKDIR /
@@ -63,27 +70,23 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
-# Backup initial ioBroker-folder
+# Backup initial ioBroker and userscript folder
-RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker
+RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
+    && tar -cf /opt/initial_userscripts.tar /opt/userscripts
 
 # Setting up iobroker-user (shell and home directory)
 RUN chsh -s /bin/bash iobroker \
     && usermod --home /opt/iobroker iobroker
 
 # Setting up ENVs
-ENV ADMINPORT=8081 \
+ENV DEBIAN_FRONTEND="teletype" \
-    AVAHI="false" \
-    DEBIAN_FRONTEND="teletype" \
     LANG="de_DE.UTF-8" \
     LANGUAGE="de_DE:de" \
     LC_ALL="de_DE.UTF-8" \
-    PACKAGES="vi" \
+    PACKAGES="vim" \
-    REDIS="false" \
     SETGID=1000 \
     SETUID=1000 \
-    TZ="Europe/Berlin" \
+    TZ="Europe/Berlin"
-    USBDEVICES="none" \
-    ZWAVE="false"
 
 # Run startup-script
-ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"]
+ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]

armv7hf/scripts/iobroker_startup.sh

@@ -1,12 +1,17 @@
 #!/bin/bash
 
 # Reading ENV
-adminport=$ADMINPORT
+adminport=$IOB_ADMINPORT
 avahi=$AVAHI
-gid=$SETGID
+objectsdbhost=$IOB_OBJECTSDB_HOST
+objectsdbport=$IOB_OBJECTSDB_PORT
+objectsdbtype=$IOB_OBJECTSDB_TYPE
 packages=$PACKAGES
-redis=$REDIS
+setgid=$SETGID
-uid=$SETUID
+setuid=$SETUID
+statesdbhost=$IOB_STATESDB_HOST
+statesdbport=$IOB_STATESDB_PORT
+statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
@@ -37,23 +42,23 @@ echo -n "-----               " && echo -n "$(printf "%-10s %-23s" node: $(node -
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" npm: $(npm -v))" && echo " -----"
 echo "-----                                                  -----"
 echo "-----                       ENV                        -----"
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $ADMINPORT)" && echo " -----"
+if [ "$adminport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $adminport)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" AVAHI: $AVAHI)" && echo " -----"
+if [ "$avahi" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" AVAHI: $avahi)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" PACKAGES: $PACKAGES)" && echo " -----"
+if [ "$objectsdbhost" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" REDIS: $REDIS)" && echo " -----"
+if [ "$objectsdbport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETGID: $SETGID)" && echo " -----"
+if [ "$objectsdbtype" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETUID: $SETUID)" && echo " -----"
+if [ "$packages" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" PACKAGES: $packages)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $USBDEVICES)" && echo " -----"
+if [ "$setgid" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETGID: $setgid)" && echo " -----"; fi
-echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ZWAVE: $ZWAVE)" && echo " -----"
+if [ "$setuid" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETUID: $setuid)" && echo " -----"; fi
+if [ "$statesdbhost" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_HOST: $statesdbhost)" && echo " -----"; fi
+if [ "$statesdbport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_PORT: $statesdbport)" && echo " -----"; fi
+if [ "$statesdbtype" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_TYPE: $statesdbtype)" && echo " -----"; fi
+if [ "$usbdevices" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $usbdevices)" && echo " -----"; fi
+if [ "$zwave" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ZWAVE: $zwave)" && echo " -----"; fi
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
 
-# Not in use
-# if [ -f /opt/.firstrun ]
-# rm -f /opt/.firstrun
-
-
 #####
 # STEP 1 - Preparing container
 #####
@@ -62,31 +67,30 @@ echo "-----         Step 1 of 5: Preparing container         -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-# Installing additional packages
+# Installing additional packages and setting uid/gid
-if [ "$packages" != "" ]
+if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
 then
+  if [ "$packages" != "" ]
+  then
     echo "Installing additional packages is set by ENV."
     echo "The following packages will be installed:" $packages"..."
     echo $packages > /opt/scripts/.packages
-  sh /opt/scripts/setup_packages.sh > /opt/scripts/setup_packages.log 2>&1
+    bash /opt/scripts/setup_packages.sh
     echo "Done."
-else
+    echo ' '
-  echo "There are no additional packages defined."
+  fi
-fi
+  if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
-echo ' '
+  then
-
-# Checking and setting uid/gid
-if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $gid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $uid ]
-then 
     echo "Different UID and/ or GID is set by ENV."
-  echo "Changing UID to "$uid" and GID to "$gid"..."
+    echo "Changing UID to "$setuid" and GID to "$setgid"..."
-  usermod -u $uid iobroker
+    usermod -u $setuid iobroker
-  groupmod -g $gid iobroker
+    groupmod -g $setgid iobroker
     echo "Done."
+    echo ' '
+  fi
 else
-  echo "There are no changes in UID/ GID needed."
+  echo "Nothing to do here."
 fi
-echo ' '
 
 # Change directory for next steps
 cd /opt/iobroker
@@ -144,8 +148,8 @@ echo ' '
 
 # (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts"
 echo "(Re)Setting folder permissions (This might take a while! Please be patient!)..."
-  chown -R $uid:$gid /opt/iobroker
+  chown -R $setuid:$setgid /opt/iobroker
-  chown -R $uid:$gid /opt/scripts
+  chown -R $setuid:$setgid /opt/scripts
 echo "Done."
 echo ' '
 
@@ -162,15 +166,15 @@ if [ -f /opt/iobroker/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    sh /opt/iobroker/iobroker host $(cat /opt/iobroker/.install_host)
+    bash iobroker host $(cat /opt/iobroker/.install_host)
     rm -f /opt/iobroker/.install_host
   echo 'Done.'
   echo ' '
-elif [ $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
+elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
 then
   echo "Hostname in ioBroker does not match the hostname of this container."
   echo "Updating hostname to " $(hostname)"..."
-    sh /opt/iobroker/iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+    bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
   echo 'Done.'
   echo ' '
 fi
@@ -188,41 +192,55 @@ echo "Some adapters have special requirements/ settings which can be activated b
 echo "For more information take a look at readme.md on Github!"
 echo ' '
 
+
 # Checking ENV for Adminport
-if [ "$adminport" != $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ]
+if [ "$adminport" != "" ]
 then
+  if [ "$adminport" != $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ]
+  then
     echo "Adminport set by ENV does not match port configured in ioBroker installation."
-  echo "Setting Adminport to" $adminport"..."
+    echo "Setting Adminport to \""$adminport"\"..."
-    iobroker set admin.0 --port $adminport
+    bash iobroker set admin.0 --port $adminport
     echo 'Done.'
     echo ' '
+  fi
 fi
 
+
 # Checking ENV for AVAHI
-if [ "$avahi" = "true" ]
+if [ "$avahi" != "" ]
 then
+  if [ "$avahi" = "true" ]
+  then
     echo "Avahi-daemon is activated by ENV."
-  chmod 764 /opt/scripts/setup_avahi.sh
+    chmod 755 /opt/scripts/setup_avahi.sh
-  sh /opt/scripts/setup_avahi.sh
+    bash /opt/scripts/setup_avahi.sh
     echo "Done."
     echo ' '
+  fi
 fi
 
+
 # Checking ENV for Z-WAVE
-if [ "$zwave" = "true" ]
+if [ "$zwave" != "" ]
 then
+  if [ "$zwave" = "true" ]
+  then
     echo "Z-Wave is activated by ENV."
-  chmod 764 /opt/scripts/setup_zwave.sh
+    chmod 755 /opt/scripts/setup_zwave.sh
-  sh /opt/scripts/setup_zwave.sh
+    bash /opt/scripts/setup_zwave.sh
     echo "Done."
     echo ' '
+  fi
 fi
 
-# checking ENV for USBDEVICES
-if [ "$usbdevices" != "none" ]
-then
-  echo "Usb-device-support is activated by ENV."
 
+# checking ENV for USBDEVICES
+if [ "$usbdevices" != "" ]
+then
+  if [ "$usbdevices" != "none" ]
+  then
+    echo "Usb-device-support is activated by ENV."
     IFS=';' read -ra devicearray <<< "$usbdevices"
       for i in "${devicearray[@]}"
       do
@@ -232,24 +250,110 @@ then
       done
     echo "Done."
     echo ' '
+  fi
 fi
 
-# Checking ENV for REDIS
+
-if [ "$redis" != "false" ]
+# Checking ENVs for custom setup of objects db
+if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ]
 then
-  echo "Connection to Redis is configured by ENV."
+  if [ "$objectsdbtype" != $(jq '.objects.type' /opt/iobroker/iobroker-data/iobroker.json) ]
-  echo "Installing prerequisites..."
+  then
-  apt-get update 2>&1> /dev/null && apt-get install -y jq 2>&1> /dev/null && rm -rf /var/lib/apt/lists/* 2>&1> /dev/null
+    echo "ENV IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation."
-  redisserver=$(echo $redis | sed -E  's/(.*):(.*)/\1/')
+    echo "Setting type of objects db to \""$objectsdbtype"\"..."
-  redisport=$(echo $redis | sed -E  's/(.*):(.*)/\2/')
+    jq --arg objectsdbtype "$objectsdbtype" '.objects.type = $objectsdbtype' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
-  echo "Setting configuration for Redis (Server: "$redisserver", Port: "$redisport") in ioBroker..."
-  cd /opt/iobroker/iobroker-data
-  jq --arg redisserver "$redisserver" --arg redisport "$redisport" '.states.type = "redis" | .states.host = $redisserver | .states.port = $redisport' iobroker.json > iobroker.json.tmp && mv iobroker.json.tmp iobroker.json
-  cd /opt/iobroker
     echo "Done."
+  else
+    echo "ENV IOB_OBJECTSDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
+  if [ "$objectsdbhost" != $(jq '.objects.host' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_OBJECTSDB_HOST is set and value is different from detected ioBroker installation."
+    echo "Setting host of objects db to \""$objectsdbhost"\"..."
+    jq --arg objectsdbhost "$objectsdbhost" '.objects.host = $objectsdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
+    echo "Done."
+  else
+    echo "ENV IOB_OBJECTSDB_HOST is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
+  if [ "$objectsdbport" != $(jq '.objects.port' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_OBJECTSDB_PORT is set and value is different from detected ioBroker installation."
+    echo "Setting port of objects db to \""$objectsdbport"\"..."
+    jq --arg objectsdbport "$objectsdbport" '.objects.port = $objectsdbport' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
+    echo "Done."
+  else
+    echo "ENV IOB_OBJECTSDB_PORT is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
   echo ' '
 fi
 
+
+# Checking ENVs for custom setup of states db#
+if [ "$statesdbtype" != "" ] || [ "$statesdbhost" != "" ] || [ "$statesdbport" != "" ]
+then
+  if [ "$statesdbtype" != $(jq '.states.type' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_STATESDB_TYPE is set and value is different from detected ioBroker installation."
+    echo "Setting type of states db to \""$statesdbtype"\"..."
+    jq --arg statesdbtype "$statesdbtype" '.states.type = $statesdbtype' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
+    echo "Done."
+  else
+    echo "ENV IOB_STATESDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
+  if [ "$statesdbhost" != $(jq '.states.host' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_STATESDB_HOST is set and value is different from detected ioBroker installation."
+    echo "Setting host of states db to \""$statesdbhost"\"..."
+    jq --arg statesdbhost "$statesdbhost" '.states.host = $statesdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
+    echo "Done."
+  else
+    echo "ENV IOB_STATESDB_HOST is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
+  if [ "$statesdbport" != $(jq '.states.port' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_STATESDB_PORT is set and value is different from detected ioBroker installation."
+    echo "Setting port of states db to \""$statesdbport"\"..."
+    jq --arg statesdbport "$statesdbport" '.states.port = $statesdbport' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
+    echo "Done."
+  else
+    echo "ENV IOB_STATESDB_PORT is set and value meets detected ioBroker installation. Nothing to do here."
+  fi
+  echo ' '
+fi
+
+
+# Checking for Userscripts in /opt/userscripts
+if [ `find /opt/userscripts -type f | wc -l` -lt 1 ]
+then
+  echo "There is no data detected in /opt/userscripts. Restoring exapmple userscripts..."
+  tar -xf /opt/initial_userscripts.tar -C /
+  chmod 755 /opt/userscripts/userscript_firststart_example.sh
+  chmod 755 /opt/userscripts/userscript_everystart_example.sh
+  echo "Done."
+  echo ' '
+elif [ -f /opt/userscripts/userscript_firststart.sh ] || [ -f /opt/userscripts/userscript_everystart.sh ]
+then
+  if [ -f /opt/userscripts/userscript_firststart.sh ] && [ -f /opt/.firstrun ]
+  then
+    echo "Userscript for first start detected and this is the first start of a new container."
+    echo "Running userscript_firststart.sh..."
+    chmod 755 /opt/userscripts/userscript_firststart.sh
+    bash /opt/userscripts/userscript_firststart.sh
+    rm -f /opt/.firstrun
+    echo "Done."
+    echo ' '
+  fi
+  if [ -f /opt/userscripts/userscript_everystart.sh ]
+  then
+    echo "Userscript for every start detected. Running userscript_everystart.sh..."
+    chmod 755 /opt/userscripts/userscript_everystart.sh
+    bash /opt/userscripts/userscript_everystart.sh
+    echo "Done."
+    echo ' '
+  fi
+fi
+
+
 sleep 5
 
 

armv7hf/scripts/setup_packages.sh

@@ -1,7 +1,12 @@
 #!/bin/bash
 
-apt-get update
+apt-get -qq update
-apt-get install -y  $(cat /opt/scripts/.packages)
+
+packages=$(cat /opt/scripts/.packages)
+for i in $packages; do
+  sudo apt-get -qq -y install $i
+done
+
 rm -rf /var/lib/apt/lists/*
 rm -f /opt/scripts/.packages
 

armv7hf/scripts/setup_zwave.sh

@@ -8,9 +8,9 @@ then
 else
   echo "Openzwave is NOT installed. Going to install it now..."
   cd /opt
-  curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.945.tar.gz
+  curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.1007.tar.gz
-  tar -xf openzwave-1.6.945.tar.gz && rm openzwave-1.6.945.tar.gz
+  tar -xf openzwave-1.6.1007.tar.gz && rm openzwave-1.6.1007.tar.gz
-  cd openzwave-1.6.945 && make > /dev/null 2>&1 && make install > /dev/null 2>&1
+  cd openzwave-1.6.1007 && make > /dev/null 2>&1 && make install > /dev/null 2>&1
   ldconfig /usr/local/lib64
   cd /opt/iobroker
   # echo "Openzwave is now installed..."

armv7hf/scripts/userscript_everystart_example.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# This is an example script file.
+# To run the Script on every start of the container you have to rename it to userscript_everystart.sh.
+
+# You can add your advanced script code here!
+
+echo ' '
+echo "I'm your startscript userscript_everystart.sh. I will run on EVERY container startup."
+echo ' '
+
+
+exit 0

armv7hf/scripts/userscript_firststart_example.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# This is an example script file.
+# To run the Script on the first start of a new container you have to rename it to userscript_firststart.sh.
+
+# You can add your advanced script code here!
+
+echo ' '
+echo "I'm your startscript userscript_firststart.sh. I will run only on the FIRST startup of the container."
+echo ' '
+
+exit 0

opt/maintenance-scripts/iobroker_restart.sh

@@ -6,6 +6,5 @@
 cd /opt/iobroker
 pkill io
 sleep 5
-node node_modules/iobroker.js-controller/controller.js >/opt/scripts/docker_iobroker_log.txt 2>&1 &
+gosu iobroker node node_modules/iobroker.js-controller/controller.js
-
 exit 0