From 9c73ec9fe9efa87de5610732e5c4b8a1f1a173f9 Mon Sep 17 00:00:00 2001
From: Andre <info@buanet.de>
Date: Fri, 17 Jan 2020 11:14:17 +0100
Subject: [PATCH 01/31] Update .VERSION

---
 .VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.VERSION b/.VERSION
index b913b7c..104f66c 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v4.1.0
+v4.1.1beta

From c62b67c5ac2522cc2ee64611f6b3a10592b8fd15 Mon Sep 17 00:00:00 2001
From: Andre <info@buanet.de>
Date: Fri, 17 Jan 2020 13:25:54 +0100
Subject: [PATCH 02/31] updating openzwave

---
 amd64/scripts/setup_zwave.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/amd64/scripts/setup_zwave.sh b/amd64/scripts/setup_zwave.sh
index e9710d0..11d8024 100644
--- a/amd64/scripts/setup_zwave.sh
+++ b/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
-  tar -xf openzwave-1.6.945.tar.gz && rm openzwave-1.6.945.tar.gz
-  cd openzwave-1.6.945 && make > /dev/null 2>&1 && make install > /dev/null 2>&1
+  curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.1007.tar.gz
+  tar -xf openzwave-1.6.1007.tar.gz && rm openzwave-1.6.1007.tar.gz
+  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..."

From af7b7ff6f01b746722644b37723887fa9314368e Mon Sep 17 00:00:00 2001
From: andre <>
Date: Fri, 17 Jan 2020 23:36:28 +0100
Subject: [PATCH 03/31] new openzwave version

---
 README.md                      | 10 ++++++++++
 aarch64/scripts/setup_zwave.sh |  6 +++---
 armv7hf/scripts/setup_zwave.sh |  6 +++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 41cc034..0229799 100644
--- a/README.md
+++ b/README.md
@@ -92,8 +92,18 @@ But watch for the used node version. If the existing installation runs with anot
 
 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!
 
+## Miscellaneous
+
+### Keep me updated
+
+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
+
 ## Changelog
 
+### 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)
diff --git a/aarch64/scripts/setup_zwave.sh b/aarch64/scripts/setup_zwave.sh
index e9710d0..11d8024 100644
--- a/aarch64/scripts/setup_zwave.sh
+++ b/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
-  tar -xf openzwave-1.6.945.tar.gz && rm openzwave-1.6.945.tar.gz
-  cd openzwave-1.6.945 && make > /dev/null 2>&1 && make install > /dev/null 2>&1
+  curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.1007.tar.gz
+  tar -xf openzwave-1.6.1007.tar.gz && rm openzwave-1.6.1007.tar.gz
+  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..."
diff --git a/armv7hf/scripts/setup_zwave.sh b/armv7hf/scripts/setup_zwave.sh
index e9710d0..11d8024 100644
--- a/armv7hf/scripts/setup_zwave.sh
+++ b/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
-  tar -xf openzwave-1.6.945.tar.gz && rm openzwave-1.6.945.tar.gz
-  cd openzwave-1.6.945 && make > /dev/null 2>&1 && make install > /dev/null 2>&1
+  curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.1007.tar.gz
+  tar -xf openzwave-1.6.1007.tar.gz && rm openzwave-1.6.1007.tar.gz
+  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..."

From 0bc88b23d0c590dbf5bd600639fcaa33c970633c Mon Sep 17 00:00:00 2001
From: Andre <info@buanet.de>
Date: Sun, 2 Feb 2020 22:07:44 +0100
Subject: [PATCH 04/31] testing

---
 amd64/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 43dd2fe..5d6eefd 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -86,4 +86,4 @@ ENV ADMINPORT=8081 \
     ZWAVE="false"
 	
 # Run startup-script
-ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"]
+ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]

From f2122a84bc926ee95d3cd068417449a73ddf4475 Mon Sep 17 00:00:00 2001
From: Andre <info@buanet.de>
Date: Sun, 2 Feb 2020 22:10:51 +0100
Subject: [PATCH 05/31] testing

---
 amd64/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 43dd2fe..5d6eefd 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -86,4 +86,4 @@ ENV ADMINPORT=8081 \
     ZWAVE="false"
 	
 # Run startup-script
-ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"]
+ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]

From 39923bbb5de88d2e21c49c1adc7fd8c830a6258b Mon Sep 17 00:00:00 2001
From: andre <>
Date: Sun, 2 Feb 2020 23:39:28 +0100
Subject: [PATCH 06/31] hoepfully fixing some permission issues

---
 .VERSION           | 2 +-
 README.md          | 6 ++++--
 aarch64/Dockerfile | 2 +-
 armv7hf/Dockerfile | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.VERSION b/.VERSION
index 104f66c..ed70355 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v4.1.1beta
+v4.1.2beta
diff --git a/README.md b/README.md
index 0229799..ee82f19 100644
--- a/README.md
+++ b/README.md
@@ -101,8 +101,10 @@ You will find the channel here: https://t.me/buanet_tutorials
 
 ## Changelog
 
-### v4.1.1beta (2020-01-17)
-* updated openzwave to version 1.6.1007
+### v4.1.2beta (2020-02-02)
+* 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
diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
index a8cde0f..8d7e118 100644
--- a/aarch64/Dockerfile
+++ b/aarch64/Dockerfile
@@ -86,4 +86,4 @@ ENV ADMINPORT=8081 \
     ZWAVE="false"
 	
 # Run startup-script
-ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"]
+ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index 3a159a9..ad2f366 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -86,4 +86,4 @@ ENV ADMINPORT=8081 \
     ZWAVE="false"
 	
 # Run startup-script
-ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"]
+ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]

From 3df642f9f88fbf790afd34a3a88b7e0947e3ac54 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Tue, 4 Feb 2020 01:17:28 +0100
Subject: [PATCH 07/31] testing for advanced userscripts

---
 README.md                                     |  2 +-
 amd64/Dockerfile                              | 17 ++++--
 amd64/scripts/iobroker_startup.sh             | 57 ++++++++++++++-----
 .../scripts/userscript_everystart_example.sh  |  8 +++
 .../scripts/userscript_firststart_example.sh  |  8 +++
 5 files changed, 71 insertions(+), 21 deletions(-)
 create mode 100644 amd64/scripts/userscript_everystart_example.sh
 create mode 100644 amd64/scripts/userscript_firststart_example.sh

diff --git a/README.md b/README.md
index ee82f19..156bb2a 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ To configure the ioBroker container on startup it is possible to set some enviro
 |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)|
+|REDIS|false|Activates the use 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|
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 5d6eefd..4b6c5b1 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -39,9 +39,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 +51,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 userscripts/userscript_firststart_example.sh userscript_firststart_example.sh
+COPY userscripts/userscript_everystart_example.sh userscript_everystart_example.sh
 
 # Install ioBroker
 WORKDIR /
@@ -63,8 +69,9 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
-# Backup initial ioBroker-folder
-RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker
+# Backup initial ioBroker and userscript folder
+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 \
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 5653468..5e0c719 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -49,11 +49,6 @@ echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
 
-# Not in use
-# if [ -f /opt/.firstrun ]
-# rm -f /opt/.firstrun
-
-
 #####
 # STEP 1 - Preparing container
 #####
@@ -68,7 +63,7 @@ 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 > /opt/scripts/setup_packages.log 2>&1
   echo "Done."
 else
   echo "There are no additional packages defined."
@@ -162,15 +157,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
@@ -189,11 +184,11 @@ 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" != $(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"..."
-    iobroker set admin.0 --port $adminport
+    bash iobroker set admin.0 --port $adminport
   echo 'Done.'
   echo ' '
 fi
@@ -202,8 +197,8 @@ fi
 if [ "$avahi" = "true" ]
 then
   echo "Avahi-daemon is activated by ENV."
-  chmod 764 /opt/scripts/setup_avahi.sh
-  sh /opt/scripts/setup_avahi.sh
+  chmod 755 /opt/scripts/setup_avahi.sh
+  bash /opt/scripts/setup_avahi.sh
   echo "Done."
   echo ' '
 fi
@@ -212,8 +207,8 @@ fi
 if [ "$zwave" = "true" ]
 then
   echo "Z-Wave is activated by ENV."
-  chmod 764 /opt/scripts/setup_zwave.sh
-  sh /opt/scripts/setup_zwave.sh
+  chmod 755 /opt/scripts/setup_zwave.sh
+  bash /opt/scripts/setup_zwave.sh
   echo "Done."
   echo ' '
 fi
@@ -250,6 +245,38 @@ then
   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 userscript_firststart_example.sh
+  chmod 755 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 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 userscript_everystart.sh
+    bash /opt/userscripts/userscript_everystart.sh
+    echo "Done."
+	echo ' '
+  fi
+fi
+
+
 sleep 5
 
 
diff --git a/amd64/scripts/userscript_everystart_example.sh b/amd64/scripts/userscript_everystart_example.sh
new file mode 100644
index 0000000..1433775
--- /dev/null
+++ b/amd64/scripts/userscript_everystart_example.sh
@@ -0,0 +1,8 @@
+#!/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!
+
+exit 0
diff --git a/amd64/scripts/userscript_firststart_example.sh b/amd64/scripts/userscript_firststart_example.sh
new file mode 100644
index 0000000..43b5a8b
--- /dev/null
+++ b/amd64/scripts/userscript_firststart_example.sh
@@ -0,0 +1,8 @@
+#!/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!
+
+exit 0

From 1ed7fe33f21d810582a1a174048a55b4fba36219 Mon Sep 17 00:00:00 2001
From: Andre <info@buanet.de>
Date: Tue, 4 Feb 2020 01:39:08 +0100
Subject: [PATCH 08/31] fixing path

---
 amd64/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 4b6c5b1..4a86bfd 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -54,8 +54,8 @@ RUN chmod +x iobroker_startup.sh \
     && chmod +x setup_packages.sh \
     && chmod +x setup_zwave.sh
 WORKDIR /opt/userscripts/
-COPY userscripts/userscript_firststart_example.sh userscript_firststart_example.sh
-COPY userscripts/userscript_everystart_example.sh userscript_everystart_example.sh
+COPY scripts/userscript_firststart_example.sh userscript_firststart_example.sh
+COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
 
 # Install ioBroker
 WORKDIR /

From 71a1c784461f4c880f2e6f4a2c9fff8ad8b9dcc7 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Tue, 4 Feb 2020 20:08:54 +0100
Subject: [PATCH 09/31] testing

---
 README.md                                     | 34 +++++++++++++------
 amd64/Dockerfile                              | 11 ++++--
 amd64/scripts/iobroker_startup.sh             | 24 +++++++++----
 .../scripts/userscript_everystart_example.sh  |  5 +++
 .../scripts/userscript_firststart_example.sh  |  4 +++
 5 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 156bb2a..8ec7287 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,12 @@
 
 Source: https://github.com/buanet/docker-iobroker
 
-IoBroker for Docker is an Dockerimage for ioBroker IoT platform (http://www.iobroker.net). 
+IoBroker for Docker is an Dockerimage for ioBroker IoT platform (http://www.iobroker.net).
 
 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 notice
 
@@ -29,7 +29,7 @@ The following ways to geht iobroker-container running are only examples. Maybe y
 
 ### 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: 
+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
@@ -60,11 +60,12 @@ The following will give a short overview.
 
 ### Environment variables
 
-To configure the ioBroker container on startup it is possible to set some 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.
 
 |env|default|description|
 |---|---|---|
-|ADMINPORT|8081|Sets ioBroker adminport on startup|
+|IOB_ADMINPORT|8081|Sets ioBroker adminport on startup|
 |AVAHI|false|Installs and activates avahi-daemon for supporting yahka-adapter, can be "true" or "false"|
 |LANG|de_DE.UTF&#x2011;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|
@@ -77,7 +78,7 @@ To configure the ioBroker container on startup it is possible to set some enviro
 |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,10 +89,20 @@ 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
+### 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
 
 ### Keep me updated
@@ -102,6 +113,7 @@ You will find the channel here: https://t.me/buanet_tutorials
 ## Changelog
 
 ### v4.1.2beta (2020-02-02)
+* added feature userscripts on startup
 * small fix for permissions issues on some systems
 * v4.1.1beta (2020-01-17)
   * updated openzwave to version 1.6.1007
@@ -112,7 +124,7 @@ You will find the channel here: https://t.me/buanet_tutorials
   * 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
@@ -147,7 +159,7 @@ You will find the channel here: https://t.me/buanet_tutorials
   * added permission fixing on first start
 * v2.0.5beta (2019-02-09)
   * added ENV to dockerfile
-  * added EXPOSE for admin 
+  * added EXPOSE for admin
   * final testing
 * v2.0.4beta (2019-01-28)
   * added support for env variables "avahi" and "packages"
@@ -168,12 +180,12 @@ You will find the channel here: https://t.me/buanet_tutorials
 
 ### v2.0.0 (2018-12-05)
 * v1.2.2beta (2018-12-05)  
-  * using node8 instead of node6 
+  * using node8 instead of node6
   * changes for new iobroker setup
 * v1.2.1beta (2018-09-12)
   * added support for firetv-adapter
 
-### v1.2.0 (2018-08-21) 
+### v1.2.0 (2018-08-21)
 * v1.1.3beta (2018-08-21)
   * added ffmpeg-package for yahka to support webcams
 * v1.1.2beta (2018-04-04)
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 4b6c5b1..f1004e3 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -78,14 +78,19 @@ RUN chsh -s /bin/bash iobroker \
     && usermod --home /opt/iobroker iobroker
 
 # Setting up ENVs
-ENV ADMINPORT=8081 \
-    AVAHI="false" \
+ENV AVAHI="false" \
     DEBIAN_FRONTEND="teletype" \
+	IOB_ADMINPORT=8081 \
+	IOB_OBJECTSDB_HOST="127.0.0.1" \
+	IOB_OBJECTSDB_PORT="9001" \
+	IOB_OBJECTSDB_TYPE="file" \
+	IOB_STATESDB_HOST="127.0.0.1" \
+	IOB_STATESDB_PORT="9000" \
+	IOB_STATESDB_TYPE="file" \
     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" \
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 5e0c719..2cbd995 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -1,11 +1,16 @@
 #!/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
+statesdbhost=$IOB_STATESDB_HOST
+statesdbport=$IOB_STATESDB_PORT
+statesdbtype=$IOB_STATESDB_TYPE
 uid=$SETUID
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
@@ -229,7 +234,7 @@ then
   echo ' '
 fi
 
-# Checking ENV for REDIS
+# Checking ENVs for custom setup of objects db
 if [ "$redis" != "false" ]
 then
   echo "Connection to Redis is configured by ENV."
@@ -245,13 +250,18 @@ then
   echo ' '
 fi
 
+# Checking ENVs for custom setup of states db#
+
+
+
+
 # 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 userscript_firststart_example.sh
-  chmod 755 userscript_everystart_example.sh
+  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 ]
@@ -260,7 +270,7 @@ then
   then
     echo "Userscript for first start detected and this is the first start of a new container."
     echo "Running userscript_firststart.sh..."
-    chmod 755 userscript_firststart.sh
+    chmod 755 /opt/userscripts/userscript_firststart.sh
     bash /opt/userscripts/userscript_firststart.sh
 	rm -f /opt/.firstrun
     echo "Done."
@@ -269,7 +279,7 @@ then
   if [ -f /opt/userscripts/userscript_everystart.sh ]
   then
     echo "Userscript for every start detected. Running userscript_everystart.sh..."
-    chmod 755 userscript_everystart.sh
+    chmod 755 /opt/userscripts/userscript_everystart.sh
     bash /opt/userscripts/userscript_everystart.sh
     echo "Done."
 	echo ' '
diff --git a/amd64/scripts/userscript_everystart_example.sh b/amd64/scripts/userscript_everystart_example.sh
index 1433775..9023677 100644
--- a/amd64/scripts/userscript_everystart_example.sh
+++ b/amd64/scripts/userscript_everystart_example.sh
@@ -5,4 +5,9 @@
 
 # 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
diff --git a/amd64/scripts/userscript_firststart_example.sh b/amd64/scripts/userscript_firststart_example.sh
index 43b5a8b..4fef50d 100644
--- a/amd64/scripts/userscript_firststart_example.sh
+++ b/amd64/scripts/userscript_firststart_example.sh
@@ -5,4 +5,8 @@
 
 # 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

From f2c1e3dda59d2e2b96fd51fcafd1809fbf02f6f2 Mon Sep 17 00:00:00 2001
From: andre <>
Date: Tue, 4 Feb 2020 22:07:04 +0100
Subject: [PATCH 10/31] testing

---
 amd64/Dockerfile                  | 4 ++--
 amd64/scripts/iobroker_startup.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index fd6a9b8..4f455f7 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:stretch
 
-LABEL maintainer="Andre Germann" \ 
+LABEL maintainer="Andre Germann" \
       url="<https://buanet.de>"
 
 ENV DEBIAN_FRONTEND noninteractive
@@ -96,6 +96,6 @@ ENV AVAHI="false" \
     TZ="Europe/Berlin" \
     USBDEVICES="none" \
     ZWAVE="false"
-	
+
 # Run startup-script
 ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 2cbd995..41db3f8 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -15,7 +15,7 @@ uid=$SETUID
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
-# Getting date and time for logging 
+# Getting date and time for logging
 dati=`date '+%Y-%m-%d %H:%M:%S'`
 
 # Logging header
@@ -77,7 +77,7 @@ 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 
+then
   echo "Different UID and/ or GID is set by ENV."
   echo "Changing UID to "$uid" and GID to "$gid"..."
   usermod -u $uid iobroker
@@ -142,7 +142,7 @@ echo "-----   Step 3 of 5: Checking ioBroker installation    -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-# (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts"  
+# (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 $uid:$gid /opt/scripts
@@ -222,7 +222,7 @@ fi
 if [ "$usbdevices" != "none" ]
 then
   echo "Usb-device-support is activated by ENV."
-  
+
   IFS=';' read -ra devicearray <<< "$usbdevices"
     for i in "${devicearray[@]}"
     do

From 75f38266e7ecccb50dd0307820fb1134a83ee402 Mon Sep 17 00:00:00 2001
From: andre <>
Date: Tue, 4 Feb 2020 22:11:14 +0100
Subject: [PATCH 11/31] testing

---
 .travis.yml                                   | 22 +++++++++----------
 aarch64/Dockerfile                            |  4 ++--
 aarch64/scripts/iobroker_startup.sh           |  8 +++----
 armv7hf/Dockerfile                            |  6 ++---
 armv7hf/scripts/iobroker_startup.sh           |  8 +++----
 manifest.yml                                  |  2 +-
 .../backup_iobroker_folder.sh                 |  2 +-
 opt/maintenance-scripts/iobroker_restart.sh   |  4 ++--
 opt/maintenance-scripts/iobroker_stop.sh      |  4 ++--
 9 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 885322b..2d8e913 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,7 +49,7 @@ jobs:
         - docker run --rm --privileged multiarch/qemu-user-static:register --reset
         - sed -i "s/\$VERSION/${VERSION}/g" $ARCH/scripts/iobroker_startup.sh
         - docker build -t "buanet/iobroker:$VERSION-$ARCH" ./armv7hf
-        
+
     - stage: Manifest
       env:
         - JOB_NAME="Manifest"
@@ -62,44 +62,44 @@ after_success:
     if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Build images" ] ; then
       docker push buanet/iobroker:$VERSION-$ARCH
     fi
-    
+
     if [ "$TRAVIS_BRANCH" == "beta" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Build images" ] ; then
       docker push buanet/iobroker:$VERSION-$ARCH
     fi
-    
+
 # update repository manifest for multiarch and push to hub
   - >
     if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Manifest" ]; then
       cat manifest.yml | sed "s/\$VERSION/${VERSION}/g" > manifest.yaml
-      
+
       #manifest for image: buanet/iobroker:version
       cat manifest.yaml | sed "s/\$DOCKERTAG/${VERSION}/g" > manifestversion.yaml
-      
+
       #manifest for image: buanet/iobroker:latest
       cat manifest.yaml | sed "s/\$DOCKERTAG/latest/g" > manifestlatest.yaml
 
       #push to hub
       mv manifestversion.yaml iobroker.yaml
       ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml
-      
+
       mv manifestlatest.yaml iobroker.yaml
       ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml
     fi
-    
+
     if [ "$TRAVIS_BRANCH" == "beta" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Manifest" ]; then
-      
+
       cat manifest.yml | sed "s/\$VERSION/${VERSION}/g" > manifest.yaml
-      
+
       #manifest for image: buanet/iobroker:version
       cat manifest.yaml | sed "s/\$DOCKERTAG/${VERSION}/g" > manifestversion.yaml
-      
+
       #manifest for image: buanet/iobroker:beta
       cat manifest.yaml | sed "s/\$DOCKERTAG/beta/g" > manifestbeta.yaml
 
       #push to hub
       mv manifestversion.yaml iobroker.yaml
       ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml
-      
+
       mv manifestbeta.yaml iobroker.yaml
       ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml
     fi
diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
index 8d7e118..0f99a21 100644
--- a/aarch64/Dockerfile
+++ b/aarch64/Dockerfile
@@ -1,6 +1,6 @@
 FROM balenalib/aarch64-debian:stretch
 
-LABEL maintainer="Andre Germann" \ 
+LABEL maintainer="Andre Germann" \
       url="<https://buanet.de>"
 
 ENV DEBIAN_FRONTEND noninteractive
@@ -84,6 +84,6 @@ ENV ADMINPORT=8081 \
     TZ="Europe/Berlin" \
     USBDEVICES="none" \
     ZWAVE="false"
-	
+
 # Run startup-script
 ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh
index 5653468..a3501de 100644
--- a/aarch64/scripts/iobroker_startup.sh
+++ b/aarch64/scripts/iobroker_startup.sh
@@ -10,7 +10,7 @@ uid=$SETUID
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
-# Getting date and time for logging 
+# Getting date and time for logging
 dati=`date '+%Y-%m-%d %H:%M:%S'`
 
 # Logging header
@@ -77,7 +77,7 @@ 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 
+then
   echo "Different UID and/ or GID is set by ENV."
   echo "Changing UID to "$uid" and GID to "$gid"..."
   usermod -u $uid iobroker
@@ -142,7 +142,7 @@ echo "-----   Step 3 of 5: Checking ioBroker installation    -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-# (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts"  
+# (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 $uid:$gid /opt/scripts
@@ -222,7 +222,7 @@ fi
 if [ "$usbdevices" != "none" ]
 then
   echo "Usb-device-support is activated by ENV."
-  
+
   IFS=';' read -ra devicearray <<< "$usbdevices"
     for i in "${devicearray[@]}"
     do
diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index ad2f366..17f8f79 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -1,8 +1,8 @@
 FROM balenalib/armv7hf-debian:stretch
 
-LABEL maintainer="Andre Germann" \ 
+LABEL maintainer="Andre Germann" \
       url="<https://buanet.de>"
-	  
+
 ENV DEBIAN_FRONTEND noninteractive
 
 # Install prerequisites (as listed in iobroker installer.sh)
@@ -84,6 +84,6 @@ ENV ADMINPORT=8081 \
     TZ="Europe/Berlin" \
     USBDEVICES="none" \
     ZWAVE="false"
-	
+
 # Run startup-script
 ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh
index 5653468..a3501de 100644
--- a/armv7hf/scripts/iobroker_startup.sh
+++ b/armv7hf/scripts/iobroker_startup.sh
@@ -10,7 +10,7 @@ uid=$SETUID
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
-# Getting date and time for logging 
+# Getting date and time for logging
 dati=`date '+%Y-%m-%d %H:%M:%S'`
 
 # Logging header
@@ -77,7 +77,7 @@ 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 
+then
   echo "Different UID and/ or GID is set by ENV."
   echo "Changing UID to "$uid" and GID to "$gid"..."
   usermod -u $uid iobroker
@@ -142,7 +142,7 @@ echo "-----   Step 3 of 5: Checking ioBroker installation    -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-# (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts"  
+# (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 $uid:$gid /opt/scripts
@@ -222,7 +222,7 @@ fi
 if [ "$usbdevices" != "none" ]
 then
   echo "Usb-device-support is activated by ENV."
-  
+
   IFS=';' read -ra devicearray <<< "$usbdevices"
     for i in "${devicearray[@]}"
     do
diff --git a/manifest.yml b/manifest.yml
index ae9fa3b..c8d851a 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -16,4 +16,4 @@ manifests:
     platform:
       architecture: arm
       variant: v7
-      os: linux
\ No newline at end of file
+      os: linux
diff --git a/opt/maintenance-scripts/backup_iobroker_folder.sh b/opt/maintenance-scripts/backup_iobroker_folder.sh
index 1f9c2e3..aae1bb0 100644
--- a/opt/maintenance-scripts/backup_iobroker_folder.sh
+++ b/opt/maintenance-scripts/backup_iobroker_folder.sh
@@ -2,7 +2,7 @@
 
 # Backupscript fuer ein Backup von ioBroker unter Docker auf einer Synology Disk Station (Sicherung des ioBroker-Verzeichnises).
 # Vorhaltezeit der letzten Backups: 90 Tage, ältere Backups werden automatisch geloescht.
-# 
+#
 # By Andre Germann
 # Version 1.1 (22.09.2017)
 #
diff --git a/opt/maintenance-scripts/iobroker_restart.sh b/opt/maintenance-scripts/iobroker_restart.sh
index 31d3f60..14d6b92 100644
--- a/opt/maintenance-scripts/iobroker_restart.sh
+++ b/opt/maintenance-scripts/iobroker_restart.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Einfaches Script zum Stoppen von ioBroker. 
-# Kann zum Beispiel aus ioBroker heraus aufgerufen werden um ioBroker neu zu starten. 
+# Einfaches Script zum Stoppen von ioBroker.
+# Kann zum Beispiel aus ioBroker heraus aufgerufen werden um ioBroker neu zu starten.
 
 cd /opt/iobroker
 pkill io
diff --git a/opt/maintenance-scripts/iobroker_stop.sh b/opt/maintenance-scripts/iobroker_stop.sh
index 4c2e4fc..cab7fb3 100644
--- a/opt/maintenance-scripts/iobroker_stop.sh
+++ b/opt/maintenance-scripts/iobroker_stop.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Einfaches Script zum Stoppen von ioBroker. 
-# Kann zum Beispiel aus ioBroker heraus aufgerufen werden um ioBroker zu stoppen. 
+# Einfaches Script zum Stoppen von ioBroker.
+# Kann zum Beispiel aus ioBroker heraus aufgerufen werden um ioBroker zu stoppen.
 
 cd /opt/iobroker
 pkill io

From 23b24e9b70e139637025fa018d88896b3d52ff88 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Sat, 8 Feb 2020 16:05:58 +0100
Subject: [PATCH 12/31] testing

---
 amd64/Dockerfile                  | 12 +---
 amd64/scripts/iobroker_startup.sh | 94 ++++++++++++++++++++++++-------
 2 files changed, 76 insertions(+), 30 deletions(-)

diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index fd6a9b8..5d43b5b 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:stretch
 
-LABEL maintainer="Andre Germann" \ 
+LABEL maintainer="Andre Germann" \
       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 \
@@ -80,13 +81,6 @@ RUN chsh -s /bin/bash iobroker \
 # Setting up ENVs
 ENV AVAHI="false" \
     DEBIAN_FRONTEND="teletype" \
-	IOB_ADMINPORT=8081 \
-	IOB_OBJECTSDB_HOST="127.0.0.1" \
-	IOB_OBJECTSDB_PORT="9001" \
-	IOB_OBJECTSDB_TYPE="file" \
-	IOB_STATESDB_HOST="127.0.0.1" \
-	IOB_STATESDB_PORT="9000" \
-	IOB_STATESDB_TYPE="file" \
     LANG="de_DE.UTF-8" \
     LANGUAGE="de_DE:de" \
     LC_ALL="de_DE.UTF-8" \
@@ -96,6 +90,6 @@ ENV AVAHI="false" \
     TZ="Europe/Berlin" \
     USBDEVICES="none" \
     ZWAVE="false"
-	
+
 # Run startup-script
 ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 2cbd995..bf66270 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -15,7 +15,7 @@ uid=$SETUID
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
-# Getting date and time for logging 
+# Getting date and time for logging
 dati=`date '+%Y-%m-%d %H:%M:%S'`
 
 # Logging header
@@ -77,7 +77,7 @@ 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 
+then
   echo "Different UID and/ or GID is set by ENV."
   echo "Changing UID to "$uid" and GID to "$gid"..."
   usermod -u $uid iobroker
@@ -142,7 +142,7 @@ echo "-----   Step 3 of 5: Checking ioBroker installation    -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-# (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts"  
+# (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 $uid:$gid /opt/scripts
@@ -189,13 +189,16 @@ echo "For more information take a look at readme.md on Github!"
 echo ' '
 
 # Checking ENV for Adminport
-if [ "$adminport" != $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ]
+if [ "$adminport" != ""]
 then
-  echo "Adminport set by ENV does not match port configured in ioBroker installation."
-  echo "Setting Adminport to" $adminport"..."
+  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"..."
     bash iobroker set admin.0 --port $adminport
-  echo 'Done.'
-  echo ' '
+    echo 'Done.'
+    echo ' '
+  fi
 fi
 
 # Checking ENV for AVAHI
@@ -222,7 +225,7 @@ fi
 if [ "$usbdevices" != "none" ]
 then
   echo "Usb-device-support is activated by ENV."
-  
+
   IFS=';' read -ra devicearray <<< "$usbdevices"
     for i in "${devicearray[@]}"
     do
@@ -235,24 +238,73 @@ then
 fi
 
 # Checking ENVs for custom setup of objects db
-if [ "$redis" != "false" ]
+if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ]
 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 ' '
+  if [ "$objectsdbtype" != $(jq '.objects.type' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_OBJECTSDB_TYPE is defined and value is different from detected ioBroker installation."
+    echo "Setting type of objects db to "$objectsdbtype"..."
+
+    echo "Done."
+  else
+    echo "ENV IOB_OBJECTSDB_TYPE is defined 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 defined and value is different from detected ioBroker installation."
+    echo "Setting host of objects db to "$objectsdbhost"..."
+
+    echo "Done."
+  else
+    echo "ENV IOB_OBJECTSDB_HOST is defined 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 defined and value is different from detected ioBroker installation."
+    echo "Setting port of objects db to "$objectsdbport"..."
+
+    echo "Done."
+  else
+    echo "ENV IOB_OBJECTSDB_PORT is defined and value meets detected ioBroker installation. Nothing to do here."
+  fi
+else
+  echo "No Values for objects db defined by ENV." # Only for debugging, can be removed later
 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 defined and value is different from detected ioBroker installation."
+    echo "Setting type of states db to "$statesdbtype"..."
 
+    echo "Done."
+  else
+    echo "ENV IOB_STATESDB_TYPE is defined 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 defined and value is different from detected ioBroker installation."
+    echo "Setting host of states db to "$statesdbhost"..."
 
+    echo "Done."
+  else
+    echo "ENV IOB_STATESDB_HOST is defined 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 defined and value is different from detected ioBroker installation."
+    echo "Setting port of states db to "$statesdbport"..."
+
+    echo "Done."
+  else
+    echo "ENV IOB_STATESDB_PORT is defined and value meets detected ioBroker installation. Nothing to do here."
+  fi
+else
+  echo "No Values for states db defined by ENV." # Only for debugging, can be removed later
+fi
 
 
 # Checking for Userscripts in /opt/userscripts

From e370671a5a62fcc8760c2eb3bb69498a3795643e Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Sat, 8 Feb 2020 17:27:51 +0100
Subject: [PATCH 13/31] testing

---
 amd64/scripts/iobroker_startup.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index bf66270..cbc3a80 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -189,12 +189,12 @@ echo "For more information take a look at readme.md on Github!"
 echo ' '
 
 # Checking ENV for Adminport
-if [ "$adminport" != ""]
+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"\"..."
     bash iobroker set admin.0 --port $adminport
     echo 'Done.'
     echo ' '
@@ -243,8 +243,8 @@ then
   if [ "$objectsdbtype" != $(jq '.objects.type' /opt/iobroker/iobroker-data/iobroker.json) ]
   then
     echo "ENV IOB_OBJECTSDB_TYPE is defined and value is different from detected ioBroker installation."
-    echo "Setting type of objects db to "$objectsdbtype"..."
-
+    echo "Setting type of objects db to \""$objectsdbtype"\"..."
+    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 "Done."
   else
     echo "ENV IOB_OBJECTSDB_TYPE is defined and value meets detected ioBroker installation. Nothing to do here."
@@ -252,8 +252,8 @@ then
   if [ "$objectsdbhost" != $(jq '.objects.host' /opt/iobroker/iobroker-data/iobroker.json) ]
   then
     echo "ENV IOB_OBJECTSDB_HOST is defined and value is different from detected ioBroker installation."
-    echo "Setting host of objects db to "$objectsdbhost"..."
-
+    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 defined and value meets detected ioBroker installation. Nothing to do here."
@@ -261,8 +261,8 @@ then
   if [ "$objectsdbport" != $(jq '.objects.port' /opt/iobroker/iobroker-data/iobroker.json) ]
   then
     echo "ENV IOB_OBJECTSDB_PORT is defined and value is different from detected ioBroker installation."
-    echo "Setting port of objects db to "$objectsdbport"..."
-
+    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 defined and value meets detected ioBroker installation. Nothing to do here."
@@ -279,7 +279,7 @@ then
   then
     echo "ENV IOB_STATESDB_TYPE is defined 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 defined and value meets detected ioBroker installation. Nothing to do here."
@@ -288,7 +288,7 @@ then
   then
     echo "ENV IOB_STATESDB_HOST is defined 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 defined and value meets detected ioBroker installation. Nothing to do here."
@@ -297,7 +297,7 @@ then
   then
     echo "ENV IOB_STATESDB_PORT is defined 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 defined and value meets detected ioBroker installation. Nothing to do here."

From c291608aa070862071d1d4a8afd5502308884831 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Sat, 8 Feb 2020 19:32:18 +0100
Subject: [PATCH 14/31] testing

---
 amd64/scripts/iobroker_startup.sh | 43 +++++++++++++++----------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index cbc3a80..8b4568a 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -237,38 +237,38 @@ then
   echo ' '
 fi
 
+
 # Checking ENVs for custom setup of objects db
 if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ]
 then
   if [ "$objectsdbtype" != $(jq '.objects.type' /opt/iobroker/iobroker-data/iobroker.json) ]
   then
-    echo "ENV IOB_OBJECTSDB_TYPE is defined and value is different from detected ioBroker installation."
+    echo "ENV IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation."
     echo "Setting type of objects db to \""$objectsdbtype"\"..."
     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 "Done."
   else
-    echo "ENV IOB_OBJECTSDB_TYPE is defined and value meets detected ioBroker installation. Nothing to do here."
+    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 defined and value is different from detected ioBroker installation."
+    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 defined and value meets detected ioBroker installation. Nothing to do here."
+    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 defined and value is different from detected ioBroker installation."
+    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 defined and value meets detected ioBroker installation. Nothing to do here."
+    echo "ENV IOB_OBJECTSDB_PORT is set and value meets detected ioBroker installation. Nothing to do here."
   fi
-else
-  echo "No Values for objects db defined by ENV." # Only for debugging, can be removed later
+  echo ' '
 fi
 
 
@@ -277,33 +277,32 @@ if [ "$statesdbtype" != "" ] || [ "$statesdbhost" != "" ] || [ "$statesdbport" !
 then
   if [ "$statesdbtype" != $(jq '.states.type' /opt/iobroker/iobroker-data/iobroker.json) ]
   then
-    echo "ENV IOB_STATESDB_TYPE is defined and value is different from detected ioBroker installation."
-    echo "Setting type of states db to "$statesdbtype"..."
+    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 defined and value meets detected ioBroker installation. Nothing to do here."
+    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 defined and value is different from detected ioBroker installation."
-    echo "Setting host of states db to "$statesdbhost"..."
+    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 defined and value meets detected ioBroker installation. Nothing to do here."
+    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 defined and value is different from detected ioBroker installation."
-    echo "Setting port of states db to "$statesdbport"..."
+    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 defined and value meets detected ioBroker installation. Nothing to do here."
+    echo "ENV IOB_STATESDB_PORT is set and value meets detected ioBroker installation. Nothing to do here."
   fi
-else
-  echo "No Values for states db defined by ENV." # Only for debugging, can be removed later
+  echo ' '
 fi
 
 
@@ -324,9 +323,9 @@ then
     echo "Running userscript_firststart.sh..."
     chmod 755 /opt/userscripts/userscript_firststart.sh
     bash /opt/userscripts/userscript_firststart.sh
-	rm -f /opt/.firstrun
+    rm -f /opt/.firstrun
     echo "Done."
-	echo ' '
+    echo ' '
   fi
   if [ -f /opt/userscripts/userscript_everystart.sh ]
   then
@@ -334,7 +333,7 @@ then
     chmod 755 /opt/userscripts/userscript_everystart.sh
     bash /opt/userscripts/userscript_everystart.sh
     echo "Done."
-	echo ' '
+    echo ' '
   fi
 fi
 

From 49700dc148253ba5b2f02a8fdefb15bd5f7b42c8 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Sat, 8 Feb 2020 19:53:20 +0100
Subject: [PATCH 15/31] testing

---
 amd64/Dockerfile                  |  7 +--
 amd64/scripts/iobroker_startup.sh | 98 +++++++++++++++++--------------
 2 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 5d43b5b..681d39d 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -79,17 +79,14 @@ RUN chsh -s /bin/bash iobroker \
     && usermod --home /opt/iobroker iobroker
 
 # Setting up ENVs
-ENV AVAHI="false" \
-    DEBIAN_FRONTEND="teletype" \
+ENV DEBIAN_FRONTEND="teletype" \
     LANG="de_DE.UTF-8" \
     LANGUAGE="de_DE:de" \
     LC_ALL="de_DE.UTF-8" \
     PACKAGES="vi" \
     SETGID=1000 \
     SETUID=1000 \
-    TZ="Europe/Berlin" \
-    USBDEVICES="none" \
-    ZWAVE="false"
+    TZ="Europe/Berlin"
 
 # Run startup-script
 ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 8b4568a..4781fae 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -3,15 +3,15 @@
 # Reading ENV
 adminport=$IOB_ADMINPORT
 avahi=$AVAHI
-gid=$SETGID
 objectsdbhost=$IOB_OBJECTSDB_HOST
 objectsdbport=$IOB_OBJECTSDB_PORT
 objectsdbtype=$IOB_OBJECTSDB_TYPE
 packages=$PACKAGES
+setgid=$SETGID
+setuid=$SETUID
 statesdbhost=$IOB_STATESDB_HOST
 statesdbport=$IOB_STATESDB_PORT
 statesdbtype=$IOB_STATESDB_TYPE
-uid=$SETUID
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
@@ -42,14 +42,13 @@ 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 " -----"
+if [ "$adminport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $adminport)" && echo " -----"; fi
+if [ "$avahi" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" PACKAGES: $avahi)" && echo " -----"; fi
+if [ "$packages" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" PACKAGES: $packages)" && echo " -----"; fi
+if [ "$setgid" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETGID: $setgid)" && echo " -----"; fi
+if [ "$setuid" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETUID: $setuid)" && 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 ' '
 
@@ -76,17 +75,16 @@ 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 ]
+if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
 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 "Changing UID to "$setuid" and GID to "$setgid"..."
+  usermod -u $setuid iobroker
+  groupmod -g $setgid iobroker
   echo "Done."
-else
-  echo "There are no changes in UID/ GID needed."
+  echo ' '
 fi
-echo ' '
+
 
 # Change directory for next steps
 cd /opt/iobroker
@@ -144,8 +142,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 $uid:$gid /opt/scripts
+  chown -R $setuid:$setgid /opt/iobroker
+  chown -R $setuid:$setgid /opt/scripts
 echo "Done."
 echo ' '
 
@@ -188,6 +186,7 @@ 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" != "" ]
 then
@@ -201,40 +200,51 @@ then
   fi
 fi
 
+
 # Checking ENV for AVAHI
-if [ "$avahi" = "true" ]
+if [ "$avahi" != "" ]
 then
-  echo "Avahi-daemon is activated by ENV."
-  chmod 755 /opt/scripts/setup_avahi.sh
-  bash /opt/scripts/setup_avahi.sh
-  echo "Done."
-  echo ' '
+  if [ "$avahi" = "true" ]
+  then
+    echo "Avahi-daemon is activated by ENV."
+    chmod 755 /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
-  echo "Z-Wave is activated by ENV."
-  chmod 755 /opt/scripts/setup_zwave.sh
-  bash /opt/scripts/setup_zwave.sh
-  echo "Done."
-  echo ' '
+  if [ "$zwave" = "true" ]
+  then
+    echo "Z-Wave is activated by ENV."
+    chmod 755 /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."
 
-  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 ' '
+# 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
+        echo "Setting permissions for" $i"..."
+        chown root:dialout $i
+        chmod g+rw $i
+      done
+    echo "Done."
+    echo ' '
+  fi
 fi
 
 

From 6319d693cb5563362c8440c22590665198050a96 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Sat, 8 Feb 2020 21:23:32 +0100
Subject: [PATCH 16/31] preparing new beta

---
 .VERSION                                      |   2 +-
 README.md                                     |  20 +-
 aarch64/Dockerfile                            |  27 +-
 aarch64/scripts/iobroker_startup.sh           | 272 ++++++++++++------
 .../scripts/userscript_everystart_example.sh  |  13 +
 .../scripts/userscript_firststart_example.sh  |  12 +
 amd64/scripts/iobroker_startup.sh             |  50 ++--
 armv7hf/Dockerfile                            |  27 +-
 armv7hf/scripts/iobroker_startup.sh           | 272 ++++++++++++------
 .../scripts/userscript_everystart_example.sh  |  13 +
 .../scripts/userscript_firststart_example.sh  |  12 +
 11 files changed, 499 insertions(+), 221 deletions(-)
 create mode 100644 aarch64/scripts/userscript_everystart_example.sh
 create mode 100644 aarch64/scripts/userscript_firststart_example.sh
 create mode 100644 armv7hf/scripts/userscript_everystart_example.sh
 create mode 100644 armv7hf/scripts/userscript_firststart_example.sh

diff --git a/.VERSION b/.VERSION
index ed70355..6656fd3 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v4.1.2beta
+v4.1.3beta
diff --git a/README.md b/README.md
index 8ec7287..ae2864d 100644
--- a/README.md
+++ b/README.md
@@ -65,13 +65,18 @@ You do not have to declare every single variable when stting up your container.
 
 |env|default|description|
 |---|---|---|
-|IOB_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&#x2011;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 use 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|
@@ -101,7 +106,7 @@ The folder containing your userscripts must be mounted under /opt/userscripts in
 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.
+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
 
@@ -112,9 +117,12 @@ You will find the channel here: https://t.me/buanet_tutorials
 
 ## Changelog
 
-### v4.1.2beta (2020-02-02)
-* added feature userscripts on startup
-* small fix for permissions issues on some systems
+### v4.1.3beta (2020-02-08)
+* added new ENVs for "iobroker setup custom"
+* enhancements in startupscript logging
+* v4.1.2beta (2020-02-02)
+  * added feature userscripts on startup
+  * small fix for permissions issues on some systems
 * v4.1.1beta (2020-01-17)
   * updated openzwave to version 1.6.1007
 
diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
index 0f99a21..795062f 100644
--- a/aarch64/Dockerfile
+++ b/aarch64/Dockerfile
@@ -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
-RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker
+# Backup initial ioBroker and userscript folder
+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 \
-    AVAHI="false" \
-    DEBIAN_FRONTEND="teletype" \
+ENV 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" \
-    USBDEVICES="none" \
-    ZWAVE="false"
+    TZ="Europe/Berlin"
 
 # Run startup-script
 ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh
index a3501de..795aa6a 100644
--- a/aarch64/scripts/iobroker_startup.sh
+++ b/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
-uid=$SETUID
+setgid=$SETGID
+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 " -----"
-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 " -----"
+if [ "$adminport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $adminport)" && echo " -----"; fi
+if [ "$avahi" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" AVAHI: $avahi)" && echo " -----"; fi
+if [ "$objectsdbhost" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi
+if [ "$objectsdbport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi
+if [ "$objectsdbtype" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi
+if [ "$packages" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" PACKAGES: $packages)" && echo " -----"; fi
+if [ "$setgid" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETGID: $setgid)" && echo " -----"; fi
+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
-if [ "$packages" != "" ]
+# Installing additional packages and setting uid/gid
+if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
 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
-  echo "Done."
+  if [ "$packages" != "" ]
+  then
+    echo "Installing additional packages is set by ENV."
+    echo "The following packages will be installed:" $packages"..."
+    echo $packages > /opt/scripts/.packages
+    bash /opt/scripts/setup_packages.sh > /opt/scripts/setup_packages.log 2>&1
+    echo "Done."
+    echo ' '
+  fi
+  if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
+  then
+    echo "Different UID and/ or GID is set by ENV."
+    echo "Changing UID to "$setuid" and GID to "$setgid"..."
+    usermod -u $setuid iobroker
+    groupmod -g $setgid iobroker
+    echo "Done."
+    echo ' '
+  fi
 else
-  echo "There are no additional packages defined."
+  echo "Nothing to do here."
 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
@@ -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 $uid:$gid /opt/scripts
+  chown -R $setuid:$setgid /opt/iobroker
+  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,68 +192,168 @@ 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
-  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 ' '
+  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"\"..."
+    bash iobroker set admin.0 --port $adminport
+    echo 'Done.'
+    echo ' '
+  fi
 fi
 
+
 # Checking ENV for AVAHI
-if [ "$avahi" = "true" ]
+if [ "$avahi" != "" ]
 then
-  echo "Avahi-daemon is activated by ENV."
-  chmod 764 /opt/scripts/setup_avahi.sh
-  sh /opt/scripts/setup_avahi.sh
-  echo "Done."
-  echo ' '
+  if [ "$avahi" = "true" ]
+  then
+    echo "Avahi-daemon is activated by ENV."
+    chmod 755 /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
-  echo "Z-Wave is activated by ENV."
-  chmod 764 /opt/scripts/setup_zwave.sh
-  sh /opt/scripts/setup_zwave.sh
-  echo "Done."
-  echo ' '
+  if [ "$zwave" = "true" ]
+  then
+    echo "Z-Wave is activated by ENV."
+    chmod 755 /opt/scripts/setup_zwave.sh
+    bash /opt/scripts/setup_zwave.sh
+    echo "Done."
+    echo ' '
+  fi
 fi
 
+
 # checking ENV for USBDEVICES
-if [ "$usbdevices" != "none" ]
+if [ "$usbdevices" != "" ]
 then
-  echo "Usb-device-support is activated by ENV."
+  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
+fi
 
-  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."
+
+# Checking ENVs for custom setup of objects db
+if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ]
+then
+  if [ "$objectsdbtype" != $(jq '.objects.type' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation."
+    echo "Setting type of objects db to \""$objectsdbtype"\"..."
+    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 "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 ENV for REDIS
-if [ "$redis" != "false" ]
+
+# Checking ENVs for custom setup of states db#
+if [ "$statesdbtype" != "" ] || [ "$statesdbhost" != "" ] || [ "$statesdbport" != "" ]
 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."
+  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
 
 
diff --git a/aarch64/scripts/userscript_everystart_example.sh b/aarch64/scripts/userscript_everystart_example.sh
new file mode 100644
index 0000000..9023677
--- /dev/null
+++ b/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
diff --git a/aarch64/scripts/userscript_firststart_example.sh b/aarch64/scripts/userscript_firststart_example.sh
new file mode 100644
index 0000000..4fef50d
--- /dev/null
+++ b/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
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 4781fae..795aa6a 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -43,10 +43,16 @@ echo -n "-----               " && echo -n "$(printf "%-10s %-23s" npm: $(npm -v)
 echo "-----                                                  -----"
 echo "-----                       ENV                        -----"
 if [ "$adminport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $adminport)" && echo " -----"; fi
-if [ "$avahi" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" PACKAGES: $avahi)" && echo " -----"; fi
+if [ "$avahi" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" AVAHI: $avahi)" && echo " -----"; fi
+if [ "$objectsdbhost" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi
+if [ "$objectsdbport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi
+if [ "$objectsdbtype" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi
 if [ "$packages" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" PACKAGES: $packages)" && echo " -----"; fi
 if [ "$setgid" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETGID: $setgid)" && echo " -----"; fi
 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})"
@@ -61,30 +67,30 @@ echo "-----         Step 1 of 5: Preparing container         -----"
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-# Installing additional packages
-if [ "$packages" != "" ]
+# Installing additional packages and setting uid/gid
+if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
 then
-  echo "Installing additional packages is set by ENV."
-  echo "The following packages will be installed:" $packages"..."
-  echo $packages > /opt/scripts/.packages
-  bash /opt/scripts/setup_packages.sh > /opt/scripts/setup_packages.log 2>&1
-  echo "Done."
+  if [ "$packages" != "" ]
+  then
+    echo "Installing additional packages is set by ENV."
+    echo "The following packages will be installed:" $packages"..."
+    echo $packages > /opt/scripts/.packages
+    bash /opt/scripts/setup_packages.sh > /opt/scripts/setup_packages.log 2>&1
+    echo "Done."
+    echo ' '
+  fi
+  if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
+  then
+    echo "Different UID and/ or GID is set by ENV."
+    echo "Changing UID to "$setuid" and GID to "$setgid"..."
+    usermod -u $setuid iobroker
+    groupmod -g $setgid iobroker
+    echo "Done."
+    echo ' '
+  fi
 else
-  echo "There are no additional packages defined."
+  echo "Nothing to do here."
 fi
-echo ' '
-
-# Checking and setting uid/gid
-if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
-then
-  echo "Different UID and/ or GID is set by ENV."
-  echo "Changing UID to "$setuid" and GID to "$setgid"..."
-  usermod -u $setuid iobroker
-  groupmod -g $setgid iobroker
-  echo "Done."
-  echo ' '
-fi
-
 
 # Change directory for next steps
 cd /opt/iobroker
diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index 17f8f79..a276cee 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -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
-RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker
+# Backup initial ioBroker and userscript folder
+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 \
-    AVAHI="false" \
-    DEBIAN_FRONTEND="teletype" \
+ENV 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" \
-    USBDEVICES="none" \
-    ZWAVE="false"
+    TZ="Europe/Berlin"
 
 # Run startup-script
 ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh
index a3501de..795aa6a 100644
--- a/armv7hf/scripts/iobroker_startup.sh
+++ b/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
-uid=$SETUID
+setgid=$SETGID
+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 " -----"
-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 " -----"
+if [ "$adminport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $adminport)" && echo " -----"; fi
+if [ "$avahi" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" AVAHI: $avahi)" && echo " -----"; fi
+if [ "$objectsdbhost" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi
+if [ "$objectsdbport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi
+if [ "$objectsdbtype" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi
+if [ "$packages" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" PACKAGES: $packages)" && echo " -----"; fi
+if [ "$setgid" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" SETGID: $setgid)" && echo " -----"; fi
+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
-if [ "$packages" != "" ]
+# Installing additional packages and setting uid/gid
+if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
 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
-  echo "Done."
+  if [ "$packages" != "" ]
+  then
+    echo "Installing additional packages is set by ENV."
+    echo "The following packages will be installed:" $packages"..."
+    echo $packages > /opt/scripts/.packages
+    bash /opt/scripts/setup_packages.sh > /opt/scripts/setup_packages.log 2>&1
+    echo "Done."
+    echo ' '
+  fi
+  if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
+  then
+    echo "Different UID and/ or GID is set by ENV."
+    echo "Changing UID to "$setuid" and GID to "$setgid"..."
+    usermod -u $setuid iobroker
+    groupmod -g $setgid iobroker
+    echo "Done."
+    echo ' '
+  fi
 else
-  echo "There are no additional packages defined."
+  echo "Nothing to do here."
 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
@@ -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 $uid:$gid /opt/scripts
+  chown -R $setuid:$setgid /opt/iobroker
+  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,68 +192,168 @@ 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
-  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 ' '
+  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"\"..."
+    bash iobroker set admin.0 --port $adminport
+    echo 'Done.'
+    echo ' '
+  fi
 fi
 
+
 # Checking ENV for AVAHI
-if [ "$avahi" = "true" ]
+if [ "$avahi" != "" ]
 then
-  echo "Avahi-daemon is activated by ENV."
-  chmod 764 /opt/scripts/setup_avahi.sh
-  sh /opt/scripts/setup_avahi.sh
-  echo "Done."
-  echo ' '
+  if [ "$avahi" = "true" ]
+  then
+    echo "Avahi-daemon is activated by ENV."
+    chmod 755 /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
-  echo "Z-Wave is activated by ENV."
-  chmod 764 /opt/scripts/setup_zwave.sh
-  sh /opt/scripts/setup_zwave.sh
-  echo "Done."
-  echo ' '
+  if [ "$zwave" = "true" ]
+  then
+    echo "Z-Wave is activated by ENV."
+    chmod 755 /opt/scripts/setup_zwave.sh
+    bash /opt/scripts/setup_zwave.sh
+    echo "Done."
+    echo ' '
+  fi
 fi
 
+
 # checking ENV for USBDEVICES
-if [ "$usbdevices" != "none" ]
+if [ "$usbdevices" != "" ]
 then
-  echo "Usb-device-support is activated by ENV."
+  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
+fi
 
-  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."
+
+# Checking ENVs for custom setup of objects db
+if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ]
+then
+  if [ "$objectsdbtype" != $(jq '.objects.type' /opt/iobroker/iobroker-data/iobroker.json) ]
+  then
+    echo "ENV IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation."
+    echo "Setting type of objects db to \""$objectsdbtype"\"..."
+    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 "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 ENV for REDIS
-if [ "$redis" != "false" ]
+
+# Checking ENVs for custom setup of states db#
+if [ "$statesdbtype" != "" ] || [ "$statesdbhost" != "" ] || [ "$statesdbport" != "" ]
 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."
+  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
 
 
diff --git a/armv7hf/scripts/userscript_everystart_example.sh b/armv7hf/scripts/userscript_everystart_example.sh
new file mode 100644
index 0000000..9023677
--- /dev/null
+++ b/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
diff --git a/armv7hf/scripts/userscript_firststart_example.sh b/armv7hf/scripts/userscript_firststart_example.sh
new file mode 100644
index 0000000..4fef50d
--- /dev/null
+++ b/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

From b4e82c0f00cf8e9064f5e2a40a08aa16370d5728 Mon Sep 17 00:00:00 2001
From: Andre <info@buanet.de>
Date: Wed, 12 Feb 2020 13:51:18 +0100
Subject: [PATCH 17/31] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index ae2864d..b799bd1 100644
--- a/README.md
+++ b/README.md
@@ -94,6 +94,8 @@ 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.
 
+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. Ohterwise 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!

From a657d9b82e4061b8740fae89033aab34930ce39d Mon Sep 17 00:00:00 2001
From: Andre <info@buanet.de>
Date: Thu, 13 Feb 2020 09:07:41 +0100
Subject: [PATCH 18/31] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b799bd1..051f849 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ 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.
 
-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. Ohterwise you may get problems executing ioBroker inside the container!    
+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
 

From 1fb0c6c84d658bfaf3b3fed416b7893e84a1c25b Mon Sep 17 00:00:00 2001
From: Andre <info@buanet.de>
Date: Sun, 16 Feb 2020 17:21:20 +0100
Subject: [PATCH 19/31] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 051f849..b40f4ae 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ The following ways to geht iobroker-container running are only examples. Maybe y
 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
+docker run -p 8081:8081 --name iobroker -v iobrokerdata:/opt/iobroker buanet/iobroker:latest
 ```
 
 ### Running with docker-compose

From 95862aa1fdc5cac2c71bc73a3c9314604f11f682 Mon Sep 17 00:00:00 2001
From: Andre <info@buanet.de>
Date: Sun, 16 Feb 2020 17:21:37 +0100
Subject: [PATCH 20/31] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ae2864d..5186613 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ The following ways to geht iobroker-container running are only examples. Maybe y
 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
+docker run -p 8081:8081 --name iobroker -v iobrokerdata:/opt/iobroker buanet/iobroker:latest
 ```
 
 ### Running with docker-compose

From 3aaa633fdf049171fa60c5b9f80b71060da8527b Mon Sep 17 00:00:00 2001
From: Andre <info@buanet.de>
Date: Sat, 4 Apr 2020 22:18:00 +0200
Subject: [PATCH 21/31] skipping missing packages

---
 amd64/scripts/setup_packages.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/amd64/scripts/setup_packages.sh b/amd64/scripts/setup_packages.sh
index 8dc6848..555ed68 100644
--- a/amd64/scripts/setup_packages.sh
+++ b/amd64/scripts/setup_packages.sh
@@ -1,7 +1,14 @@
 #!/bin/bash
 
-apt-get update
-apt-get install -y  $(cat /opt/scripts/.packages)
+apt-get -qq update
+
+packages=$(cat /opt/scripts/.packages)
+for i in $packages; do
+  sudo apt-get -qq -y install $i
+done
+
+# apt-get install -y  $(cat /opt/scripts/.packages)
+
 rm -rf /var/lib/apt/lists/*
 rm -f /opt/scripts/.packages
 

From 21b4cfdd137b69336b7e526fa3935dd272ec798d Mon Sep 17 00:00:00 2001
From: Andre <info@buanet.de>
Date: Sat, 4 Apr 2020 22:57:33 +0200
Subject: [PATCH 22/31] deactivate logfile for packages

---
 amd64/scripts/iobroker_startup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 795aa6a..8966c79 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -75,7 +75,7 @@ then
     echo "Installing additional packages is set by ENV."
     echo "The following packages will be installed:" $packages"..."
     echo $packages > /opt/scripts/.packages
-    bash /opt/scripts/setup_packages.sh > /opt/scripts/setup_packages.log 2>&1
+    bash /opt/scripts/setup_packages.sh #> /opt/scripts/setup_packages.log 2>&1
     echo "Done."
     echo ' '
   fi

From 32ef7a0194262d8d0642a9c5597f43bdb97023f4 Mon Sep 17 00:00:00 2001
From: Andre <info@buanet.de>
Date: Sat, 4 Apr 2020 23:12:28 +0200
Subject: [PATCH 23/31] changed default for packages

as vi is not available as armv7 package I changed the default to vim
---
 armv7hf/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index a276cee..943d38b 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -83,7 +83,7 @@ ENV DEBIAN_FRONTEND="teletype" \
     LANG="de_DE.UTF-8" \
     LANGUAGE="de_DE:de" \
     LC_ALL="de_DE.UTF-8" \
-    PACKAGES="vi" \
+    PACKAGES="vim" \
     SETGID=1000 \
     SETUID=1000 \
     TZ="Europe/Berlin"

From eb6c203d534150b6811cb44f000540d73b3ef0fc Mon Sep 17 00:00:00 2001
From: andre <>
Date: Mon, 6 Apr 2020 21:40:27 +0200
Subject: [PATCH 24/31] some testing with base images

---
 README.md        | 8 +++++---
 amd64/Dockerfile | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 5186613..fd6f4b7 100644
--- a/README.md
+++ b/README.md
@@ -117,9 +117,11 @@ You will find the channel here: https://t.me/buanet_tutorials
 
 ## Changelog
 
-### v4.1.3beta (2020-02-08)
-* added new ENVs for "iobroker setup custom"
-* enhancements in startupscript logging
+### v4.1.4beta (2020-04-06)
+* optimizing installation of packages
+* v4.1.3beta (2020-02-08)
+  * added new ENVs for "iobroker setup custom"
+  * enhancements in startupscript logging
 * v4.1.2beta (2020-02-02)
   * added feature userscripts on startup
   * small fix for permissions issues on some systems
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 681d39d..0b84f1a 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM amd64/debian:buster
 
 LABEL maintainer="Andre Germann" \
       url="<https://buanet.de>"

From 7ea7ab7725a70a9d04cecf619d4de33a4609506f Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Tue, 7 Apr 2020 01:43:16 +0200
Subject: [PATCH 25/31] updated readme.md

---
 README.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fd6f4b7..22ff5e6 100644
--- a/README.md
+++ b/README.md
@@ -110,11 +110,15 @@ To get familiar with that feature try the following: Create a Container, mount a
 
 ## Miscellaneous
 
-### Keep me updated
+### 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 take a look into the [open issues](https://github.com/buanet/docker-iobroker/issues) and helping me answering questions, fixing bugs or adding new features. ;)<br>Another possible way could be to send me a small donation: <a href="https://www.paypal.me/buanet"><img src="https://buanet.de/wp-content/uploads/2017/08/pp128.png" height="20" width="20"></a>
+
 ## Changelog
 
 ### v4.1.4beta (2020-04-06)
@@ -123,7 +127,7 @@ You will find the channel here: https://t.me/buanet_tutorials
   * added new ENVs for "iobroker setup custom"
   * enhancements in startupscript logging
 * v4.1.2beta (2020-02-02)
-  * added feature userscripts on startup
+  * 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

From c28b840bc79f4f5105e5b5e93bf8271828b5092e Mon Sep 17 00:00:00 2001
From: Andre <info@buanet.de>
Date: Tue, 7 Apr 2020 01:46:37 +0200
Subject: [PATCH 26/31] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 22ff5e6..db71e42 100644
--- a/README.md
+++ b/README.md
@@ -117,7 +117,7 @@ You will find the channel here: https://t.me/buanet_tutorials
 
 ### Support the project
 
-The easiest way to support this project is to take a look into the [open issues](https://github.com/buanet/docker-iobroker/issues) and helping me answering questions, fixing bugs or adding new features. ;)<br>Another possible way could be to send me a small donation: <a href="https://www.paypal.me/buanet"><img src="https://buanet.de/wp-content/uploads/2017/08/pp128.png" height="20" width="20"></a>
+The easiest way to support this project is to take a look into the [open issues](https://github.com/buanet/docker-iobroker/issues) and helping me answering questions, fixing bugs or adding new features. ;)<br>Another possible way could be to send me a small donation: <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>
 
 ## Changelog
 

From aa98ab45785e6088122def701deffa6869ebbf78 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Tue, 7 Apr 2020 13:44:42 +0200
Subject: [PATCH 27/31] some testing

---
 aarch64/Dockerfile | 3 ++-
 armv7hf/Dockerfile | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
index 795062f..8601f52 100644
--- a/aarch64/Dockerfile
+++ b/aarch64/Dockerfile
@@ -1,4 +1,5 @@
-FROM balenalib/aarch64-debian:stretch
+FROM arm64v8/debian:buster
+# FROM balenalib/aarch64-debian:stretch
 
 LABEL maintainer="Andre Germann" \
       url="<https://buanet.de>"
diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index 943d38b..d4b960b 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -1,4 +1,5 @@
-FROM balenalib/armv7hf-debian:stretch
+FROM arm32v7/debian:buster
+# FROM balenalib/armv7hf-debian:stretch
 
 LABEL maintainer="Andre Germann" \
       url="<https://buanet.de>"

From 4003e50bf2b8dc8d6efdc1033f8049e5a58f594d Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Tue, 7 Apr 2020 13:47:44 +0200
Subject: [PATCH 28/31] update readme

---
 .VERSION  | 2 +-
 README.md | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.VERSION b/.VERSION
index 6656fd3..30cafe7 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v4.1.3beta
+v4.1.4beta
diff --git a/README.md b/README.md
index db71e42..c09e8d6 100644
--- a/README.md
+++ b/README.md
@@ -121,7 +121,8 @@ The easiest way to support this project is to take a look into the [open issues]
 
 ## Changelog
 
-### v4.1.4beta (2020-04-06)
+### v4.1.4beta (2020-04-07)
+* testing buster as base image
 * optimizing installation of packages
 * v4.1.3beta (2020-02-08)
   * added new ENVs for "iobroker setup custom"

From 6f7c61c2344f8575019c24263dc3c772135307c6 Mon Sep 17 00:00:00 2001
From: Andre <info@buanet.de>
Date: Tue, 7 Apr 2020 13:54:03 +0200
Subject: [PATCH 29/31] Update Dockerfile

---
 aarch64/Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
index 8601f52..d2aa570 100644
--- a/aarch64/Dockerfile
+++ b/aarch64/Dockerfile
@@ -1,6 +1,4 @@
-FROM arm64v8/debian:buster
-# FROM balenalib/aarch64-debian:stretch
-
+FROM balenalib/aarch64-debian:buster
 LABEL maintainer="Andre Germann" \
       url="<https://buanet.de>"
 

From 3641afefc63694985f50c0f3aa96dd09b5b6206d Mon Sep 17 00:00:00 2001
From: Andre <info@buanet.de>
Date: Tue, 7 Apr 2020 13:54:36 +0200
Subject: [PATCH 30/31] Update Dockerfile

---
 armv7hf/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index d4b960b..686e593 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -1,5 +1,4 @@
-FROM arm32v7/debian:buster
-# FROM balenalib/armv7hf-debian:stretch
+FROM balenalib/armv7hf-debian:buster
 
 LABEL maintainer="Andre Germann" \
       url="<https://buanet.de>"

From a9d92466a363165586146b0c82787b60dd59ef93 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Tue, 14 Apr 2020 23:41:17 +0200
Subject: [PATCH 31/31] getting files ready for v4.2.0

---
 .VERSION                                    |  2 +-
 README.md                                   | 19 +++++++++++++------
 aarch64/Dockerfile                          |  3 ++-
 aarch64/scripts/iobroker_startup.sh         |  2 +-
 aarch64/scripts/setup_packages.sh           |  9 +++++++--
 amd64/Dockerfile                            |  2 +-
 amd64/scripts/iobroker_startup.sh           |  2 +-
 amd64/scripts/setup_packages.sh             |  2 --
 armv7hf/Dockerfile                          |  2 +-
 armv7hf/scripts/iobroker_startup.sh         |  2 +-
 armv7hf/scripts/setup_packages.sh           |  9 +++++++--
 opt/maintenance-scripts/iobroker_restart.sh |  3 +--
 12 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/.VERSION b/.VERSION
index 30cafe7..51be872 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v4.1.4beta
+v4.2.0
diff --git a/README.md b/README.md
index 5fbd39d..eb21684 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,8 @@ The following will give a short overview.
 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|
 |---|---|---|
 |AVAHI|false|Installs and activates avahi-daemon for supporting yahka-adapter, can be "true" or "false"|
@@ -94,7 +96,7 @@ 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.
 
-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!    
+**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
 
@@ -119,15 +121,20 @@ You will find the channel here: https://t.me/buanet_tutorials
 
 ### Support the project
 
-The easiest way to support this project is to take a look into the [open issues](https://github.com/buanet/docker-iobroker/issues) and helping me answering questions, fixing bugs or adding new features. ;)<br>Another possible way could be to send me a small donation: <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>
+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.1.4beta (2020-04-07)
-* testing buster as base image
-* optimizing installation of packages
+### 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)
-  * added new ENVs for "iobroker setup custom"
+  * 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
diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
index d2aa570..0c85450 100644
--- a/aarch64/Dockerfile
+++ b/aarch64/Dockerfile
@@ -1,6 +1,7 @@
 FROM balenalib/aarch64-debian:buster
+
 LABEL maintainer="Andre Germann" \
-      url="<https://buanet.de>"
+      url="https://buanet.de"
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh
index 795aa6a..1e9b430 100644
--- a/aarch64/scripts/iobroker_startup.sh
+++ b/aarch64/scripts/iobroker_startup.sh
@@ -75,7 +75,7 @@ then
     echo "Installing additional packages is set by ENV."
     echo "The following packages will be installed:" $packages"..."
     echo $packages > /opt/scripts/.packages
-    bash /opt/scripts/setup_packages.sh > /opt/scripts/setup_packages.log 2>&1
+    bash /opt/scripts/setup_packages.sh
     echo "Done."
     echo ' '
   fi
diff --git a/aarch64/scripts/setup_packages.sh b/aarch64/scripts/setup_packages.sh
index 8dc6848..449900f 100644
--- a/aarch64/scripts/setup_packages.sh
+++ b/aarch64/scripts/setup_packages.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
-apt-get update
-apt-get install -y  $(cat /opt/scripts/.packages)
+apt-get -qq update
+
+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
 
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 0b84f1a..9f15b1d 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -1,7 +1,7 @@
 FROM amd64/debian:buster
 
 LABEL maintainer="Andre Germann" \
-      url="<https://buanet.de>"
+      url="https://buanet.de"
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 8966c79..1e9b430 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -75,7 +75,7 @@ then
     echo "Installing additional packages is set by ENV."
     echo "The following packages will be installed:" $packages"..."
     echo $packages > /opt/scripts/.packages
-    bash /opt/scripts/setup_packages.sh #> /opt/scripts/setup_packages.log 2>&1
+    bash /opt/scripts/setup_packages.sh
     echo "Done."
     echo ' '
   fi
diff --git a/amd64/scripts/setup_packages.sh b/amd64/scripts/setup_packages.sh
index 555ed68..449900f 100644
--- a/amd64/scripts/setup_packages.sh
+++ b/amd64/scripts/setup_packages.sh
@@ -7,8 +7,6 @@ for i in $packages; do
   sudo apt-get -qq -y install $i
 done
 
-# apt-get install -y  $(cat /opt/scripts/.packages)
-
 rm -rf /var/lib/apt/lists/*
 rm -f /opt/scripts/.packages
 
diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index 686e593..54df7f9 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -1,7 +1,7 @@
 FROM balenalib/armv7hf-debian:buster
 
 LABEL maintainer="Andre Germann" \
-      url="<https://buanet.de>"
+      url="https://buanet.de"
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh
index 795aa6a..1e9b430 100644
--- a/armv7hf/scripts/iobroker_startup.sh
+++ b/armv7hf/scripts/iobroker_startup.sh
@@ -75,7 +75,7 @@ then
     echo "Installing additional packages is set by ENV."
     echo "The following packages will be installed:" $packages"..."
     echo $packages > /opt/scripts/.packages
-    bash /opt/scripts/setup_packages.sh > /opt/scripts/setup_packages.log 2>&1
+    bash /opt/scripts/setup_packages.sh
     echo "Done."
     echo ' '
   fi
diff --git a/armv7hf/scripts/setup_packages.sh b/armv7hf/scripts/setup_packages.sh
index 8dc6848..449900f 100644
--- a/armv7hf/scripts/setup_packages.sh
+++ b/armv7hf/scripts/setup_packages.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
-apt-get update
-apt-get install -y  $(cat /opt/scripts/.packages)
+apt-get -qq update
+
+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
 
diff --git a/opt/maintenance-scripts/iobroker_restart.sh b/opt/maintenance-scripts/iobroker_restart.sh
index 14d6b92..c7e0dde 100644
--- a/opt/maintenance-scripts/iobroker_restart.sh
+++ b/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