Update README.md

From beta to latest

.VERSION

@@ -1 +1 @@
-v4.0.0
+v4.1.0

README.md

@@ -1,25 +1,58 @@
 # ioBroker for Docker
+
+[![Build Status](https://travis-ci.org/buanet/docker-iobroker.svg?branch=master)](https://travis-ci.org/buanet/docker-iobroker)
+
 Source: https://github.com/buanet/docker-iobroker
 
-IoBroker for Docker is an Dockerimage for ioBroker (http://iobroker.net) smarthome software. 
+IoBroker for Docker is an Dockerimage for ioBroker IoT platform (http://www.iobroker.net). 
 
-It is originally made for, and tested on a Synology Disk Station 1515+ with DSM 6 and Docker-package installed. But it should also work on other systems with Docker installed!
+It is originally made for and always tested on a Synology Disk Station 1515+ with DSM 6 and official Docker package installed. But it also works on other systems with Docker installed!
 
 Version 4 now supports running the Image in Docker on the following architectures: amd64, armv7hf, aarch64.
-Feel free to ask for more architectures by opening an github-issue. 
+Feel free to ask for more architectures by opening an github issue. 
 
-## Important
+## Important notice
 
-The new v4 comes again with a new major node-version (node10)!
+The new v4 comes again with a new major node version (node10)!
-If you are updating an existing Installation you have to perform some additional steps inside ioBroker!
+If you are updating an existing installation you have to perform some additional steps inside ioBroker!
-After upgrading your iobroker-container you have to call "reinstall.sh" for recompiling your installation for the use with node10!
+After upgrading your iobroker container you have to call "npm rebuild" or "reinstall.sh" (when js-controller > v1.5 "reinstall.js") for recompileing your installation for the use with node10!
-For Details see official ioBroker-documentation (http://www.iobroker.net/docu/?page_id=8323&lang=de). Make backup first!
+For more details please see official ioBroker documentation: [EN](https://www.iobroker.net/#en/documentation/install/updatenode.md) | [DE](https://www.iobroker.net/#de/documentation/install/updatenode.md).
+Make backup first!
 
-## Installation & usage
+## Getting started
 
 A detailed tutorial (german, based on v3.0.0) can be found here: [https://buanet.de](https://buanet.de/2019/05/iobroker-unter-docker-auf-der-synology-diskstation-v3/). Please notice that the old tutorial is outdated and does no longer work!
 
-For discussion and support please visit [ioBroker-forum-thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) or use the comments section at the linked tutorial. Please do not contact me directly for any support-reasons. Every support-question should be answered in a public place. Thank you.
+For discussion and support please visit [ioBroker forum thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) or use the comments section at the linked tutorial. Please do not contact me directly for any support-reasons. Every support question should be answered in a public place. Thank you.
+
+The following ways to geht iobroker-container running are only examples. Maybe you have to change, add or replace parameters to configure ioBroker for your environment.
+
+### Running from commandline
+
+For taking a first look at the iobroker docker container it would be enough to simply run the following basic docker run command: 
+
+```
+docker run -p 8081:8081 --name iobroker -v /opt/iobroker:/iobroker buanet/iobroker:latest
+```
+
+### Running with docker-compose
+
+You can also run iobroker by using docker-compose. Here is an example:
+
+```
+version: '2'
+
+services:
+  iobroker:
+    restart: always
+    image: buanet/iobroker:latest
+    container_name: iobroker
+    hostname: iobroker
+    ports:
+      - "8081:8081"
+    volumes:
+      - iobrokerdata:/opt/iobroker
+```
 
 ## Special settings and features
 
@@ -27,34 +60,54 @@ The following will give a short overview.
 
 ### Environment variables
 
-Since v3 is possible to set some environment variables to configure a new container. 
+To configure the ioBroker container on startup it is possible to set some environment variables. 
 
-|env|value|description|
+|env|default|description|
 |---|---|---|
-|PACKAGES|package1 package2 package2|seperateed by whitespace; will install the listed packages on startup<br>(be paitient, this may take some time!)|
+|ADMINPORT|8081|Sets ioBroker adminport on startup|
-|AVAHI|true|will install and activate avahi-daemon for supporting yahka-adapter|
+|AVAHI|false|Installs and activates avahi-daemon for supporting yahka-adapter, can be "true" or "false"|
-|LANGUAGE|de_DE:de|following locales are pre-generated: de_DE:de, en_US:en|
+|LANG|de_DE.UTF&#x2011;8|The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8|
-|LANG|de_DE.UTF-8|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|following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8|
+|LC_ALL|de_DE.UTF-8|The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8|
-|TZ|Europe/Berlin|all valid Linux-timezones|
+|PACKAGES|vi|Installs additional packages to your container needed by some adapters, packages should be seperated by whitespace like "package1 package2 package3"|
-|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|
+|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|
+|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|
-|ZWAVE|false|will install openzwave to support zwave-adapter|
+|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
 
-It is now 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.
+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".
+The startup script will detect this backup and restore it during the start of the container. Plese see container logs when starting the container for more details!
 
-It is absolutely recommended to use a mounted folder or persistent volume for /opt/iobroker folder!
+Note: It is absolutely recommended to use a mounted folder or persistent volume for /opt/iobroker folder!
 
-This also works with mounting a folder containing an existing ioBroker-installation (e.g. when moving an existing installation to docker). 
+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
 
-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 logs and be patient!
+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!
 
 ## Changelog
 
+### 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
+  * enhancements in startupscript and dockerfile
+* v4.0.1beta (2019-11-25)
+  * added env for iobroker admin port
+  * added env for usb-devices (setting permissions)
+  * updateing prerequisites for iobroker installation
+  * some small codefixes
+
 ### v4.0.0 (2019-10-25)
 * v3.1.4beta (2019-10-23)
   * added env for zwave support

aarch64/Dockerfile

@@ -1,38 +1,43 @@
 FROM balenalib/aarch64-debian:stretch
 
-MAINTAINER Andre Germann <https://buanet.de>
+LABEL maintainer="Andre Germann" \ 
+      url="<https://buanet.de>"
 
 ENV DEBIAN_FRONTEND noninteractive
 
-# Install prerequisites
+# Install prerequisites (as listed in iobroker installer.sh)
-RUN apt-get update && apt-get upgrade -y && apt-get install -y \
+RUN apt-get update && apt-get install -y \
-        acl \
+    acl \
-        apt-utils \
+    apt-utils \
-        build-essential \
+    build-essential \
-        curl \
+    curl \
-        git \
+    git \
-        gnupg2 \
+    gnupg2 \
-        libcap2-bin \
+    gosu \
-        libpam0g-dev \
+    libavahi-compat-libdnssd-dev \
-        libudev-dev \
+    libcap2-bin \
-        locales \
+    libpam0g-dev \
-        procps \
+    libudev-dev \
-        python \
+    locales \
-        gosu \
+    pkg-config \
-        unzip \
+    procps \
-        wget \
+    python \
+    python-dev \
+    sudo \
+    udev \
+    unzip \
+    wget \
     && rm -rf /var/lib/apt/lists/*
 
 # Install node10
 RUN curl -sL https://deb.nodesource.com/setup_10.x | bash \
-    && apt-get update && apt-get install -y \
+    && apt-get update && apt-get install -y nodejs \
-        nodejs \
     && rm -rf /var/lib/apt/lists/*
 
 # Generating locales
 RUN sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
-	&& sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
+    && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
-	&& locale-gen
+    && locale-gen
 
 # Create scripts directory and copy scripts
 RUN mkdir -p /opt/scripts/ \
@@ -43,7 +48,7 @@ COPY scripts/setup_avahi.sh setup_avahi.sh
 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_avahi.sh \
     && chmod +x setup_packages.sh
 
 # Install ioBroker
@@ -56,29 +61,29 @@ RUN apt-get update \
 
 # Install node-gyp
 WORKDIR /opt/iobroker/
-RUN npm config set unsafe-perm true     # To fix "Error: could not get uid/gid"
 RUN npm install -g node-gyp
 
 # Backup initial ioBroker-folder
 RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker
 
-# Setting up iobroker-user
+# Setting up iobroker-user (shell and home directory)
-RUN chsh -s /bin/bash iobroker
+RUN chsh -s /bin/bash iobroker \
+    && usermod --home /opt/iobroker iobroker
 
 # Setting up ENVs
-ENV DEBIAN_FRONTEND="teletype" \
+ENV ADMINPORT=8081 \
-	LANG="de_DE.UTF-8" \
+    AVAHI="false" \
-	LANGUAGE="de_DE:de" \
+    DEBIAN_FRONTEND="teletype" \
-	LC_ALL="de_DE.UTF-8" \
+    LANG="de_DE.UTF-8" \
-	TZ="Europe/Berlin" \
+    LANGUAGE="de_DE:de" \
-	PACKAGES="nano" \
+    LC_ALL="de_DE.UTF-8" \
-	AVAHI="false" \
+    PACKAGES="vi" \
-    SETUID=1000 \
+    REDIS="false" \
     SETGID=1000 \
-	ZWAVE="false"
+    SETUID=1000 \
-
+    TZ="Europe/Berlin" \
-# Setting up EXPOSE for Admin
+    USBDEVICES="none" \
-EXPOSE 8081/tcp	
+    ZWAVE="false"
 	
 # Run startup-script
 ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"]

aarch64/scripts/iobroker_startup.sh

@@ -1,16 +1,19 @@
 #!/bin/bash
 
 # Reading ENV
-packages=$PACKAGES
+adminport=$ADMINPORT
 avahi=$AVAHI
-uid=$SETUID
 gid=$SETGID
+packages=$PACKAGES
+redis=$REDIS
+uid=$SETUID
+usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
 # Getting date and time for logging 
 dati=`date '+%Y-%m-%d %H:%M:%S'`
 
-# Header
+# Logging header
 echo ' '
 echo "$(printf -- '-%.0s' {1..60})"
 echo -n "$(printf -- '-%.0s' {1..15})" && echo -n "     "$dati"      " && echo "$(printf -- '-%.0s' {1..15})"
@@ -34,21 +37,35 @@ 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 " -----"
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" AVAHI: $AVAHI)" && echo " -----"
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" PACKAGES: $PACKAGES)" && echo " -----"
+echo -n "-----               " && echo -n "$(printf "%-10s %-23s" REDIS: $REDIS)" && echo " -----"
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETGID: $SETGID)" && echo " -----"
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETUID: $SETUID)" && echo " -----"
+echo -n "-----               " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $USBDEVICES)" && echo " -----"
+echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ZWAVE: $ZWAVE)" && echo " -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-# Checking and installing additional packages
+
+# Not in use
+# if [ -f /opt/.firstrun ]
+# rm -f /opt/.firstrun
+
+
+#####
+# STEP 1 - Preparing container
+#####
 echo "$(printf -- '-%.0s' {1..60})"
-echo "-----   Step 1 of 5: Installing additional packages    -----"
+echo "-----         Step 1 of 5: Preparing container         -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
+# Installing additional packages
 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
@@ -58,53 +75,73 @@ else
 fi
 echo ' '
 
+# 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"..."
+  usermod -u $uid iobroker
+  groupmod -g $gid iobroker
+  echo "Done."
+else
+  echo "There are no changes in UID/ GID needed."
+fi
+echo ' '
+
 # Change directory for next steps
 cd /opt/iobroker
 
+
+#####
 # Detecting ioBroker-Installation
+#####
 echo "$(printf -- '-%.0s' {1..60})"
 echo "-----   Step 2 of 5: Detecting ioBroker installation   -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-if [ `ls -1a|wc -l` -lt 3 ]
+if [ `find /opt/iobroker -type f | wc -l` -lt 1 ]
 then
-  echo "There is no data detected in /opt/iobroker. Restoring..."
+  echo "There is no data detected in /opt/iobroker. Restoring initial ioBroker installation..."
   tar -xf /opt/initial_iobroker.tar -C /
   echo "Done."
+elif [ -f /opt/iobroker/iobroker ]
+then
+  echo "Existing installation of ioBroker detected in /opt/iobroker."
+elif [ $(ls iobroker_20* 2> /dev/null | wc -l) != "0" ] && [ $(tar -ztvf /opt/iobroker/iobroker_20*.tar.gz "backup/backup.json" 2> /dev/null | wc -l) != "0" ]
+then
+  echo "ioBroker backup file detected in /opt/iobroker. Restoring ioBroker..."
+  mv /opt/iobroker/*.tar.gz /opt/
+  tar -xf /opt/initial_iobroker.tar -C /
+  mkdir /opt/iobroker/backups
+  mv /opt/*.tar.gz /opt/iobroker/backups/
+  iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
+  echo "Done."
+  echo ' '
+  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+  echo "!!!!!                             IMPORTANT NOTE                             !!!!!"
+  echo "!!!!!        The sartup script restored iobroker from a backup file.         !!!!!"
+  echo "!!!!! Check /opt/iobroker/log/restore.log to see if restore was successful.  !!!!!"
+  echo "!!!!! When ioBroker now starts it will reinstall all Adapters automatically. !!!!!"
+  echo "!!!!!         This might be take a looooong time! Please be patient!         !!!!!"
+  echo "!!!!!  You can view installation process by taking a look at ioBroker log.   !!!!!"
+  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 else
-  if [ -f /opt/iobroker/iobroker ]
+  echo "There is data detected in /opt/iobroker but it looks like it is no instance of iobroker or a valid backup file!"
-  then
+  echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
-    echo "Installation of ioBroker detected in /opt/iobroker."
+  exit 1
-  else
-    echo "There is data detected in /opt/iobroker, but it looks like it is no instance of iobroker!"
-	echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
-	exit 1
-  fi
 fi
 echo ' '
 
+
+#####
 # Checking ioBroker-Installation
+#####
 echo "$(printf -- '-%.0s' {1..60})"
 echo "-----   Step 3 of 5: Checking ioBroker installation    -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-# Checking for first run and set uid/gid
-if [ -f /opt/.firstrun ]
-then 
-  echo "This is the first run of a new container. Time for some preparation."
-  echo ' '
-  echo "Changing UID to "$uid" and GID to "$gid"..."
-  usermod -u $uid iobroker
-  groupmod -g $gid iobroker
-  rm -f /opt/.firstrun
-  echo "Done."
-else
-  echo "This is NOT the first run of the container. Some Steps will be skipped."
-fi
-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
@@ -113,7 +150,7 @@ echo "Done."
 echo ' '
 
 # Backing up original iobroker-file and changing sudo to gosu
-echo "Fixing \"sudo-bug\" by replacing sudo with gosu..."
+echo "Fixing \"sudo-bug\" by replacing sudo in iobroker with gosu..."
   cp -a /opt/iobroker/iobroker /opt/iobroker/iobroker.bak
   chmod 755 /opt/iobroker/iobroker
   sed -i 's/sudo -H -u/gosu/g' /opt/iobroker/iobroker
@@ -125,23 +162,43 @@ 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)
+    sh /opt/iobroker/iobroker host $(cat /opt/iobroker/.install_host)
-	rm -f /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) ]
+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": ")[^"]*')
   echo 'Done.'
   echo ' '
 fi
 
+
+#####
 # Setting up prerequisites for some ioBroker-adapters
+#####
 echo "$(printf -- '-%.0s' {1..60})"
 echo "-----      Step 4 of 5: Applying special settings      -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-echo "Some adapters have special requirements which can be activated by the use of environment variables."
+echo "Some adapters have special requirements/ settings which can be activated by the use of environment variables."
-echo "For more information take a look at readme.md"
+echo "For more information take a look at readme.md on Github!"
 echo ' '
 
-# Checking for and setting up avahi-daemon
+# Checking ENV for Adminport
+if [ "$adminport" != $(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"..."
+    iobroker set admin.0 --port $adminport
+  echo 'Done.'
+  echo ' '
+fi
+
+# Checking ENV for AVAHI
 if [ "$avahi" = "true" ]
 then
   echo "Avahi-daemon is activated by ENV."
@@ -151,25 +208,61 @@ then
   echo ' '
 fi
 
+# Checking ENV for Z-WAVE
 if [ "$zwave" = "true" ]
 then
-  echo "ZWave is activated by ENV."
+  echo "Z-Wave is activated by ENV."
   chmod 764 /opt/scripts/setup_zwave.sh
   sh /opt/scripts/setup_zwave.sh
   echo "Done."
   echo ' '
 fi
 
+# checking ENV for USBDEVICES
+if [ "$usbdevices" != "none" ]
+then
+  echo "Usb-device-support is activated by ENV."
+  
+  IFS=';' read -ra devicearray <<< "$usbdevices"
+    for i in "${devicearray[@]}"
+    do
+      echo "Setting permissions for" $i"..."
+      chown root:dialout $i
+      chmod g+rw $i
+    done
+  echo "Done."
+  echo ' '
+fi
+
+# Checking ENV for REDIS
+if [ "$redis" != "false" ]
+then
+  echo "Connection to Redis is configured by ENV."
+  echo "Installing prerequisites..."
+  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
+  redisserver=$(echo $redis | sed -E  's/(.*):(.*)/\1/')
+  redisport=$(echo $redis | sed -E  's/(.*):(.*)/\2/')
+  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."
+  echo ' '
+fi
+
 sleep 5
 
+
+#####
 # Starting ioBroker
+#####
 echo "$(printf -- '-%.0s' {1..60})"
 echo "-----          Step 5 of 5: ioBroker startup           -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 echo "Starting ioBroker..."
 echo ' '
-#gosu iobroker node --trace-warnings node_modules/iobroker.js-controller/controller.js > /opt/iobroker/iobroker.log 2>&1 &
+
 gosu iobroker node node_modules/iobroker.js-controller/controller.js
 
 # Preventing container restart by keeping a process alive even if iobroker will be stopped

aarch64/scripts/setup_avahi.sh

@@ -2,7 +2,7 @@
 
 echo "Checking avahi-daemon installation state..."
 
-if [ -f /usr/sbin/avahi-daemon ]
+if [ -e /usr/sbin/avahi-daemon ] && [ -e /var/run/dbus ]
 then
   echo "Avahi is already installed..."
 else

aarch64/scripts/setup_zwave.sh

@@ -2,7 +2,7 @@
 
 echo "Checking openzwave installation state..."
 
-if [ -f /usr/local/lib64 ]
+if [ -e /usr/local/lib64 ]
 then
   echo "Openzwave is already installed..."
 else
@@ -16,4 +16,4 @@ else
   # echo "Openzwave is now installed..."
 fi
 
-exit 0
+exit 0

amd64/Dockerfile

@@ -1,38 +1,43 @@
 FROM debian:stretch
 
-MAINTAINER Andre Germann <https://buanet.de>
+LABEL maintainer="Andre Germann" \ 
+      url="<https://buanet.de>"
 
 ENV DEBIAN_FRONTEND noninteractive
 
-# Install prerequisites
+# Install prerequisites (as listed in iobroker installer.sh)
-RUN apt-get update && apt-get upgrade -y && apt-get install -y \
+RUN apt-get update && apt-get install -y \
-        acl \
+    acl \
-        apt-utils \
+    apt-utils \
-        build-essential \
+    build-essential \
-        curl \
+    curl \
-        git \
+    git \
-        gnupg2 \
+    gnupg2 \
-        libcap2-bin \
+    gosu \
-        libpam0g-dev \
+    libavahi-compat-libdnssd-dev \
-        libudev-dev \
+    libcap2-bin \
-        locales \
+    libpam0g-dev \
-        procps \
+    libudev-dev \
-        python \
+    locales \
-        gosu \
+    pkg-config \
-        unzip \
+    procps \
-        wget \
+    python \
+    python-dev \
+    sudo \
+    udev \
+    unzip \
+    wget \
     && rm -rf /var/lib/apt/lists/*
 
 # Install node10
 RUN curl -sL https://deb.nodesource.com/setup_10.x | bash \
-    && apt-get update && apt-get install -y \
+    && apt-get update && apt-get install -y nodejs \
-        nodejs \
     && rm -rf /var/lib/apt/lists/*
 
 # Generating locales
 RUN sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
-	&& sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
+    && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
-	&& locale-gen
+    && locale-gen
 
 # Create scripts directory and copy scripts
 RUN mkdir -p /opt/scripts/ \
@@ -43,7 +48,7 @@ COPY scripts/setup_avahi.sh setup_avahi.sh
 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_avahi.sh \
     && chmod +x setup_packages.sh
 
 # Install ioBroker
@@ -61,23 +66,24 @@ RUN npm install -g node-gyp
 # Backup initial ioBroker-folder
 RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker
 
-# Setting up iobroker-user
+# Setting up iobroker-user (shell and home directory)
-RUN chsh -s /bin/bash iobroker
+RUN chsh -s /bin/bash iobroker \
+    && usermod --home /opt/iobroker iobroker
 
 # Setting up ENVs
-ENV DEBIAN_FRONTEND="teletype" \
+ENV ADMINPORT=8081 \
-	LANG="de_DE.UTF-8" \
+    AVAHI="false" \
-	LANGUAGE="de_DE:de" \
+    DEBIAN_FRONTEND="teletype" \
-	LC_ALL="de_DE.UTF-8" \
+    LANG="de_DE.UTF-8" \
-	TZ="Europe/Berlin" \
+    LANGUAGE="de_DE:de" \
-	PACKAGES="nano" \
+    LC_ALL="de_DE.UTF-8" \
-	AVAHI="false" \
+    PACKAGES="vi" \
-    SETUID=1000 \
+    REDIS="false" \
     SETGID=1000 \
-	ZWAVE="false"
+    SETUID=1000 \
-
+    TZ="Europe/Berlin" \
-# Setting up EXPOSE for Admin
+    USBDEVICES="none" \
-EXPOSE 8081/tcp	
+    ZWAVE="false"
 	
 # Run startup-script
 ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"]

amd64/scripts/iobroker_startup.sh

@@ -1,16 +1,19 @@
 #!/bin/bash
 
 # Reading ENV
-packages=$PACKAGES
+adminport=$ADMINPORT
 avahi=$AVAHI
-uid=$SETUID
 gid=$SETGID
+packages=$PACKAGES
+redis=$REDIS
+uid=$SETUID
+usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
 # Getting date and time for logging 
 dati=`date '+%Y-%m-%d %H:%M:%S'`
 
-# Header
+# Logging header
 echo ' '
 echo "$(printf -- '-%.0s' {1..60})"
 echo -n "$(printf -- '-%.0s' {1..15})" && echo -n "     "$dati"      " && echo "$(printf -- '-%.0s' {1..15})"
@@ -34,21 +37,35 @@ 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 " -----"
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" AVAHI: $AVAHI)" && echo " -----"
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" PACKAGES: $PACKAGES)" && echo " -----"
+echo -n "-----               " && echo -n "$(printf "%-10s %-23s" REDIS: $REDIS)" && echo " -----"
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETGID: $SETGID)" && echo " -----"
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETUID: $SETUID)" && echo " -----"
+echo -n "-----               " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $USBDEVICES)" && echo " -----"
+echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ZWAVE: $ZWAVE)" && echo " -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-# Checking and installing additional packages
+
+# Not in use
+# if [ -f /opt/.firstrun ]
+# rm -f /opt/.firstrun
+
+
+#####
+# STEP 1 - Preparing container
+#####
 echo "$(printf -- '-%.0s' {1..60})"
-echo "-----   Step 1 of 5: Installing additional packages    -----"
+echo "-----         Step 1 of 5: Preparing container         -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
+# Installing additional packages
 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
@@ -58,53 +75,73 @@ else
 fi
 echo ' '
 
+# 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"..."
+  usermod -u $uid iobroker
+  groupmod -g $gid iobroker
+  echo "Done."
+else
+  echo "There are no changes in UID/ GID needed."
+fi
+echo ' '
+
 # Change directory for next steps
 cd /opt/iobroker
 
+
+#####
 # Detecting ioBroker-Installation
+#####
 echo "$(printf -- '-%.0s' {1..60})"
 echo "-----   Step 2 of 5: Detecting ioBroker installation   -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-if [ `ls -1a|wc -l` -lt 3 ]
+if [ `find /opt/iobroker -type f | wc -l` -lt 1 ]
 then
-  echo "There is no data detected in /opt/iobroker. Restoring..."
+  echo "There is no data detected in /opt/iobroker. Restoring initial ioBroker installation..."
   tar -xf /opt/initial_iobroker.tar -C /
   echo "Done."
+elif [ -f /opt/iobroker/iobroker ]
+then
+  echo "Existing installation of ioBroker detected in /opt/iobroker."
+elif [ $(ls iobroker_20* 2> /dev/null | wc -l) != "0" ] && [ $(tar -ztvf /opt/iobroker/iobroker_20*.tar.gz "backup/backup.json" 2> /dev/null | wc -l) != "0" ]
+then
+  echo "ioBroker backup file detected in /opt/iobroker. Restoring ioBroker..."
+  mv /opt/iobroker/*.tar.gz /opt/
+  tar -xf /opt/initial_iobroker.tar -C /
+  mkdir /opt/iobroker/backups
+  mv /opt/*.tar.gz /opt/iobroker/backups/
+  iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
+  echo "Done."
+  echo ' '
+  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+  echo "!!!!!                             IMPORTANT NOTE                             !!!!!"
+  echo "!!!!!        The sartup script restored iobroker from a backup file.         !!!!!"
+  echo "!!!!! Check /opt/iobroker/log/restore.log to see if restore was successful.  !!!!!"
+  echo "!!!!! When ioBroker now starts it will reinstall all Adapters automatically. !!!!!"
+  echo "!!!!!         This might be take a looooong time! Please be patient!         !!!!!"
+  echo "!!!!!  You can view installation process by taking a look at ioBroker log.   !!!!!"
+  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 else
-  if [ -f /opt/iobroker/iobroker ]
+  echo "There is data detected in /opt/iobroker but it looks like it is no instance of iobroker or a valid backup file!"
-  then
+  echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
-    echo "Installation of ioBroker detected in /opt/iobroker."
+  exit 1
-  else
-    echo "There is data detected in /opt/iobroker, but it looks like it is no instance of iobroker!"
-	echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
-	exit 1
-  fi
 fi
 echo ' '
 
+
+#####
 # Checking ioBroker-Installation
+#####
 echo "$(printf -- '-%.0s' {1..60})"
 echo "-----   Step 3 of 5: Checking ioBroker installation    -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-# Checking for first run and set uid/gid
-if [ -f /opt/.firstrun ]
-then 
-  echo "This is the first run of a new container. Time for some preparation."
-  echo ' '
-  echo "Changing UID to "$uid" and GID to "$gid"..."
-  usermod -u $uid iobroker
-  groupmod -g $gid iobroker
-  rm -f /opt/.firstrun
-  echo "Done."
-else
-  echo "This is NOT the first run of the container. Some Steps will be skipped."
-fi
-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
@@ -113,7 +150,7 @@ echo "Done."
 echo ' '
 
 # Backing up original iobroker-file and changing sudo to gosu
-echo "Fixing \"sudo-bug\" by replacing sudo with gosu..."
+echo "Fixing \"sudo-bug\" by replacing sudo in iobroker with gosu..."
   cp -a /opt/iobroker/iobroker /opt/iobroker/iobroker.bak
   chmod 755 /opt/iobroker/iobroker
   sed -i 's/sudo -H -u/gosu/g' /opt/iobroker/iobroker
@@ -125,23 +162,43 @@ 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)
+    sh /opt/iobroker/iobroker host $(cat /opt/iobroker/.install_host)
-	rm -f /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) ]
+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": ")[^"]*')
   echo 'Done.'
   echo ' '
 fi
 
+
+#####
 # Setting up prerequisites for some ioBroker-adapters
+#####
 echo "$(printf -- '-%.0s' {1..60})"
 echo "-----      Step 4 of 5: Applying special settings      -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-echo "Some adapters have special requirements which can be activated by the use of environment variables."
+echo "Some adapters have special requirements/ settings which can be activated by the use of environment variables."
-echo "For more information take a look at readme.md"
+echo "For more information take a look at readme.md on Github!"
 echo ' '
 
-# Checking for and setting up avahi-daemon
+# Checking ENV for Adminport
+if [ "$adminport" != $(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"..."
+    iobroker set admin.0 --port $adminport
+  echo 'Done.'
+  echo ' '
+fi
+
+# Checking ENV for AVAHI
 if [ "$avahi" = "true" ]
 then
   echo "Avahi-daemon is activated by ENV."
@@ -151,25 +208,61 @@ then
   echo ' '
 fi
 
+# Checking ENV for Z-WAVE
 if [ "$zwave" = "true" ]
 then
-  echo "ZWave is activated by ENV."
+  echo "Z-Wave is activated by ENV."
   chmod 764 /opt/scripts/setup_zwave.sh
   sh /opt/scripts/setup_zwave.sh
   echo "Done."
   echo ' '
 fi
 
+# checking ENV for USBDEVICES
+if [ "$usbdevices" != "none" ]
+then
+  echo "Usb-device-support is activated by ENV."
+  
+  IFS=';' read -ra devicearray <<< "$usbdevices"
+    for i in "${devicearray[@]}"
+    do
+      echo "Setting permissions for" $i"..."
+      chown root:dialout $i
+      chmod g+rw $i
+    done
+  echo "Done."
+  echo ' '
+fi
+
+# Checking ENV for REDIS
+if [ "$redis" != "false" ]
+then
+  echo "Connection to Redis is configured by ENV."
+  echo "Installing prerequisites..."
+  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
+  redisserver=$(echo $redis | sed -E  's/(.*):(.*)/\1/')
+  redisport=$(echo $redis | sed -E  's/(.*):(.*)/\2/')
+  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."
+  echo ' '
+fi
+
 sleep 5
 
+
+#####
 # Starting ioBroker
+#####
 echo "$(printf -- '-%.0s' {1..60})"
 echo "-----          Step 5 of 5: ioBroker startup           -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 echo "Starting ioBroker..."
 echo ' '
-#gosu iobroker node --trace-warnings node_modules/iobroker.js-controller/controller.js > /opt/iobroker/iobroker.log 2>&1 &
+
 gosu iobroker node node_modules/iobroker.js-controller/controller.js
 
 # Preventing container restart by keeping a process alive even if iobroker will be stopped

amd64/scripts/setup_avahi.sh

@@ -2,7 +2,7 @@
 
 echo "Checking avahi-daemon installation state..."
 
-if [ -f /usr/sbin/avahi-daemon ]
+if [ -e /usr/sbin/avahi-daemon ] && [ -e /var/run/dbus ]
 then
   echo "Avahi is already installed..."
 else

amd64/scripts/setup_zwave.sh

@@ -2,7 +2,7 @@
 
 echo "Checking openzwave installation state..."
 
-if [ -f /usr/local/lib64 ]
+if [ -e /usr/local/lib64 ]
 then
   echo "Openzwave is already installed..."
 else
@@ -16,4 +16,4 @@ else
   # echo "Openzwave is now installed..."
 fi
 
-exit 0
+exit 0

armv7hf/Dockerfile

@@ -1,38 +1,43 @@
 FROM balenalib/armv7hf-debian:stretch
 
-MAINTAINER Andre Germann <https://buanet.de>
+LABEL maintainer="Andre Germann" \ 
-
+      url="<https://buanet.de>"
+	  
 ENV DEBIAN_FRONTEND noninteractive
 
-# Install prerequisites
+# Install prerequisites (as listed in iobroker installer.sh)
-RUN apt-get update && apt-get upgrade -y && apt-get install -y \
+RUN apt-get update && apt-get install -y \
-        acl \
+    acl \
-        apt-utils \
+    apt-utils \
-        build-essential \
+    build-essential \
-        curl \
+    curl \
-        git \
+    git \
-        gnupg2 \
+    gnupg2 \
-        libcap2-bin \
+    gosu \
-        libpam0g-dev \
+    libavahi-compat-libdnssd-dev \
-        libudev-dev \
+    libcap2-bin \
-        locales \
+    libpam0g-dev \
-        procps \
+    libudev-dev \
-        python \
+    locales \
-        gosu \
+    pkg-config \
-        unzip \
+    procps \
-        wget \
+    python \
+    python-dev \
+    sudo \
+    udev \
+    unzip \
+    wget \
     && rm -rf /var/lib/apt/lists/*
 
-# Install node8
+# Install node10
 RUN curl -sL https://deb.nodesource.com/setup_10.x | bash \
-    && apt-get update && apt-get install -y \
+    && apt-get update && apt-get install -y nodejs \
-        nodejs \
     && rm -rf /var/lib/apt/lists/*
 
 # Generating locales
 RUN sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
-	&& sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
+    && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
-	&& locale-gen
+    && locale-gen
 
 # Create scripts directory and copy scripts
 RUN mkdir -p /opt/scripts/ \
@@ -43,7 +48,7 @@ COPY scripts/setup_avahi.sh setup_avahi.sh
 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_avahi.sh \
     && chmod +x setup_packages.sh
 
 # Install ioBroker
@@ -56,29 +61,29 @@ RUN apt-get update \
 
 # Install node-gyp
 WORKDIR /opt/iobroker/
-RUN npm config set unsafe-perm true     # To fix "Error: could not get uid/gid"
 RUN npm install -g node-gyp
 
 # Backup initial ioBroker-folder
 RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker
 
-# Setting up iobroker-user
+# Setting up iobroker-user (shell and home directory)
-RUN chsh -s /bin/bash iobroker
+RUN chsh -s /bin/bash iobroker \
+    && usermod --home /opt/iobroker iobroker
 
 # Setting up ENVs
-ENV DEBIAN_FRONTEND="teletype" \
+ENV ADMINPORT=8081 \
-	LANG="de_DE.UTF-8" \
+    AVAHI="false" \
-	LANGUAGE="de_DE:de" \
+    DEBIAN_FRONTEND="teletype" \
-	LC_ALL="de_DE.UTF-8" \
+    LANG="de_DE.UTF-8" \
-	TZ="Europe/Berlin" \
+    LANGUAGE="de_DE:de" \
-	PACKAGES="nano" \
+    LC_ALL="de_DE.UTF-8" \
-	AVAHI="false" \
+    PACKAGES="vi" \
-    SETUID=1000 \
+    REDIS="false" \
     SETGID=1000 \
-	ZWAVE="false"
+    SETUID=1000 \
-
+    TZ="Europe/Berlin" \
-# Setting up EXPOSE for Admin
+    USBDEVICES="none" \
-EXPOSE 8081/tcp	
+    ZWAVE="false"
 	
 # Run startup-script
 ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"]

armv7hf/scripts/iobroker_startup.sh

@@ -1,16 +1,19 @@
 #!/bin/bash
 
 # Reading ENV
-packages=$PACKAGES
+adminport=$ADMINPORT
 avahi=$AVAHI
-uid=$SETUID
 gid=$SETGID
+packages=$PACKAGES
+redis=$REDIS
+uid=$SETUID
+usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
 # Getting date and time for logging 
 dati=`date '+%Y-%m-%d %H:%M:%S'`
 
-# Header
+# Logging header
 echo ' '
 echo "$(printf -- '-%.0s' {1..60})"
 echo -n "$(printf -- '-%.0s' {1..15})" && echo -n "     "$dati"      " && echo "$(printf -- '-%.0s' {1..15})"
@@ -34,21 +37,35 @@ 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 " -----"
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" AVAHI: $AVAHI)" && echo " -----"
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" PACKAGES: $PACKAGES)" && echo " -----"
+echo -n "-----               " && echo -n "$(printf "%-10s %-23s" REDIS: $REDIS)" && echo " -----"
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETGID: $SETGID)" && echo " -----"
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETUID: $SETUID)" && echo " -----"
+echo -n "-----               " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $USBDEVICES)" && echo " -----"
+echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ZWAVE: $ZWAVE)" && echo " -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-# Checking and installing additional packages
+
+# Not in use
+# if [ -f /opt/.firstrun ]
+# rm -f /opt/.firstrun
+
+
+#####
+# STEP 1 - Preparing container
+#####
 echo "$(printf -- '-%.0s' {1..60})"
-echo "-----   Step 1 of 5: Installing additional packages    -----"
+echo "-----         Step 1 of 5: Preparing container         -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
+# Installing additional packages
 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
@@ -58,53 +75,73 @@ else
 fi
 echo ' '
 
+# 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"..."
+  usermod -u $uid iobroker
+  groupmod -g $gid iobroker
+  echo "Done."
+else
+  echo "There are no changes in UID/ GID needed."
+fi
+echo ' '
+
 # Change directory for next steps
 cd /opt/iobroker
 
+
+#####
 # Detecting ioBroker-Installation
+#####
 echo "$(printf -- '-%.0s' {1..60})"
 echo "-----   Step 2 of 5: Detecting ioBroker installation   -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-if [ `ls -1a|wc -l` -lt 3 ]
+if [ `find /opt/iobroker -type f | wc -l` -lt 1 ]
 then
-  echo "There is no data detected in /opt/iobroker. Restoring..."
+  echo "There is no data detected in /opt/iobroker. Restoring initial ioBroker installation..."
   tar -xf /opt/initial_iobroker.tar -C /
   echo "Done."
+elif [ -f /opt/iobroker/iobroker ]
+then
+  echo "Existing installation of ioBroker detected in /opt/iobroker."
+elif [ $(ls iobroker_20* 2> /dev/null | wc -l) != "0" ] && [ $(tar -ztvf /opt/iobroker/iobroker_20*.tar.gz "backup/backup.json" 2> /dev/null | wc -l) != "0" ]
+then
+  echo "ioBroker backup file detected in /opt/iobroker. Restoring ioBroker..."
+  mv /opt/iobroker/*.tar.gz /opt/
+  tar -xf /opt/initial_iobroker.tar -C /
+  mkdir /opt/iobroker/backups
+  mv /opt/*.tar.gz /opt/iobroker/backups/
+  iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
+  echo "Done."
+  echo ' '
+  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+  echo "!!!!!                             IMPORTANT NOTE                             !!!!!"
+  echo "!!!!!        The sartup script restored iobroker from a backup file.         !!!!!"
+  echo "!!!!! Check /opt/iobroker/log/restore.log to see if restore was successful.  !!!!!"
+  echo "!!!!! When ioBroker now starts it will reinstall all Adapters automatically. !!!!!"
+  echo "!!!!!         This might be take a looooong time! Please be patient!         !!!!!"
+  echo "!!!!!  You can view installation process by taking a look at ioBroker log.   !!!!!"
+  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 else
-  if [ -f /opt/iobroker/iobroker ]
+  echo "There is data detected in /opt/iobroker but it looks like it is no instance of iobroker or a valid backup file!"
-  then
+  echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
-    echo "Installation of ioBroker detected in /opt/iobroker."
+  exit 1
-  else
-    echo "There is data detected in /opt/iobroker, but it looks like it is no instance of iobroker!"
-	echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
-	exit 1
-  fi
 fi
 echo ' '
 
+
+#####
 # Checking ioBroker-Installation
+#####
 echo "$(printf -- '-%.0s' {1..60})"
 echo "-----   Step 3 of 5: Checking ioBroker installation    -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-# Checking for first run and set uid/gid
-if [ -f /opt/.firstrun ]
-then 
-  echo "This is the first run of a new container. Time for some preparation."
-  echo ' '
-  echo "Changing UID to "$uid" and GID to "$gid"..."
-  usermod -u $uid iobroker
-  groupmod -g $gid iobroker
-  rm -f /opt/.firstrun
-  echo "Done."
-else
-  echo "This is NOT the first run of the container. Some Steps will be skipped."
-fi
-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
@@ -113,7 +150,7 @@ echo "Done."
 echo ' '
 
 # Backing up original iobroker-file and changing sudo to gosu
-echo "Fixing \"sudo-bug\" by replacing sudo with gosu..."
+echo "Fixing \"sudo-bug\" by replacing sudo in iobroker with gosu..."
   cp -a /opt/iobroker/iobroker /opt/iobroker/iobroker.bak
   chmod 755 /opt/iobroker/iobroker
   sed -i 's/sudo -H -u/gosu/g' /opt/iobroker/iobroker
@@ -125,23 +162,43 @@ 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)
+    sh /opt/iobroker/iobroker host $(cat /opt/iobroker/.install_host)
-	rm -f /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) ]
+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": ")[^"]*')
   echo 'Done.'
   echo ' '
 fi
 
+
+#####
 # Setting up prerequisites for some ioBroker-adapters
+#####
 echo "$(printf -- '-%.0s' {1..60})"
 echo "-----      Step 4 of 5: Applying special settings      -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-echo "Some adapters have special requirements which can be activated by the use of environment variables."
+echo "Some adapters have special requirements/ settings which can be activated by the use of environment variables."
-echo "For more information take a look at readme.md"
+echo "For more information take a look at readme.md on Github!"
 echo ' '
 
-# Checking for and setting up avahi-daemon
+# Checking ENV for Adminport
+if [ "$adminport" != $(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"..."
+    iobroker set admin.0 --port $adminport
+  echo 'Done.'
+  echo ' '
+fi
+
+# Checking ENV for AVAHI
 if [ "$avahi" = "true" ]
 then
   echo "Avahi-daemon is activated by ENV."
@@ -151,25 +208,61 @@ then
   echo ' '
 fi
 
+# Checking ENV for Z-WAVE
 if [ "$zwave" = "true" ]
 then
-  echo "ZWave is activated by ENV."
+  echo "Z-Wave is activated by ENV."
   chmod 764 /opt/scripts/setup_zwave.sh
   sh /opt/scripts/setup_zwave.sh
   echo "Done."
   echo ' '
 fi
 
+# checking ENV for USBDEVICES
+if [ "$usbdevices" != "none" ]
+then
+  echo "Usb-device-support is activated by ENV."
+  
+  IFS=';' read -ra devicearray <<< "$usbdevices"
+    for i in "${devicearray[@]}"
+    do
+      echo "Setting permissions for" $i"..."
+      chown root:dialout $i
+      chmod g+rw $i
+    done
+  echo "Done."
+  echo ' '
+fi
+
+# Checking ENV for REDIS
+if [ "$redis" != "false" ]
+then
+  echo "Connection to Redis is configured by ENV."
+  echo "Installing prerequisites..."
+  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
+  redisserver=$(echo $redis | sed -E  's/(.*):(.*)/\1/')
+  redisport=$(echo $redis | sed -E  's/(.*):(.*)/\2/')
+  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."
+  echo ' '
+fi
+
 sleep 5
 
+
+#####
 # Starting ioBroker
+#####
 echo "$(printf -- '-%.0s' {1..60})"
 echo "-----          Step 5 of 5: ioBroker startup           -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 echo "Starting ioBroker..."
 echo ' '
-#gosu iobroker node --trace-warnings node_modules/iobroker.js-controller/controller.js > /opt/iobroker/iobroker.log 2>&1 &
+
 gosu iobroker node node_modules/iobroker.js-controller/controller.js
 
 # Preventing container restart by keeping a process alive even if iobroker will be stopped

armv7hf/scripts/setup_avahi.sh

@@ -2,7 +2,7 @@
 
 echo "Checking avahi-daemon installation state..."
 
-if [ -f /usr/sbin/avahi-daemon ]
+if [ -e /usr/sbin/avahi-daemon ] && [ -e /var/run/dbus ]
 then
   echo "Avahi is already installed..."
 else

armv7hf/scripts/setup_zwave.sh

@@ -2,7 +2,7 @@
 
 echo "Checking openzwave installation state..."
 
-if [ -f /usr/local/lib64 ]
+if [ -e /usr/local/lib64 ]
 then
   echo "Openzwave is already installed..."
 else
@@ -16,4 +16,4 @@ else
   # echo "Openzwave is now installed..."
 fi
 
-exit 0
+exit 0