From 5a230230219131c425d956ef56676461f4531065 Mon Sep 17 00:00:00 2001
From: Andre Germann <info@buanet.de>
Date: Tue, 30 Jun 2020 08:19:49 +0200
Subject: [PATCH 01/20] Update .VERSION

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

diff --git a/.VERSION b/.VERSION
index d3845ad..e9ae6f0 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v5.0.0
+v5.0.0beta

From 89761ac8c4708969f5f9692342960f6ad6a69f75 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Tue, 30 Jun 2020 08:33:45 +0200
Subject: [PATCH 02/20] some testing

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

diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index cbb7dfe..3ea41b7 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -71,7 +71,7 @@ WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
 # Temporary updating js-controller to not stable version
-RUN npm install iobroker.js-controller@3.1.6
+# RUN npm install iobroker.js-controller@3.1.6
 
 # Backup initial ioBroker and userscript folder
 RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \

From c92087db976b448b494278406932c989f05872e4 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Tue, 30 Jun 2020 13:03:39 +0200
Subject: [PATCH 03/20] fixing backup detection

---
 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 63c4e89..0cd1aab 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -114,7 +114,7 @@ then
 elif [ -f /opt/iobroker/iobroker ]
 then
   echo "Existing installation of ioBroker detected in /opt/iobroker."
-elif [ $(ls iobroker_20* 2> /dev/null | wc -l) != "0" ] && [ $(tar -ztvf /opt/iobroker/iobroker_20*.tar.gz "backup/backup.json" 2> /dev/null | wc -l) != "0" ]
+elif [ $(ls *_backupiobroker.tar.gz 2> /dev/null | wc -l) != "0" ] && [ $(tar -ztvf /opt/iobroker/*_backupiobroker.tar.gz "backup/backup.json" 2> /dev/null | wc -l) != "0" ]
 then
   echo "ioBroker backup file detected in /opt/iobroker. Restoring ioBroker..."
     mv /opt/iobroker/*.tar.gz /opt/

From 2c07ddcfcec4ec5dfa0d2a3f28854a91484076e4 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Wed, 1 Jul 2020 21:28:05 +0200
Subject: [PATCH 04/20] some testing

---
 .VERSION                          |  2 +-
 README.md                         | 10 ++++--
 amd64/scripts/iobroker_startup.sh | 55 ++++++++++++++++++++-----------
 3 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/.VERSION b/.VERSION
index e9ae6f0..94c2501 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v5.0.0beta
+v5.0.1beta
diff --git a/README.md b/README.md
index e550afc..2ab6c83 100644
--- a/README.md
+++ b/README.md
@@ -98,8 +98,8 @@ You do not have to declare every single variable when setting up your container.
 ### Mounting folder/ volume
 
 It is possible to mount an empty folder to /opt/iobroker during first startup of the container. The startup script 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 (for example created with backitup adapter) named like this: "iobroker_2020_01_06-01_09_10_backupiobroker.tar.gz".
-The startup script will detect this backup and restore it during the start of the container. Please see container logs when starting the container for more details!
+Since v4.1.0 it is also possible mount a folder filled up with an iobroker backup file created using "iobroker backup" command or backitup adapter. Please take care of the name of your backup file ending like this: "*_backupiobroker.tar.gz".
+The startup script will then detect this backup and restore it during the start of the container. Please see container logs when starting the container for more details!
 
 Note: It is absolutely recommended to use a mounted folder or persistent volume for /opt/iobroker folder!
 
@@ -164,6 +164,12 @@ Thank you!
 
 ## Changelog
 
+### v5.0.1beta (2020-06-30)
+* fixing backup detection in startup script
+* fixing permission issue on iobroker restored
+* extended Logging
+* optimize multihost support
+
 ### v5.0.0 (2020-06-29)
 * v4.2.4beta (2020-06-23)
   * added graceful shutdown
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 0cd1aab..e6dea9b 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -43,8 +43,9 @@ echo -n "-----               " && echo -n "$(printf "%-10s %-23s" node: $(node -
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" npm: $(npm -v))" && echo " -----"
 echo "-----                                                  -----"
 echo "-----                       ENV                        -----"
-if [ "$adminport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $adminport)" && echo " -----"; fi
+if [ "$adminport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_ADMINPORT: $adminport)" && echo " -----"; fi
 if [ "$avahi" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" AVAHI: $avahi)" && echo " -----"; fi
+if [ "$multihost" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_MULTIHOST: $multihost)" && 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
@@ -116,25 +117,33 @@ then
   echo "Existing installation of ioBroker detected in /opt/iobroker."
 elif [ $(ls *_backupiobroker.tar.gz 2> /dev/null | wc -l) != "0" ] && [ $(tar -ztvf /opt/iobroker/*_backupiobroker.tar.gz "backup/backup.json" 2> /dev/null | wc -l) != "0" ]
 then
-  echo "ioBroker backup file detected in /opt/iobroker. Restoring ioBroker..."
-    mv /opt/iobroker/*.tar.gz /opt/
-    tar -xf /opt/initial_iobroker.tar -C /
-    mkdir /opt/iobroker/backups
-    mv /opt/*.tar.gz /opt/iobroker/backups/
-    iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
-  echo "Done."
-  echo ' '
-  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-  echo "!!!!!                             IMPORTANT NOTE                             !!!!!"
-  echo "!!!!!        The sartup script restored iobroker from a backup file.         !!!!!"
-  echo "!!!!! Check /opt/iobroker/log/restore.log to see if restore was successful.  !!!!!"
-  echo "!!!!! When ioBroker now starts it will reinstall all Adapters automatically. !!!!!"
-  echo "!!!!!         This might be take a looooong time! Please be patient!         !!!!!"
-  echo "!!!!!  You can view installation process by taking a look at ioBroker log.   !!!!!"
-  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+  if [ "$multihost" = "slave" ]
+  then
+    echo "IoBroker backup file detected in /opt/iobroker. But Multihost is set to \"slave\"."
+    echo "Restoring a backup is not supported on Multihost slaves. Please check configuration and start over."
+    echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+    exit 1
+  else
+    echo "IoBroker backup file detected in /opt/iobroker. Restoring ioBroker..."
+      mv /opt/iobroker/*.tar.gz /opt/
+      tar -xf /opt/initial_iobroker.tar -C /
+      mkdir /opt/iobroker/backups
+      mv /opt/*.tar.gz /opt/iobroker/backups/
+      iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
+    echo "Done."
+    echo ' '
+    echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+    echo "!!!!!                             IMPORTANT NOTE                             !!!!!"
+    echo "!!!!!        The sartup script restored iobroker from a backup file.         !!!!!"
+    echo "!!!!! Check /opt/iobroker/log/restore.log to see if restore was successful.  !!!!!"
+    echo "!!!!! When ioBroker now starts it will reinstall all Adapters automatically. !!!!!"
+    echo "!!!!!         This might be take a looooong time! Please be patient!         !!!!!"
+    echo "!!!!!  You can view installation process by taking a look at ioBroker log.   !!!!!"
+    echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+  fi
 else
-  echo "There is data detected in /opt/iobroker but it looks like it is no instance of iobroker or a valid backup file!"
-  echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
+  echo "There is data detected in /opt/iobroker but it looks like it is no instance of ioBroker or a valid backup file!"
+  echo "Please check/ recreate mounted folder/ volume and start over."
   exit 1
 fi
 echo ' '
@@ -263,6 +272,7 @@ then
   echo "Multihost is set as \"master\" by ENV and no external objects db is set."
   echo "Setting host of objects db to \"0.0.0.0\" to allow external communication..."
     jq --arg objectsdbhost "0.0.0.0" '.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
+    chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
   echo "Done."
   echo ' '
 elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ]
@@ -303,6 +313,7 @@ then
   echo "Multihost is set as \"master\" by ENV and no external states db is set."
   echo "Setting host of states db to \"0.0.0.0\" to allow external communication..."
     jq --arg statesdbhost "0.0.0.0" '.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
+    chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
   echo "Done."
   echo ' '
 elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ]
@@ -347,6 +358,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."
@@ -356,6 +368,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."
@@ -365,6 +378,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."
@@ -381,6 +395,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."
@@ -390,6 +405,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."
@@ -399,6 +415,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."

From 980ef553d10ae8ad179ea97e02e7082cb4ed21e2 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Wed, 1 Jul 2020 22:12:17 +0200
Subject: [PATCH 05/20] preparing beta

---
 README.md                           | 18 ++++-----
 aarch64/Dockerfile                  |  3 --
 aarch64/scripts/iobroker_startup.sh | 57 +++++++++++++++++++----------
 amd64/Dockerfile                    |  3 --
 armv7hf/Dockerfile                  |  3 --
 armv7hf/scripts/iobroker_startup.sh | 57 +++++++++++++++++++----------
 6 files changed, 83 insertions(+), 58 deletions(-)

diff --git a/README.md b/README.md
index 2ab6c83..87aac4e 100644
--- a/README.md
+++ b/README.md
@@ -74,25 +74,25 @@ You do not have to declare every single variable when setting up your container.
 
 **Important: In v4.2.0 the ENVs "ADMINPORT" and "REDIS" were renamed/ reorganized. For Details see the following table!**
 
-|env|default|description|
+|ENV|Default|Description|
 |---|---|---|
 |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_MULTIHOST|master|Sets ioBroker instance as "master" or "slave" for multihost (additional config for objectsdb and statesdb needed)|
-|IOB_OBJECTSDB_HOST|127.0.0.1|Sets hostname for ioBroker objects db|
+|IOB_MULTIHOST|[not set]|Sets ioBroker instance as "master" or "slave" for multihost support (needs additional config for objectsdb and statesdb!)|
+|IOB_OBJECTSDB_HOST|127.0.0.1|Sets host 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_HOST|127.0.0.1|Sets host 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"|
-|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|
+|PACKAGES|[not set]|Installs additional linux packages to your container, packages should be seperated by whitespace like this: "package1 package2 package3"|
+|SETGID|1000|For some 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 some reasons it might be useful to specify the uid of the containers iobroker user to match an existing user on the docker host|
 |TZ|Europe/Berlin|All valid Linux-timezones|
-|USBDEVICES|none|Sets relevant permissions on mounted devices like "/dev/ttyACM0", for more than one device separate with ";" like "/dev/ttyACM0;/dev/ttyACM1"|
+|USBDEVICES|none|Sets relevant permissions on mounted devices like "/dev/ttyACM0", for more than one device separate with ";" like this: "/dev/ttyACM0;/dev/ttyACM1"|
 |ZWAVE|false|Will install openzwave to support zwave-adapter, can be "true" or "false"|
 
 ### Mounting folder/ volume
@@ -164,7 +164,7 @@ Thank you!
 
 ## Changelog
 
-### v5.0.1beta (2020-06-30)
+### v5.0.1beta (2020-07-01)
 * fixing backup detection in startup script
 * fixing permission issue on iobroker restored
 * extended Logging
diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
index efb11c1..383975d 100644
--- a/aarch64/Dockerfile
+++ b/aarch64/Dockerfile
@@ -70,9 +70,6 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
-# Temporary updating js-controller to not stable version
-RUN npm install iobroker.js-controller@3.1.6
-
 # Backup initial ioBroker and userscript folder
 RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
     && tar -cf /opt/initial_userscripts.tar /opt/userscripts
diff --git a/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh
index 63c4e89..e6dea9b 100644
--- a/aarch64/scripts/iobroker_startup.sh
+++ b/aarch64/scripts/iobroker_startup.sh
@@ -43,8 +43,9 @@ echo -n "-----               " && echo -n "$(printf "%-10s %-23s" node: $(node -
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" npm: $(npm -v))" && echo " -----"
 echo "-----                                                  -----"
 echo "-----                       ENV                        -----"
-if [ "$adminport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $adminport)" && echo " -----"; fi
+if [ "$adminport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_ADMINPORT: $adminport)" && echo " -----"; fi
 if [ "$avahi" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" AVAHI: $avahi)" && echo " -----"; fi
+if [ "$multihost" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_MULTIHOST: $multihost)" && 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
@@ -114,27 +115,35 @@ then
 elif [ -f /opt/iobroker/iobroker ]
 then
   echo "Existing installation of ioBroker detected in /opt/iobroker."
-elif [ $(ls iobroker_20* 2> /dev/null | wc -l) != "0" ] && [ $(tar -ztvf /opt/iobroker/iobroker_20*.tar.gz "backup/backup.json" 2> /dev/null | wc -l) != "0" ]
+elif [ $(ls *_backupiobroker.tar.gz 2> /dev/null | wc -l) != "0" ] && [ $(tar -ztvf /opt/iobroker/*_backupiobroker.tar.gz "backup/backup.json" 2> /dev/null | wc -l) != "0" ]
 then
-  echo "ioBroker backup file detected in /opt/iobroker. Restoring ioBroker..."
-    mv /opt/iobroker/*.tar.gz /opt/
-    tar -xf /opt/initial_iobroker.tar -C /
-    mkdir /opt/iobroker/backups
-    mv /opt/*.tar.gz /opt/iobroker/backups/
-    iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
-  echo "Done."
-  echo ' '
-  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-  echo "!!!!!                             IMPORTANT NOTE                             !!!!!"
-  echo "!!!!!        The sartup script restored iobroker from a backup file.         !!!!!"
-  echo "!!!!! Check /opt/iobroker/log/restore.log to see if restore was successful.  !!!!!"
-  echo "!!!!! When ioBroker now starts it will reinstall all Adapters automatically. !!!!!"
-  echo "!!!!!         This might be take a looooong time! Please be patient!         !!!!!"
-  echo "!!!!!  You can view installation process by taking a look at ioBroker log.   !!!!!"
-  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+  if [ "$multihost" = "slave" ]
+  then
+    echo "IoBroker backup file detected in /opt/iobroker. But Multihost is set to \"slave\"."
+    echo "Restoring a backup is not supported on Multihost slaves. Please check configuration and start over."
+    echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+    exit 1
+  else
+    echo "IoBroker backup file detected in /opt/iobroker. Restoring ioBroker..."
+      mv /opt/iobroker/*.tar.gz /opt/
+      tar -xf /opt/initial_iobroker.tar -C /
+      mkdir /opt/iobroker/backups
+      mv /opt/*.tar.gz /opt/iobroker/backups/
+      iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
+    echo "Done."
+    echo ' '
+    echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+    echo "!!!!!                             IMPORTANT NOTE                             !!!!!"
+    echo "!!!!!        The sartup script restored iobroker from a backup file.         !!!!!"
+    echo "!!!!! Check /opt/iobroker/log/restore.log to see if restore was successful.  !!!!!"
+    echo "!!!!! When ioBroker now starts it will reinstall all Adapters automatically. !!!!!"
+    echo "!!!!!         This might be take a looooong time! Please be patient!         !!!!!"
+    echo "!!!!!  You can view installation process by taking a look at ioBroker log.   !!!!!"
+    echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+  fi
 else
-  echo "There is data detected in /opt/iobroker but it looks like it is no instance of iobroker or a valid backup file!"
-  echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
+  echo "There is data detected in /opt/iobroker but it looks like it is no instance of ioBroker or a valid backup file!"
+  echo "Please check/ recreate mounted folder/ volume and start over."
   exit 1
 fi
 echo ' '
@@ -263,6 +272,7 @@ then
   echo "Multihost is set as \"master\" by ENV and no external objects db is set."
   echo "Setting host of objects db to \"0.0.0.0\" to allow external communication..."
     jq --arg objectsdbhost "0.0.0.0" '.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
+    chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
   echo "Done."
   echo ' '
 elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ]
@@ -303,6 +313,7 @@ then
   echo "Multihost is set as \"master\" by ENV and no external states db is set."
   echo "Setting host of states db to \"0.0.0.0\" to allow external communication..."
     jq --arg statesdbhost "0.0.0.0" '.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
+    chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
   echo "Done."
   echo ' '
 elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ]
@@ -347,6 +358,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."
@@ -356,6 +368,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."
@@ -365,6 +378,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."
@@ -381,6 +395,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."
@@ -390,6 +405,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."
@@ -399,6 +415,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 3ea41b7..8ded5d9 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -70,9 +70,6 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
-# Temporary updating js-controller to not stable version
-# RUN npm install iobroker.js-controller@3.1.6
-
 # Backup initial ioBroker and userscript folder
 RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
     && tar -cf /opt/initial_userscripts.tar /opt/userscripts
diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index 1ba6e52..bbf2285 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -70,9 +70,6 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
-# Temporary updating js-controller to not stable version
-RUN npm install iobroker.js-controller@3.1.6
-
 # Backup initial ioBroker and userscript folder
 RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
     && tar -cf /opt/initial_userscripts.tar /opt/userscripts
diff --git a/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh
index 63c4e89..e6dea9b 100644
--- a/armv7hf/scripts/iobroker_startup.sh
+++ b/armv7hf/scripts/iobroker_startup.sh
@@ -43,8 +43,9 @@ echo -n "-----               " && echo -n "$(printf "%-10s %-23s" node: $(node -
 echo -n "-----               " && echo -n "$(printf "%-10s %-23s" npm: $(npm -v))" && echo " -----"
 echo "-----                                                  -----"
 echo "-----                       ENV                        -----"
-if [ "$adminport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $adminport)" && echo " -----"; fi
+if [ "$adminport" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_ADMINPORT: $adminport)" && echo " -----"; fi
 if [ "$avahi" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" AVAHI: $avahi)" && echo " -----"; fi
+if [ "$multihost" != "" ]; then echo -n "-----               " && echo -n "$(printf "%-10s %-23s" IOB_MULTIHOST: $multihost)" && 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
@@ -114,27 +115,35 @@ then
 elif [ -f /opt/iobroker/iobroker ]
 then
   echo "Existing installation of ioBroker detected in /opt/iobroker."
-elif [ $(ls iobroker_20* 2> /dev/null | wc -l) != "0" ] && [ $(tar -ztvf /opt/iobroker/iobroker_20*.tar.gz "backup/backup.json" 2> /dev/null | wc -l) != "0" ]
+elif [ $(ls *_backupiobroker.tar.gz 2> /dev/null | wc -l) != "0" ] && [ $(tar -ztvf /opt/iobroker/*_backupiobroker.tar.gz "backup/backup.json" 2> /dev/null | wc -l) != "0" ]
 then
-  echo "ioBroker backup file detected in /opt/iobroker. Restoring ioBroker..."
-    mv /opt/iobroker/*.tar.gz /opt/
-    tar -xf /opt/initial_iobroker.tar -C /
-    mkdir /opt/iobroker/backups
-    mv /opt/*.tar.gz /opt/iobroker/backups/
-    iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
-  echo "Done."
-  echo ' '
-  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-  echo "!!!!!                             IMPORTANT NOTE                             !!!!!"
-  echo "!!!!!        The sartup script restored iobroker from a backup file.         !!!!!"
-  echo "!!!!! Check /opt/iobroker/log/restore.log to see if restore was successful.  !!!!!"
-  echo "!!!!! When ioBroker now starts it will reinstall all Adapters automatically. !!!!!"
-  echo "!!!!!         This might be take a looooong time! Please be patient!         !!!!!"
-  echo "!!!!!  You can view installation process by taking a look at ioBroker log.   !!!!!"
-  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+  if [ "$multihost" = "slave" ]
+  then
+    echo "IoBroker backup file detected in /opt/iobroker. But Multihost is set to \"slave\"."
+    echo "Restoring a backup is not supported on Multihost slaves. Please check configuration and start over."
+    echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+    exit 1
+  else
+    echo "IoBroker backup file detected in /opt/iobroker. Restoring ioBroker..."
+      mv /opt/iobroker/*.tar.gz /opt/
+      tar -xf /opt/initial_iobroker.tar -C /
+      mkdir /opt/iobroker/backups
+      mv /opt/*.tar.gz /opt/iobroker/backups/
+      iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
+    echo "Done."
+    echo ' '
+    echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+    echo "!!!!!                             IMPORTANT NOTE                             !!!!!"
+    echo "!!!!!        The sartup script restored iobroker from a backup file.         !!!!!"
+    echo "!!!!! Check /opt/iobroker/log/restore.log to see if restore was successful.  !!!!!"
+    echo "!!!!! When ioBroker now starts it will reinstall all Adapters automatically. !!!!!"
+    echo "!!!!!         This might be take a looooong time! Please be patient!         !!!!!"
+    echo "!!!!!  You can view installation process by taking a look at ioBroker log.   !!!!!"
+    echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+  fi
 else
-  echo "There is data detected in /opt/iobroker but it looks like it is no instance of iobroker or a valid backup file!"
-  echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
+  echo "There is data detected in /opt/iobroker but it looks like it is no instance of ioBroker or a valid backup file!"
+  echo "Please check/ recreate mounted folder/ volume and start over."
   exit 1
 fi
 echo ' '
@@ -263,6 +272,7 @@ then
   echo "Multihost is set as \"master\" by ENV and no external objects db is set."
   echo "Setting host of objects db to \"0.0.0.0\" to allow external communication..."
     jq --arg objectsdbhost "0.0.0.0" '.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
+    chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
   echo "Done."
   echo ' '
 elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ]
@@ -303,6 +313,7 @@ then
   echo "Multihost is set as \"master\" by ENV and no external states db is set."
   echo "Setting host of states db to \"0.0.0.0\" to allow external communication..."
     jq --arg statesdbhost "0.0.0.0" '.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
+    chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
   echo "Done."
   echo ' '
 elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ]
@@ -347,6 +358,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."
@@ -356,6 +368,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."
@@ -365,6 +378,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."
@@ -381,6 +395,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."
@@ -390,6 +405,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."
@@ -399,6 +415,7 @@ 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
+      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /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."

From 4ec5bb207d4b323d3a0cab878cfb2e6dd1b8347a Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Thu, 2 Jul 2020 19:07:25 +0200
Subject: [PATCH 06/20] some testing

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

diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index e6dea9b..bab7f90 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -353,7 +353,7 @@ 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) ]
+  if [ "$objectsdbtype" != $(jq '.objects.type' /opt/iobroker/iobroker-data/iobroker.json | sed 's/\"//g') ]
   then
     echo "ENV IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation."
     echo "Setting type of objects db to \""$objectsdbtype"\"..."
@@ -363,7 +363,7 @@ then
   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) ]
+  if [ "$objectsdbhost" != $(jq '.objects.host' /opt/iobroker/iobroker-data/iobroker.json | sed 's/\"//g') ]
   then
     echo "ENV IOB_OBJECTSDB_HOST is set and value is different from detected ioBroker installation."
     echo "Setting host of objects db to \""$objectsdbhost"\"..."
@@ -373,11 +373,11 @@ then
   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) ]
+  if [ "$objectsdbport" != $(jq '.objects.port' /opt/iobroker/iobroker-data/iobroker.json | sed 's/\"//g') ]
   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
+      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
       chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
     echo "Done."
   else
@@ -390,7 +390,7 @@ 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) ]
+  if [ "$statesdbtype" != $(jq '.states.type' /opt/iobroker/iobroker-data/iobroker.json | sed 's/\"//g') ]
   then
     echo "ENV IOB_STATESDB_TYPE is set and value is different from detected ioBroker installation."
     echo "Setting type of states db to \""$statesdbtype"\"..."
@@ -400,7 +400,7 @@ then
   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) ]
+  if [ "$statesdbhost" != $(jq '.states.host' /opt/iobroker/iobroker-data/iobroker.json | sed 's/\"//g') ]
   then
     echo "ENV IOB_STATESDB_HOST is set and value is different from detected ioBroker installation."
     echo "Setting host of states db to \""$statesdbhost"\"..."
@@ -410,11 +410,11 @@ then
   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) ]
+  if [ "$statesdbport" != $(jq '.states.port' /opt/iobroker/iobroker-data/iobroker.json | sed 's/\"//g') ]
   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
+      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
       chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
     echo "Done."
   else

From a2961abf674794eaa1929b9f80c29753a1d5805a Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Thu, 2 Jul 2020 19:29:15 +0200
Subject: [PATCH 07/20] some testing

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

diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index bab7f90..869955d 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -353,7 +353,7 @@ 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 | sed 's/\"//g') ]
+  if [ "$objectsdbtype" != $(jq -r '.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"\"..."
@@ -363,7 +363,7 @@ then
   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 | sed 's/\"//g') ]
+  if [ "$objectsdbhost" != $(jq -r '.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"\"..."
@@ -373,7 +373,7 @@ then
   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 | sed 's/\"//g') ]
+  if [ "$objectsdbport" != $(jq -r '.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"\"..."
@@ -390,7 +390,7 @@ 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 | sed 's/\"//g') ]
+  if [ "$statesdbtype" != $(jq -r '.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"\"..."
@@ -400,7 +400,7 @@ then
   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 | sed 's/\"//g') ]
+  if [ "$statesdbhost" != $(jq -r '.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"\"..."
@@ -410,7 +410,7 @@ then
   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 | sed 's/\"//g') ]
+  if [ "$statesdbport" != $(jq -r '.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"\"..."

From f5f7e3f1ec28076a56522eda8f0bb6bbf3bbeaf9 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Mon, 27 Jul 2020 21:46:15 +0200
Subject: [PATCH 08/20] healthcheck testing

---
 amd64/Dockerfile                  | 12 ++++++++++--
 amd64/scripts/healthcheck.sh      | 15 +++++++++++++++
 amd64/scripts/iobroker_startup.sh | 29 ++++++++++++++++++++++++++---
 3 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 amd64/scripts/healthcheck.sh

diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 8ded5d9..8925653 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -50,10 +50,12 @@ COPY scripts/iobroker_startup.sh iobroker_startup.sh
 COPY scripts/setup_avahi.sh setup_avahi.sh
 COPY scripts/setup_packages.sh setup_packages.sh
 COPY scripts/setup_zwave.sh setup_zwave.sh
+COPY scripts/healthcheck.sh healthcheck.sh
 RUN chmod +x iobroker_startup.sh \
     && chmod +x setup_avahi.sh \
     && chmod +x setup_packages.sh \
-    && chmod +x setup_zwave.sh
+    && chmod +x setup_zwave.sh \
+    && chmod +x healthcheck.sh
 WORKDIR /opt/userscripts/
 COPY scripts/userscript_firststart_example.sh userscript_firststart_example.sh
 COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
@@ -62,7 +64,9 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
 WORKDIR /
 RUN apt-get update \
     && curl -sL https://iobroker.net/install.sh | bash - \
-    && echo $(hostname) > /opt/iobroker/.install_host \
+    && mkdir -p /opt/iobroker/.docker_config/ \
+    && echo $(hostname) > /opt/iobroker/.docker_config/.install_host \
+    && echo "starting" > /opt/iobroker/.docker_config/.healthcheck \
     && echo $(hostname) > /opt/.firstrun \
     && rm -rf /var/lib/apt/lists/*
 
@@ -89,5 +93,9 @@ ENV DEBIAN_FRONTEND="teletype" \
     SETUID=1000 \
     TZ="Europe/Berlin"
 
+# healthcheck
+HEALTHCHECK --interval=15s --timeout=5s --retries=5 \
+    CMD ["/bin/bash", "-c", "/opt/scripts/healthcheck.sh"]
+
 # Run startup-script
 ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/amd64/scripts/healthcheck.sh b/amd64/scripts/healthcheck.sh
new file mode 100644
index 0000000..a611b48
--- /dev/null
+++ b/amd64/scripts/healthcheck.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Script checks health of running container
+
+if [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "starting" ] || [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "maintenance" ]
+then
+  exit 0
+else
+  if [ "ps -fe|grep "[i]obroker.js-controller"|awk '{print $2}'" != "" ]
+  then
+    exit 0
+  fi
+fi
+
+exit 1
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 869955d..fff9550 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Setting healthcheck status to "starting"
+echo "starting" > /opt/iobroker/.docker_config/.healthcheck
+
 # Reading ENV
 adminport=$IOB_ADMINPORT
 avahi=$AVAHI
@@ -16,6 +19,23 @@ statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
+# Writing necessary ENVs to /opt/iobroker/.docker_config/container.config for using it in other scripts
+
+echo '# Simple config file to store ENVs' > /opt/iobroker/.docker_config/container.config
+echo ' ' >> /opt/iobroker/.docker_config/container.config
+if [ "$multihost" = "" ]
+then
+  echo "multihost=master" >> /opt/iobroker/.docker_config/container.config
+else
+  echo "multihost=$multihost" >> /opt/iobroker/.docker_config/container.config
+fi
+if [ "$adminport" = "" ]
+then
+  echo "adminport=8081" >> /opt/iobroker/.docker_config/container.config
+else
+  echo "adminport=$adminport" >> /opt/iobroker/.docker_config/container.config
+fi
+
 # Getting date and time for logging
 dati=`date '+%Y-%m-%d %H:%M:%S'`
 
@@ -173,12 +193,12 @@ echo "Done."
 echo ' '
 
 # Checking for first run of a new installation and renaming ioBroker
-if [ -f /opt/iobroker/.install_host ]
+if [ -f /opt/iobroker/.docker_config/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    bash iobroker host $(cat /opt/iobroker/.install_host)
-    rm -f /opt/iobroker/.install_host
+    bash iobroker host $(cat /opt/iobroker/.docker_config/.install_host)
+    rm -f /opt/iobroker/.docker_config/.install_host
   echo "Done."
   echo ' '
 elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
@@ -466,6 +486,9 @@ echo ' '
 echo "Starting ioBroker..."
 echo ' '
 
+# Setting healthcheck status to "running"
+echo "running" > /opt/iobroker/.docker_config/.healthcheck
+
 # Function for graceful shutdown by SIGTERM signal
 shut_down() {
   echo ' '

From a78610eb689bd00a72bb4075bc5bca49a52e6c63 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Mon, 27 Jul 2020 23:11:05 +0200
Subject: [PATCH 09/20] healthcheck testing

---
 amd64/scripts/healthcheck.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/amd64/scripts/healthcheck.sh b/amd64/scripts/healthcheck.sh
index a611b48..d54b7cc 100644
--- a/amd64/scripts/healthcheck.sh
+++ b/amd64/scripts/healthcheck.sh
@@ -2,14 +2,19 @@
 
 # Script checks health of running container
 
-if [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "starting" ] || [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "maintenance" ]
+if [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "starting" ]
 then
+  echo 'Health status: OK - Startup script is still running.'
+  exit 0
+elif [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "maintenance" ]
+then
+  echo 'Health status: OK - Container running in maintenance mode.'
+  exit 0
+elif [ "$(ps -fe|grep "[i]obroker.js-controller"|awk '{print $2}')" != "" ]
+then
+  echo 'Health status: OK - Main process (js-controller) is running.'
   exit 0
-else
-  if [ "ps -fe|grep "[i]obroker.js-controller"|awk '{print $2}'" != "" ]
-  then
-    exit 0
-  fi
 fi
 
+echo 'Health status: !!! NOT OK !!! - Something went wrong. Please see Container Logs for more details.'
 exit 1

From bc4fd8349feddf4b84a72ab64f715270374b8e8f Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Tue, 28 Jul 2020 09:58:19 +0200
Subject: [PATCH 10/20] testing

---
 amd64/scripts/iobroker_startup.sh |  9 +++++-
 amd64/scripts/maintenance-mode.sh | 49 +++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 amd64/scripts/maintenance-mode.sh

diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index fff9550..d437bf9 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -90,7 +90,7 @@ echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
 # 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 ]
+if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ] || [ -f /opt/.firstrun ]
 then
   if [ "$packages" != "" ]
   then
@@ -110,6 +110,13 @@ then
     echo "Done."
     echo ' '
   fi
+  if [ -f /opt/.firstrun ]
+  then
+    echo "Registering maintenance-mode script as command."
+    echo "alias maintenance-mode=\'/opt/scripts/maintenance-mode.sh\'" >> /root/.bashrc
+    echo "Done."
+    echo ' '
+  fi
 else
   echo "Nothing to do here."
   echo ' '
diff --git a/amd64/scripts/maintenance-mode.sh b/amd64/scripts/maintenance-mode.sh
new file mode 100644
index 0000000..a1a9d86
--- /dev/null
+++ b/amd64/scripts/maintenance-mode.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+if [ "$1" == "status" ]
+then
+  if [ "$cat /opt/iobroker/.docker_config/.healthcheck" == "maintenance" ]
+  then
+    echo 'Maintenance mode is ON.'
+    exit 0
+  elif [ "$cat /opt/iobroker/.docker_config/.healthcheck" != "maintenance" ]
+  then
+    echo 'Maintenance mode is OFF.'
+    exit 0
+  fi
+elif [ "$1" == "on" ]
+then
+  echo 'This will stop ioBroker and enable maintenance mode for this container.'
+  read -p 'Continue? Type yes or no: ' A
+  if [ "$A" == "y" ] || [ "$A" == "yes" ]
+  then
+    echo 'Enabling maintenance mode...'
+    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    echo 'Done.'
+    sleep 2
+    echo 'Stopping ioBroker...'
+    pkill -u iobroker
+    echo 'Done.'
+    exit 0
+  else
+    exit 0
+  fi
+elif [ "$1" == "off" ]
+then
+  echo 'Depending of the restart policy of this container, this will force it to stop (and restart) immediately.'
+  echo 'Maintenance mode will be disabled after the restart.'
+  read -p 'Continue? Type yes or no: ' A
+  if [ "$A" == "y" ] || [ "$A" == "yes" ]
+  then
+    echo "Disabling maintenance mode and forcing container to stop/ restart..."
+    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    pkill -u root
+    exit 0
+  else
+    exit 0
+  fi
+else
+  echo 'Invalid command. Please try again.'
+fi
+
+exit 0

From e6469a4255c2fe2bd5696094a664fecf37a7c318 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Tue, 28 Jul 2020 11:01:35 +0200
Subject: [PATCH 11/20] testing

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

diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 8925653..c956a1f 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -51,11 +51,13 @@ COPY scripts/setup_avahi.sh setup_avahi.sh
 COPY scripts/setup_packages.sh setup_packages.sh
 COPY scripts/setup_zwave.sh setup_zwave.sh
 COPY scripts/healthcheck.sh healthcheck.sh
+COPY scripts/maintenance-mode.sh maintenance-mode.sh
 RUN chmod +x iobroker_startup.sh \
     && chmod +x setup_avahi.sh \
     && chmod +x setup_packages.sh \
     && chmod +x setup_zwave.sh \
-    && chmod +x healthcheck.sh
+    && chmod +x healthcheck.sh \
+    && chmod +x maintenance-mode.sh
 WORKDIR /opt/userscripts/
 COPY scripts/userscript_firststart_example.sh userscript_firststart_example.sh
 COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
diff --git a/amd64/scripts/maintenance-mode.sh b/amd64/scripts/maintenance-mode.sh
index a1a9d86..b69ebcb 100644
--- a/amd64/scripts/maintenance-mode.sh
+++ b/amd64/scripts/maintenance-mode.sh
@@ -2,11 +2,11 @@
 
 if [ "$1" == "status" ]
 then
-  if [ "$cat /opt/iobroker/.docker_config/.healthcheck" == "maintenance" ]
+  if [ $(cat /opt/iobroker/.docker_config/.healthcheck) == 'maintenance' ]
   then
     echo 'Maintenance mode is ON.'
     exit 0
-  elif [ "$cat /opt/iobroker/.docker_config/.healthcheck" != "maintenance" ]
+  elif [ $(cat /opt/iobroker/.docker_config/.healthcheck) != 'maintenance' ]
   then
     echo 'Maintenance mode is OFF.'
     exit 0
@@ -35,7 +35,7 @@ then
   read -p 'Continue? Type yes or no: ' A
   if [ "$A" == "y" ] || [ "$A" == "yes" ]
   then
-    echo "Disabling maintenance mode and forcing container to stop/ restart..."
+    echo 'Disabling maintenance mode and forcing container to stop/ restart...'
     echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
     pkill -u root
     exit 0

From f836cd1fca93baacf58469e3c1240e9c3c176bf2 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Tue, 28 Jul 2020 19:25:44 +0200
Subject: [PATCH 12/20] testing and preparing beta

---
 README.md                                     | 29 +++++++++++++++----
 amd64/Dockerfile                              |  4 +--
 amd64/scripts/healthcheck.sh                  |  4 +--
 amd64/scripts/iobroker_startup.sh             |  5 ++--
 .../{maintenance-mode.sh => maintenance.sh}   | 21 +++++++-------
 5 files changed, 42 insertions(+), 21 deletions(-)
 rename amd64/scripts/{maintenance-mode.sh => maintenance.sh} (58%)

diff --git a/README.md b/README.md
index 87aac4e..fd5bfdd 100644
--- a/README.md
+++ b/README.md
@@ -126,6 +126,20 @@ To get familiar with that feature try the following: Create a Container, mount a
 
 Details will follow soon.
 
+### Healthcheck (beta)
+
+Since v5.0.2beta the image contains a simple Docker healthcheck. At the moment it only checks if js-controller is running inside the container and reports "healthy" or "unhealthy" to the Docker daemon. Further development is planned.
+
+Hint: As the Docker daemon itself gives no opportunity to automatically restart an unhealthy container you might want to setup some kind of "watchdog container" like this simple one: https://hub.docker.com/r/willfarrell/autoheal/ (works great so far!).
+
+### Maintenance script (beta)
+
+Within the implementation of the docker health check (above) some manual maintenance actions, like stopping ioBroker for upgrading js-controller, would cause the container to get "unhealthy" and may cause an external watchdog to automatically restart it.
+
+In this case you can use the new maintenance command line tool inside the container. By simply typing `maintenance on` it will activate some kind of "maintenance mode" and automatically stop ioBroker while the container stays healthy.
+
+After your maintenance is done just type `maintenance off`. Depending on the selected restart policy of your container the command will stop (and automatically restart) it.
+
 ## Best practices
 
 ### Avoid using "latest" tag
@@ -164,11 +178,16 @@ Thank you!
 
 ## Changelog
 
-### v5.0.1beta (2020-07-01)
-* fixing backup detection in startup script
-* fixing permission issue on iobroker restored
-* extended Logging
-* optimize multihost support
+### v5.0.2beta (2020-07-28)
+* extend readme.md doku
+* added maintenance script
+* added container healthcheck
+* fixed configuration procedure and logging for objects and states db setup
+* v5.0.1beta (2020-07-01)
+  * fixing backup detection in startup script
+  * fixing permission issue on iobroker restored
+  * extended Logging
+  * optimize multihost support
 
 ### v5.0.0 (2020-06-29)
 * v4.2.4beta (2020-06-23)
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index c956a1f..62a76c3 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -51,13 +51,13 @@ COPY scripts/setup_avahi.sh setup_avahi.sh
 COPY scripts/setup_packages.sh setup_packages.sh
 COPY scripts/setup_zwave.sh setup_zwave.sh
 COPY scripts/healthcheck.sh healthcheck.sh
-COPY scripts/maintenance-mode.sh maintenance-mode.sh
+COPY scripts/maintenance.sh maintenance.sh
 RUN chmod +x iobroker_startup.sh \
     && chmod +x setup_avahi.sh \
     && chmod +x setup_packages.sh \
     && chmod +x setup_zwave.sh \
     && chmod +x healthcheck.sh \
-    && chmod +x maintenance-mode.sh
+    && chmod +x maintenance.sh
 WORKDIR /opt/userscripts/
 COPY scripts/userscript_firststart_example.sh userscript_firststart_example.sh
 COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
diff --git a/amd64/scripts/healthcheck.sh b/amd64/scripts/healthcheck.sh
index d54b7cc..dd7253e 100644
--- a/amd64/scripts/healthcheck.sh
+++ b/amd64/scripts/healthcheck.sh
@@ -8,7 +8,7 @@ then
   exit 0
 elif [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "maintenance" ]
 then
-  echo 'Health status: OK - Container running in maintenance mode.'
+  echo 'Health status: OK - Container is running in maintenance mode.'
   exit 0
 elif [ "$(ps -fe|grep "[i]obroker.js-controller"|awk '{print $2}')" != "" ]
 then
@@ -16,5 +16,5 @@ then
   exit 0
 fi
 
-echo 'Health status: !!! NOT OK !!! - Something went wrong. Please see Container Logs for more details.'
+echo 'Health status: !!! NOT OK !!! - Something went wrong. Please see container logs for more details and/or try restarting the container.'
 exit 1
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index d437bf9..4344f02 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -112,8 +112,9 @@ then
   fi
   if [ -f /opt/.firstrun ]
   then
-    echo "Registering maintenance-mode script as command."
-    echo "alias maintenance-mode=\'/opt/scripts/maintenance-mode.sh\'" >> /root/.bashrc
+    echo "Registering maintenance script as command."
+    echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
+    rm -f /opt/.firstrun
     echo "Done."
     echo ' '
   fi
diff --git a/amd64/scripts/maintenance-mode.sh b/amd64/scripts/maintenance.sh
similarity index 58%
rename from amd64/scripts/maintenance-mode.sh
rename to amd64/scripts/maintenance.sh
index b69ebcb..0ece4a0 100644
--- a/amd64/scripts/maintenance-mode.sh
+++ b/amd64/scripts/maintenance.sh
@@ -13,16 +13,17 @@ then
   fi
 elif [ "$1" == "on" ]
 then
-  echo 'This will stop ioBroker and enable maintenance mode for this container.'
-  read -p 'Continue? Type yes or no: ' A
-  if [ "$A" == "y" ] || [ "$A" == "yes" ]
+  echo 'You are going to stop ioBroker and activating maintenance mode for this container.'
+  read -p 'Do you want to continue [yes/no]? ' A
+  if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
   then
-    echo 'Enabling maintenance mode...'
+    echo 'Activating maintenance mode...'
     echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    sleep 1
     echo 'Done.'
-    sleep 2
     echo 'Stopping ioBroker...'
     pkill -u iobroker
+    sleep 1
     echo 'Done.'
     exit 0
   else
@@ -30,12 +31,12 @@ then
   fi
 elif [ "$1" == "off" ]
 then
-  echo 'Depending of the restart policy of this container, this will force it to stop (and restart) immediately.'
-  echo 'Maintenance mode will be disabled after the restart.'
-  read -p 'Continue? Type yes or no: ' A
-  if [ "$A" == "y" ] || [ "$A" == "yes" ]
+  echo 'You are going to deactivate maintenance mode for this container.'
+  echo 'Depending of the restart policy of this container, this will stop/ restart your container immediately.'
+  read -p 'Do you want to continue [yes/no]? ' A
+  if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
   then
-    echo 'Disabling maintenance mode and forcing container to stop/ restart...'
+    echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
     echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
     pkill -u root
     exit 0

From e4c0c0294135752e5b0d469d6ad420b73b2069c5 Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Tue, 28 Jul 2020 23:46:30 +0200
Subject: [PATCH 13/20] preparing new beta

---
 .VERSION                                    |  2 +-
 LICENSE.md                                  |  2 +-
 README.md                                   | 46 +++++++++-------
 aarch64/Dockerfile                          | 14 ++++-
 aarch64/scripts/healthcheck.sh              | 20 +++++++
 aarch64/scripts/iobroker_startup.sh         | 60 ++++++++++++++++-----
 aarch64/scripts/maintenance.sh              | 50 +++++++++++++++++
 amd64/Dockerfile                            |  2 +-
 amd64/scripts/iobroker_startup.sh           |  7 ++-
 armv7hf/Dockerfile                          | 14 ++++-
 armv7hf/scripts/healthcheck.sh              | 20 +++++++
 armv7hf/scripts/iobroker_startup.sh         | 60 ++++++++++++++++-----
 armv7hf/scripts/maintenance.sh              | 50 +++++++++++++++++
 opt/maintenance-scripts/iobroker_restart.sh | 10 ----
 opt/maintenance-scripts/iobroker_stop.sh    |  9 ----
 15 files changed, 292 insertions(+), 74 deletions(-)
 create mode 100644 aarch64/scripts/healthcheck.sh
 create mode 100644 aarch64/scripts/maintenance.sh
 create mode 100644 armv7hf/scripts/healthcheck.sh
 create mode 100644 armv7hf/scripts/maintenance.sh
 delete mode 100644 opt/maintenance-scripts/iobroker_restart.sh
 delete mode 100644 opt/maintenance-scripts/iobroker_stop.sh

diff --git a/.VERSION b/.VERSION
index 94c2501..51afd4a 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v5.0.1beta
+v5.0.2beta
diff --git a/LICENSE.md b/LICENSE.md
index afe63aa..e1369e7 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Andre Germann
+Copyright (c) 2017 André Germann
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index fd5bfdd..dbe41ed 100644
--- a/README.md
+++ b/README.md
@@ -9,30 +9,33 @@
 [![License](https://img.shields.io/github/license/buanet/docker-iobroker)](https://github.com/buanet/docker-iobroker/blob/master/LICENSE.md)
 [![Donate](https://img.shields.io/badge/donate-paypal-blue)](https://paypal.me/buanet)
 
-IoBroker for Docker is a Docker image for ioBroker IoT platform (http://www.iobroker.net).
+IoBroker for Docker is a ready to use Docker image for ioBroker IoT platform (http://www.iobroker.net).
 
-It was originally created for a Synology Disk Station 1515+ with DSM 6 and official Docker package installed. After more than three years of development it might be the best documented and still maintained Docker image for running ioBroker IoT platform with Docker.
+It was originally created for a Synology Disk Station 1515+ with DSM 6 and official Docker package installed but should run on any other Linux based Docker host too.
+
+After more than three years of development it might be the best documented and still maintained Docker image for running ioBroker IoT platform with Docker.
 
 Since v4.0.0 the image is available for the following architectures: amd64, armv7hf, aarch64.<br>
 If you need more please let me know by opening a Github issue.
 
 ## Important notice
 
-Normally a new major version (e.g. v2, v4, v5) of the image comes with a new, preinstalled major node version!
+In general a new major version (e.g. v2, v4, v5) of the image comes with a new, preinstalled major node version!
 If you are updating an existing installation to a new major version (e.g. from v4 to v5) you have to perform some additional steps inside ioBroker! For more details please see official ioBroker documentation: [EN](https://www.iobroker.net/#en/documentation/install/updatenode.md) | [DE](https://www.iobroker.net/#de/documentation/install/updatenode.md).<br>
 
-You might avoid these procedure if you use my "Best practice" hint for "upgrading your ioBroker container".<br>
+You might avoid these procedure if you use my "Best practice" hint for "upgrading your ioBroker container".
 
 In any case make a backup first!
 
-By the way, a more comfortable way is to use "iobroker backup" to create a full backup of your existing installation and copy it into a empty folder which you will mount to /opt/iobroker when setting up a new container. The startup script will automatically detect the backup file and restore it to the new container. For more details see "Mounting folder/ volume" section of this readme.md file.
-
 ## Getting started
 
 A detailed tutorial (German, based on v3.0.0) can be found here: [https://buanet.de](https://buanet.de/2019/05/iobroker-unter-docker-auf-der-synology-diskstation-v3/). Please notice that the old tutorial is outdated and does no longer work!
 
-For discussion and support please visit [ioBroker forum thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) or use the comments section at the linked tutorial. Please do not contact me directly for any support-reasons. Every support question should be answered in a public place. Thanks in advance.
-If you think you found a bug or simply want to request a new feature please open an issue on Github.
+For discussion and support please visit [ioBroker forum thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) or use the comments section at the linked tutorial.
+
+Please do not contact me directly for any support-reasons. Every support question should be answered in a public place so every user can benefit from it . Thanks in advance.
+
+If you think you found a bug or simply want to request a new feature please open an issue on Github so we can talk about.
 
 The following ways to get iobroker-container running are only examples. Maybe you have to change, add or replace parameters to configure ioBroker for fitting your needs.
 
@@ -98,7 +101,9 @@ You do not have to declare every single variable when setting up your container.
 ### Mounting folder/ volume
 
 It is possible to mount an empty folder to /opt/iobroker during first startup of the container. The startup script 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 using "iobroker backup" command or backitup adapter. Please take care of the name of your backup file ending like this: "*_backupiobroker.tar.gz".
+
+Since v4.1.0 it is also possible mount a folder filled up with an iobroker backup file created using `iobroker backup` command or backitup adapter. The name of your backup file ending like this: `*_backupiobroker.tar.gz"`.
+
 The startup script will then detect this backup and restore it during the start of the container. Please see container logs when starting the container for more details!
 
 Note: It is absolutely recommended to use a mounted folder or persistent volume for /opt/iobroker folder!
@@ -112,24 +117,26 @@ But watch for the used node version. If the existing installation runs with anot
 
 If you want to use a USB device within ioBroker inside your container don´t forget to [mount the device](https://docs.docker.com/engine/reference/commandline/run/#add-host-device-to-container---device) on container startup and use the environment variable "USBDEVICES".
 
-### Userdefined startup scripts
+### User defined startup scripts
 
-In some cases it might 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.
+It is possible to add some script code to container startup with the help of the userscripts feature. You can get this to work by mounting an additional folder to `/opt/userscripts` into the container.
 
-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).
+When you mount an empty folder the startup script will restore two example scripts in there. To activate the scripts you have to remove the `_example` part of the name. The "userscript_firststart.sh" will execute only at the very first start of a new container, while the "userscript_everystart.sh" will execute on every container start.
 
-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.
+Feel free to test it with my example code. Take a look at the log. In "Step 4 of 5: Applying special settings" you will see the messages generated by the example userscripts.
 
-### Multihost
+### Multihost (beta)
 
-Details will follow soon.
+With the help of the ENV "IOB_MULTIHOST" and the ENVs for objects and states db connections (see ENVs table above) it is now possible to run a container as standalone, multihost master or multihost slave. This is more or less a feature for advanced users. Please make sure you know how ioBroker multihost is working and set the ENVs as with `ìobroker setup custom`.
+
+For general information about iobroker multihost feature please see [official ioBroker documentation](https://www.iobroker.net/docu/index-24.htm?page_id=3068&lang=de).
 
 ### Healthcheck (beta)
 
 Since v5.0.2beta the image contains a simple Docker healthcheck. At the moment it only checks if js-controller is running inside the container and reports "healthy" or "unhealthy" to the Docker daemon. Further development is planned.
 
+The healthcheck is configured to 5 retries in an 15s interval with a timeout of 5s. So a container needs a minimum of one minute to get unhealthy.   
+
 Hint: As the Docker daemon itself gives no opportunity to automatically restart an unhealthy container you might want to setup some kind of "watchdog container" like this simple one: https://hub.docker.com/r/willfarrell/autoheal/ (works great so far!).
 
 ### Maintenance script (beta)
@@ -138,14 +145,13 @@ Within the implementation of the docker health check (above) some manual mainten
 
 In this case you can use the new maintenance command line tool inside the container. By simply typing `maintenance on` it will activate some kind of "maintenance mode" and automatically stop ioBroker while the container stays healthy.
 
-After your maintenance is done just type `maintenance off`. Depending on the selected restart policy of your container the command will stop (and automatically restart) it.
+After your maintenance is done just type `maintenance off`. Depending on the selected restart policy of your container, the command will stop (and automatically restart) it.
 
 ## Best practices
 
 ### Avoid using "latest" tag
 
-To avoid conflicts when upgrading your container or getting in trouble when accidentally upgrading your container to a new major version I prefer using the version tag like "V4.2.0" instead of "latest" for creating your container. Just think about when I tell you it is not possible to download a new image version of a specific tag as long as a container depends on it.<br>
-By the way it also makes it more safe to keep your image up to date by using "watchtower" or something like that.
+To avoid conflicts when upgrading your container or getting in trouble when accidentally upgrading your container to a new major version I prefer using the version tag like "V4.2.0" instead of "latest" for creating your container.
 
 ### Upgrading your container
 
diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
index 383975d..0997914 100644
--- a/aarch64/Dockerfile
+++ b/aarch64/Dockerfile
@@ -50,10 +50,14 @@ COPY scripts/iobroker_startup.sh iobroker_startup.sh
 COPY scripts/setup_avahi.sh setup_avahi.sh
 COPY scripts/setup_packages.sh setup_packages.sh
 COPY scripts/setup_zwave.sh setup_zwave.sh
+COPY scripts/healthcheck.sh healthcheck.sh
+COPY scripts/maintenance.sh maintenance.sh
 RUN chmod +x iobroker_startup.sh \
     && chmod +x setup_avahi.sh \
     && chmod +x setup_packages.sh \
-    && chmod +x setup_zwave.sh
+    && chmod +x setup_zwave.sh \
+    && chmod +x healthcheck.sh \
+    && chmod +x maintenance.sh
 WORKDIR /opt/userscripts/
 COPY scripts/userscript_firststart_example.sh userscript_firststart_example.sh
 COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
@@ -62,7 +66,9 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
 WORKDIR /
 RUN apt-get update \
     && curl -sL https://iobroker.net/install.sh | bash - \
-    && echo $(hostname) > /opt/iobroker/.install_host \
+    && mkdir -p /opt/iobroker/.docker_config/ \
+    && echo $(hostname) > /opt/iobroker/.docker_config/.install_host \
+    && echo "starting" > /opt/iobroker/.docker_config/.healthcheck \
     && echo $(hostname) > /opt/.firstrun \
     && rm -rf /var/lib/apt/lists/*
 
@@ -89,5 +95,9 @@ ENV DEBIAN_FRONTEND="teletype" \
     SETUID=1000 \
     TZ="Europe/Berlin"
 
+# Healthcheck
+HEALTHCHECK --interval=15s --timeout=5s --retries=5 \
+    CMD ["/bin/bash", "-c", "/opt/scripts/healthcheck.sh"]
+
 # Run startup-script
 ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/aarch64/scripts/healthcheck.sh b/aarch64/scripts/healthcheck.sh
new file mode 100644
index 0000000..dd7253e
--- /dev/null
+++ b/aarch64/scripts/healthcheck.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Script checks health of running container
+
+if [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "starting" ]
+then
+  echo 'Health status: OK - Startup script is still running.'
+  exit 0
+elif [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "maintenance" ]
+then
+  echo 'Health status: OK - Container is running in maintenance mode.'
+  exit 0
+elif [ "$(ps -fe|grep "[i]obroker.js-controller"|awk '{print $2}')" != "" ]
+then
+  echo 'Health status: OK - Main process (js-controller) is running.'
+  exit 0
+fi
+
+echo 'Health status: !!! NOT OK !!! - Something went wrong. Please see container logs for more details and/or try restarting the container.'
+exit 1
diff --git a/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh
index e6dea9b..03e852b 100644
--- a/aarch64/scripts/iobroker_startup.sh
+++ b/aarch64/scripts/iobroker_startup.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Setting healthcheck status to "starting"
+echo "starting" > /opt/iobroker/.docker_config/.healthcheck
+
 # Reading ENV
 adminport=$IOB_ADMINPORT
 avahi=$AVAHI
@@ -16,6 +19,23 @@ statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
+# Writing necessary ENVs to /opt/iobroker/.docker_config/container.config for using it in other scripts
+
+echo '# Simple config file to store ENVs' > /opt/iobroker/.docker_config/container.config
+echo ' ' >> /opt/iobroker/.docker_config/container.config
+if [ "$multihost" = "" ]
+then
+  echo "multihost=master" >> /opt/iobroker/.docker_config/container.config
+else
+  echo "multihost=$multihost" >> /opt/iobroker/.docker_config/container.config
+fi
+if [ "$adminport" = "" ]
+then
+  echo "adminport=8081" >> /opt/iobroker/.docker_config/container.config
+else
+  echo "adminport=$adminport" >> /opt/iobroker/.docker_config/container.config
+fi
+
 # Getting date and time for logging
 dati=`date '+%Y-%m-%d %H:%M:%S'`
 
@@ -70,7 +90,7 @@ echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
 # 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 ]
+if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ] || [ -f /opt/.firstrun ]
 then
   if [ "$packages" != "" ]
   then
@@ -90,6 +110,13 @@ then
     echo "Done."
     echo ' '
   fi
+  if [ -f /opt/.firstrun ]
+  then
+    echo "Registering maintenance script as command."
+    echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
+    echo "Done."
+    echo ' '
+  fi
 else
   echo "Nothing to do here."
   echo ' '
@@ -173,12 +200,12 @@ echo "Done."
 echo ' '
 
 # Checking for first run of a new installation and renaming ioBroker
-if [ -f /opt/iobroker/.install_host ]
+if [ -f /opt/iobroker/.docker_config/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    bash iobroker host $(cat /opt/iobroker/.install_host)
-    rm -f /opt/iobroker/.install_host
+    bash iobroker host $(cat /opt/iobroker/.docker_config/.install_host)
+    rm -f /opt/iobroker/.docker_config/.install_host
   echo "Done."
   echo ' '
 elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
@@ -353,7 +380,7 @@ 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) ]
+  if [ "$objectsdbtype" != $(jq -r '.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"\"..."
@@ -363,7 +390,7 @@ then
   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) ]
+  if [ "$objectsdbhost" != $(jq -r '.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"\"..."
@@ -373,11 +400,11 @@ then
   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) ]
+  if [ "$objectsdbport" != $(jq -r '.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
+      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
       chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
     echo "Done."
   else
@@ -390,7 +417,7 @@ 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) ]
+  if [ "$statesdbtype" != $(jq -r '.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"\"..."
@@ -400,7 +427,7 @@ then
   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) ]
+  if [ "$statesdbhost" != $(jq -r '.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"\"..."
@@ -410,11 +437,11 @@ then
   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) ]
+  if [ "$statesdbport" != $(jq -r '.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
+      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
       chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
     echo "Done."
   else
@@ -441,7 +468,6 @@ then
     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
@@ -455,6 +481,11 @@ then
   fi
 fi
 
+# Removing first run marker when exists
+if [ -f /opt/.firstrun ]
+then
+rm -f /opt/.firstrun
+fi
 
 #####
 # Starting ioBroker
@@ -466,6 +497,9 @@ echo ' '
 echo "Starting ioBroker..."
 echo ' '
 
+# Setting healthcheck status to "running"
+echo "running" > /opt/iobroker/.docker_config/.healthcheck
+
 # Function for graceful shutdown by SIGTERM signal
 shut_down() {
   echo ' '
diff --git a/aarch64/scripts/maintenance.sh b/aarch64/scripts/maintenance.sh
new file mode 100644
index 0000000..0ece4a0
--- /dev/null
+++ b/aarch64/scripts/maintenance.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+if [ "$1" == "status" ]
+then
+  if [ $(cat /opt/iobroker/.docker_config/.healthcheck) == 'maintenance' ]
+  then
+    echo 'Maintenance mode is ON.'
+    exit 0
+  elif [ $(cat /opt/iobroker/.docker_config/.healthcheck) != 'maintenance' ]
+  then
+    echo 'Maintenance mode is OFF.'
+    exit 0
+  fi
+elif [ "$1" == "on" ]
+then
+  echo 'You are going to stop ioBroker and activating maintenance mode for this container.'
+  read -p 'Do you want to continue [yes/no]? ' A
+  if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
+  then
+    echo 'Activating maintenance mode...'
+    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    sleep 1
+    echo 'Done.'
+    echo 'Stopping ioBroker...'
+    pkill -u iobroker
+    sleep 1
+    echo 'Done.'
+    exit 0
+  else
+    exit 0
+  fi
+elif [ "$1" == "off" ]
+then
+  echo 'You are going to deactivate maintenance mode for this container.'
+  echo 'Depending of the restart policy of this container, this will stop/ restart your container immediately.'
+  read -p 'Do you want to continue [yes/no]? ' A
+  if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
+  then
+    echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
+    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    pkill -u root
+    exit 0
+  else
+    exit 0
+  fi
+else
+  echo 'Invalid command. Please try again.'
+fi
+
+exit 0
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 62a76c3..0c0e5ee 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -95,7 +95,7 @@ ENV DEBIAN_FRONTEND="teletype" \
     SETUID=1000 \
     TZ="Europe/Berlin"
 
-# healthcheck
+# Healthcheck
 HEALTHCHECK --interval=15s --timeout=5s --retries=5 \
     CMD ["/bin/bash", "-c", "/opt/scripts/healthcheck.sh"]
 
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 4344f02..03e852b 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -114,7 +114,6 @@ then
   then
     echo "Registering maintenance script as command."
     echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
-    rm -f /opt/.firstrun
     echo "Done."
     echo ' '
   fi
@@ -469,7 +468,6 @@ then
     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
@@ -483,6 +481,11 @@ then
   fi
 fi
 
+# Removing first run marker when exists
+if [ -f /opt/.firstrun ]
+then
+rm -f /opt/.firstrun
+fi
 
 #####
 # Starting ioBroker
diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index bbf2285..a24ebd0 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -50,10 +50,14 @@ COPY scripts/iobroker_startup.sh iobroker_startup.sh
 COPY scripts/setup_avahi.sh setup_avahi.sh
 COPY scripts/setup_packages.sh setup_packages.sh
 COPY scripts/setup_zwave.sh setup_zwave.sh
+COPY scripts/healthcheck.sh healthcheck.sh
+COPY scripts/maintenance.sh maintenance.sh
 RUN chmod +x iobroker_startup.sh \
     && chmod +x setup_avahi.sh \
     && chmod +x setup_packages.sh \
-    && chmod +x setup_zwave.sh
+    && chmod +x setup_zwave.sh \
+    && chmod +x healthcheck.sh \
+    && chmod +x maintenance.sh
 WORKDIR /opt/userscripts/
 COPY scripts/userscript_firststart_example.sh userscript_firststart_example.sh
 COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
@@ -62,7 +66,9 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
 WORKDIR /
 RUN apt-get update \
     && curl -sL https://iobroker.net/install.sh | bash - \
-    && echo $(hostname) > /opt/iobroker/.install_host \
+    && mkdir -p /opt/iobroker/.docker_config/ \
+    && echo $(hostname) > /opt/iobroker/.docker_config/.install_host \
+    && echo "starting" > /opt/iobroker/.docker_config/.healthcheck \
     && echo $(hostname) > /opt/.firstrun \
     && rm -rf /var/lib/apt/lists/*
 
@@ -89,5 +95,9 @@ ENV DEBIAN_FRONTEND="teletype" \
     SETUID=1000 \
     TZ="Europe/Berlin"
 
+# Healthcheck
+HEALTHCHECK --interval=15s --timeout=5s --retries=5 \
+    CMD ["/bin/bash", "-c", "/opt/scripts/healthcheck.sh"]
+
 # Run startup-script
 ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/armv7hf/scripts/healthcheck.sh b/armv7hf/scripts/healthcheck.sh
new file mode 100644
index 0000000..dd7253e
--- /dev/null
+++ b/armv7hf/scripts/healthcheck.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Script checks health of running container
+
+if [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "starting" ]
+then
+  echo 'Health status: OK - Startup script is still running.'
+  exit 0
+elif [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "maintenance" ]
+then
+  echo 'Health status: OK - Container is running in maintenance mode.'
+  exit 0
+elif [ "$(ps -fe|grep "[i]obroker.js-controller"|awk '{print $2}')" != "" ]
+then
+  echo 'Health status: OK - Main process (js-controller) is running.'
+  exit 0
+fi
+
+echo 'Health status: !!! NOT OK !!! - Something went wrong. Please see container logs for more details and/or try restarting the container.'
+exit 1
diff --git a/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh
index e6dea9b..03e852b 100644
--- a/armv7hf/scripts/iobroker_startup.sh
+++ b/armv7hf/scripts/iobroker_startup.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Setting healthcheck status to "starting"
+echo "starting" > /opt/iobroker/.docker_config/.healthcheck
+
 # Reading ENV
 adminport=$IOB_ADMINPORT
 avahi=$AVAHI
@@ -16,6 +19,23 @@ statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
+# Writing necessary ENVs to /opt/iobroker/.docker_config/container.config for using it in other scripts
+
+echo '# Simple config file to store ENVs' > /opt/iobroker/.docker_config/container.config
+echo ' ' >> /opt/iobroker/.docker_config/container.config
+if [ "$multihost" = "" ]
+then
+  echo "multihost=master" >> /opt/iobroker/.docker_config/container.config
+else
+  echo "multihost=$multihost" >> /opt/iobroker/.docker_config/container.config
+fi
+if [ "$adminport" = "" ]
+then
+  echo "adminport=8081" >> /opt/iobroker/.docker_config/container.config
+else
+  echo "adminport=$adminport" >> /opt/iobroker/.docker_config/container.config
+fi
+
 # Getting date and time for logging
 dati=`date '+%Y-%m-%d %H:%M:%S'`
 
@@ -70,7 +90,7 @@ echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
 # 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 ]
+if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ] || [ -f /opt/.firstrun ]
 then
   if [ "$packages" != "" ]
   then
@@ -90,6 +110,13 @@ then
     echo "Done."
     echo ' '
   fi
+  if [ -f /opt/.firstrun ]
+  then
+    echo "Registering maintenance script as command."
+    echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
+    echo "Done."
+    echo ' '
+  fi
 else
   echo "Nothing to do here."
   echo ' '
@@ -173,12 +200,12 @@ echo "Done."
 echo ' '
 
 # Checking for first run of a new installation and renaming ioBroker
-if [ -f /opt/iobroker/.install_host ]
+if [ -f /opt/iobroker/.docker_config/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    bash iobroker host $(cat /opt/iobroker/.install_host)
-    rm -f /opt/iobroker/.install_host
+    bash iobroker host $(cat /opt/iobroker/.docker_config/.install_host)
+    rm -f /opt/iobroker/.docker_config/.install_host
   echo "Done."
   echo ' '
 elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
@@ -353,7 +380,7 @@ 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) ]
+  if [ "$objectsdbtype" != $(jq -r '.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"\"..."
@@ -363,7 +390,7 @@ then
   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) ]
+  if [ "$objectsdbhost" != $(jq -r '.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"\"..."
@@ -373,11 +400,11 @@ then
   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) ]
+  if [ "$objectsdbport" != $(jq -r '.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
+      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
       chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
     echo "Done."
   else
@@ -390,7 +417,7 @@ 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) ]
+  if [ "$statesdbtype" != $(jq -r '.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"\"..."
@@ -400,7 +427,7 @@ then
   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) ]
+  if [ "$statesdbhost" != $(jq -r '.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"\"..."
@@ -410,11 +437,11 @@ then
   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) ]
+  if [ "$statesdbport" != $(jq -r '.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
+      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
       chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
     echo "Done."
   else
@@ -441,7 +468,6 @@ then
     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
@@ -455,6 +481,11 @@ then
   fi
 fi
 
+# Removing first run marker when exists
+if [ -f /opt/.firstrun ]
+then
+rm -f /opt/.firstrun
+fi
 
 #####
 # Starting ioBroker
@@ -466,6 +497,9 @@ echo ' '
 echo "Starting ioBroker..."
 echo ' '
 
+# Setting healthcheck status to "running"
+echo "running" > /opt/iobroker/.docker_config/.healthcheck
+
 # Function for graceful shutdown by SIGTERM signal
 shut_down() {
   echo ' '
diff --git a/armv7hf/scripts/maintenance.sh b/armv7hf/scripts/maintenance.sh
new file mode 100644
index 0000000..0ece4a0
--- /dev/null
+++ b/armv7hf/scripts/maintenance.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+if [ "$1" == "status" ]
+then
+  if [ $(cat /opt/iobroker/.docker_config/.healthcheck) == 'maintenance' ]
+  then
+    echo 'Maintenance mode is ON.'
+    exit 0
+  elif [ $(cat /opt/iobroker/.docker_config/.healthcheck) != 'maintenance' ]
+  then
+    echo 'Maintenance mode is OFF.'
+    exit 0
+  fi
+elif [ "$1" == "on" ]
+then
+  echo 'You are going to stop ioBroker and activating maintenance mode for this container.'
+  read -p 'Do you want to continue [yes/no]? ' A
+  if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
+  then
+    echo 'Activating maintenance mode...'
+    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    sleep 1
+    echo 'Done.'
+    echo 'Stopping ioBroker...'
+    pkill -u iobroker
+    sleep 1
+    echo 'Done.'
+    exit 0
+  else
+    exit 0
+  fi
+elif [ "$1" == "off" ]
+then
+  echo 'You are going to deactivate maintenance mode for this container.'
+  echo 'Depending of the restart policy of this container, this will stop/ restart your container immediately.'
+  read -p 'Do you want to continue [yes/no]? ' A
+  if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
+  then
+    echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
+    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    pkill -u root
+    exit 0
+  else
+    exit 0
+  fi
+else
+  echo 'Invalid command. Please try again.'
+fi
+
+exit 0
diff --git a/opt/maintenance-scripts/iobroker_restart.sh b/opt/maintenance-scripts/iobroker_restart.sh
deleted file mode 100644
index c7e0dde..0000000
--- a/opt/maintenance-scripts/iobroker_restart.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Einfaches Script zum Stoppen von ioBroker.
-# Kann zum Beispiel aus ioBroker heraus aufgerufen werden um ioBroker neu zu starten.
-
-cd /opt/iobroker
-pkill io
-sleep 5
-gosu iobroker node node_modules/iobroker.js-controller/controller.js
-exit 0
diff --git a/opt/maintenance-scripts/iobroker_stop.sh b/opt/maintenance-scripts/iobroker_stop.sh
deleted file mode 100644
index cab7fb3..0000000
--- a/opt/maintenance-scripts/iobroker_stop.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Einfaches Script zum Stoppen von ioBroker.
-# Kann zum Beispiel aus ioBroker heraus aufgerufen werden um ioBroker zu stoppen.
-
-cd /opt/iobroker
-pkill io
-
-exit 0

From 8fc65e05df896102681c8cc4303ddf4f1ba8d9c4 Mon Sep 17 00:00:00 2001
From: andre <>
Date: Wed, 29 Jul 2020 22:20:45 +0200
Subject: [PATCH 14/20] directory changes

---
 aarch64/Dockerfile                  |  6 +++---
 aarch64/scripts/healthcheck.sh      |  4 ++--
 aarch64/scripts/iobroker_startup.sh | 24 ++++++++++++------------
 aarch64/scripts/maintenance.sh      |  8 ++++----
 amd64/Dockerfile                    |  6 +++---
 amd64/scripts/healthcheck.sh        |  4 ++--
 amd64/scripts/iobroker_startup.sh   | 24 ++++++++++++------------
 amd64/scripts/maintenance.sh        |  8 ++++----
 armv7hf/Dockerfile                  |  6 +++---
 armv7hf/scripts/healthcheck.sh      |  4 ++--
 armv7hf/scripts/iobroker_startup.sh | 24 ++++++++++++------------
 armv7hf/scripts/maintenance.sh      |  8 ++++----
 12 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
index 0997914..fbe6c1c 100644
--- a/aarch64/Dockerfile
+++ b/aarch64/Dockerfile
@@ -66,9 +66,9 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
 WORKDIR /
 RUN apt-get update \
     && curl -sL https://iobroker.net/install.sh | bash - \
-    && mkdir -p /opt/iobroker/.docker_config/ \
-    && echo $(hostname) > /opt/iobroker/.docker_config/.install_host \
-    && echo "starting" > /opt/iobroker/.docker_config/.healthcheck \
+    && mkdir -p /opt/scripts/.docker_config/ \
+    && echo $(hostname) > /opt/scripts/.docker_config/.install_host \
+    && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
     && echo $(hostname) > /opt/.firstrun \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/aarch64/scripts/healthcheck.sh b/aarch64/scripts/healthcheck.sh
index dd7253e..072f9c0 100644
--- a/aarch64/scripts/healthcheck.sh
+++ b/aarch64/scripts/healthcheck.sh
@@ -2,11 +2,11 @@
 
 # Script checks health of running container
 
-if [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "starting" ]
+if [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "starting" ]
 then
   echo 'Health status: OK - Startup script is still running.'
   exit 0
-elif [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "maintenance" ]
+elif [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "maintenance" ]
 then
   echo 'Health status: OK - Container is running in maintenance mode.'
   exit 0
diff --git a/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh
index 03e852b..c4bdf08 100644
--- a/aarch64/scripts/iobroker_startup.sh
+++ b/aarch64/scripts/iobroker_startup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Setting healthcheck status to "starting"
-echo "starting" > /opt/iobroker/.docker_config/.healthcheck
+echo "starting" > /opt/scripts/.docker_config/.healthcheck
 
 # Reading ENV
 adminport=$IOB_ADMINPORT
@@ -19,21 +19,21 @@ statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
-# Writing necessary ENVs to /opt/iobroker/.docker_config/container.config for using it in other scripts
+# Writing necessary ENVs to /opt/scripts/.docker_config/container.config for using it in other scripts
 
-echo '# Simple config file to store ENVs' > /opt/iobroker/.docker_config/container.config
-echo ' ' >> /opt/iobroker/.docker_config/container.config
+echo '# Simple config file to store ENVs' > /opt/scripts/.docker_config/container.config
+echo ' ' >> /opt/scripts/.docker_config/container.config
 if [ "$multihost" = "" ]
 then
-  echo "multihost=master" >> /opt/iobroker/.docker_config/container.config
+  echo "multihost=master" >> /opt/scripts/.docker_config/container.config
 else
-  echo "multihost=$multihost" >> /opt/iobroker/.docker_config/container.config
+  echo "multihost=$multihost" >> /opt/scripts/.docker_config/container.config
 fi
 if [ "$adminport" = "" ]
 then
-  echo "adminport=8081" >> /opt/iobroker/.docker_config/container.config
+  echo "adminport=8081" >> /opt/scripts/.docker_config/container.config
 else
-  echo "adminport=$adminport" >> /opt/iobroker/.docker_config/container.config
+  echo "adminport=$adminport" >> /opt/scripts/.docker_config/container.config
 fi
 
 # Getting date and time for logging
@@ -200,12 +200,12 @@ echo "Done."
 echo ' '
 
 # Checking for first run of a new installation and renaming ioBroker
-if [ -f /opt/iobroker/.docker_config/.install_host ]
+if [ -f /opt/scripts/.docker_config/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    bash iobroker host $(cat /opt/iobroker/.docker_config/.install_host)
-    rm -f /opt/iobroker/.docker_config/.install_host
+    bash iobroker host $(cat /opt/scripts/.docker_config/.install_host)
+    rm -f /opt/scripts/.docker_config/.install_host
   echo "Done."
   echo ' '
 elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
@@ -498,7 +498,7 @@ echo "Starting ioBroker..."
 echo ' '
 
 # Setting healthcheck status to "running"
-echo "running" > /opt/iobroker/.docker_config/.healthcheck
+echo "running" > /opt/scripts/.docker_config/.healthcheck
 
 # Function for graceful shutdown by SIGTERM signal
 shut_down() {
diff --git a/aarch64/scripts/maintenance.sh b/aarch64/scripts/maintenance.sh
index 0ece4a0..4f77980 100644
--- a/aarch64/scripts/maintenance.sh
+++ b/aarch64/scripts/maintenance.sh
@@ -2,11 +2,11 @@
 
 if [ "$1" == "status" ]
 then
-  if [ $(cat /opt/iobroker/.docker_config/.healthcheck) == 'maintenance' ]
+  if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ]
   then
     echo 'Maintenance mode is ON.'
     exit 0
-  elif [ $(cat /opt/iobroker/.docker_config/.healthcheck) != 'maintenance' ]
+  elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ]
   then
     echo 'Maintenance mode is OFF.'
     exit 0
@@ -18,7 +18,7 @@ then
   if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
   then
     echo 'Activating maintenance mode...'
-    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
     sleep 1
     echo 'Done.'
     echo 'Stopping ioBroker...'
@@ -37,7 +37,7 @@ then
   if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
   then
     echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
-    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
     pkill -u root
     exit 0
   else
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 0c0e5ee..c32b42b 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -66,9 +66,9 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
 WORKDIR /
 RUN apt-get update \
     && curl -sL https://iobroker.net/install.sh | bash - \
-    && mkdir -p /opt/iobroker/.docker_config/ \
-    && echo $(hostname) > /opt/iobroker/.docker_config/.install_host \
-    && echo "starting" > /opt/iobroker/.docker_config/.healthcheck \
+    && mkdir -p /opt/scripts/.docker_config/ \
+    && echo $(hostname) > /opt/scripts/.docker_config/.install_host \
+    && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
     && echo $(hostname) > /opt/.firstrun \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/amd64/scripts/healthcheck.sh b/amd64/scripts/healthcheck.sh
index dd7253e..072f9c0 100644
--- a/amd64/scripts/healthcheck.sh
+++ b/amd64/scripts/healthcheck.sh
@@ -2,11 +2,11 @@
 
 # Script checks health of running container
 
-if [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "starting" ]
+if [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "starting" ]
 then
   echo 'Health status: OK - Startup script is still running.'
   exit 0
-elif [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "maintenance" ]
+elif [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "maintenance" ]
 then
   echo 'Health status: OK - Container is running in maintenance mode.'
   exit 0
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 03e852b..c4bdf08 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Setting healthcheck status to "starting"
-echo "starting" > /opt/iobroker/.docker_config/.healthcheck
+echo "starting" > /opt/scripts/.docker_config/.healthcheck
 
 # Reading ENV
 adminport=$IOB_ADMINPORT
@@ -19,21 +19,21 @@ statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
-# Writing necessary ENVs to /opt/iobroker/.docker_config/container.config for using it in other scripts
+# Writing necessary ENVs to /opt/scripts/.docker_config/container.config for using it in other scripts
 
-echo '# Simple config file to store ENVs' > /opt/iobroker/.docker_config/container.config
-echo ' ' >> /opt/iobroker/.docker_config/container.config
+echo '# Simple config file to store ENVs' > /opt/scripts/.docker_config/container.config
+echo ' ' >> /opt/scripts/.docker_config/container.config
 if [ "$multihost" = "" ]
 then
-  echo "multihost=master" >> /opt/iobroker/.docker_config/container.config
+  echo "multihost=master" >> /opt/scripts/.docker_config/container.config
 else
-  echo "multihost=$multihost" >> /opt/iobroker/.docker_config/container.config
+  echo "multihost=$multihost" >> /opt/scripts/.docker_config/container.config
 fi
 if [ "$adminport" = "" ]
 then
-  echo "adminport=8081" >> /opt/iobroker/.docker_config/container.config
+  echo "adminport=8081" >> /opt/scripts/.docker_config/container.config
 else
-  echo "adminport=$adminport" >> /opt/iobroker/.docker_config/container.config
+  echo "adminport=$adminport" >> /opt/scripts/.docker_config/container.config
 fi
 
 # Getting date and time for logging
@@ -200,12 +200,12 @@ echo "Done."
 echo ' '
 
 # Checking for first run of a new installation and renaming ioBroker
-if [ -f /opt/iobroker/.docker_config/.install_host ]
+if [ -f /opt/scripts/.docker_config/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    bash iobroker host $(cat /opt/iobroker/.docker_config/.install_host)
-    rm -f /opt/iobroker/.docker_config/.install_host
+    bash iobroker host $(cat /opt/scripts/.docker_config/.install_host)
+    rm -f /opt/scripts/.docker_config/.install_host
   echo "Done."
   echo ' '
 elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
@@ -498,7 +498,7 @@ echo "Starting ioBroker..."
 echo ' '
 
 # Setting healthcheck status to "running"
-echo "running" > /opt/iobroker/.docker_config/.healthcheck
+echo "running" > /opt/scripts/.docker_config/.healthcheck
 
 # Function for graceful shutdown by SIGTERM signal
 shut_down() {
diff --git a/amd64/scripts/maintenance.sh b/amd64/scripts/maintenance.sh
index 0ece4a0..4f77980 100644
--- a/amd64/scripts/maintenance.sh
+++ b/amd64/scripts/maintenance.sh
@@ -2,11 +2,11 @@
 
 if [ "$1" == "status" ]
 then
-  if [ $(cat /opt/iobroker/.docker_config/.healthcheck) == 'maintenance' ]
+  if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ]
   then
     echo 'Maintenance mode is ON.'
     exit 0
-  elif [ $(cat /opt/iobroker/.docker_config/.healthcheck) != 'maintenance' ]
+  elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ]
   then
     echo 'Maintenance mode is OFF.'
     exit 0
@@ -18,7 +18,7 @@ then
   if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
   then
     echo 'Activating maintenance mode...'
-    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
     sleep 1
     echo 'Done.'
     echo 'Stopping ioBroker...'
@@ -37,7 +37,7 @@ then
   if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
   then
     echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
-    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
     pkill -u root
     exit 0
   else
diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index a24ebd0..3f8a35d 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -66,9 +66,9 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
 WORKDIR /
 RUN apt-get update \
     && curl -sL https://iobroker.net/install.sh | bash - \
-    && mkdir -p /opt/iobroker/.docker_config/ \
-    && echo $(hostname) > /opt/iobroker/.docker_config/.install_host \
-    && echo "starting" > /opt/iobroker/.docker_config/.healthcheck \
+    && mkdir -p /opt/scripts/.docker_config/ \
+    && echo $(hostname) > /opt/scripts/.docker_config/.install_host \
+    && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
     && echo $(hostname) > /opt/.firstrun \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/armv7hf/scripts/healthcheck.sh b/armv7hf/scripts/healthcheck.sh
index dd7253e..072f9c0 100644
--- a/armv7hf/scripts/healthcheck.sh
+++ b/armv7hf/scripts/healthcheck.sh
@@ -2,11 +2,11 @@
 
 # Script checks health of running container
 
-if [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "starting" ]
+if [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "starting" ]
 then
   echo 'Health status: OK - Startup script is still running.'
   exit 0
-elif [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "maintenance" ]
+elif [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "maintenance" ]
 then
   echo 'Health status: OK - Container is running in maintenance mode.'
   exit 0
diff --git a/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh
index 03e852b..c4bdf08 100644
--- a/armv7hf/scripts/iobroker_startup.sh
+++ b/armv7hf/scripts/iobroker_startup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Setting healthcheck status to "starting"
-echo "starting" > /opt/iobroker/.docker_config/.healthcheck
+echo "starting" > /opt/scripts/.docker_config/.healthcheck
 
 # Reading ENV
 adminport=$IOB_ADMINPORT
@@ -19,21 +19,21 @@ statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
-# Writing necessary ENVs to /opt/iobroker/.docker_config/container.config for using it in other scripts
+# Writing necessary ENVs to /opt/scripts/.docker_config/container.config for using it in other scripts
 
-echo '# Simple config file to store ENVs' > /opt/iobroker/.docker_config/container.config
-echo ' ' >> /opt/iobroker/.docker_config/container.config
+echo '# Simple config file to store ENVs' > /opt/scripts/.docker_config/container.config
+echo ' ' >> /opt/scripts/.docker_config/container.config
 if [ "$multihost" = "" ]
 then
-  echo "multihost=master" >> /opt/iobroker/.docker_config/container.config
+  echo "multihost=master" >> /opt/scripts/.docker_config/container.config
 else
-  echo "multihost=$multihost" >> /opt/iobroker/.docker_config/container.config
+  echo "multihost=$multihost" >> /opt/scripts/.docker_config/container.config
 fi
 if [ "$adminport" = "" ]
 then
-  echo "adminport=8081" >> /opt/iobroker/.docker_config/container.config
+  echo "adminport=8081" >> /opt/scripts/.docker_config/container.config
 else
-  echo "adminport=$adminport" >> /opt/iobroker/.docker_config/container.config
+  echo "adminport=$adminport" >> /opt/scripts/.docker_config/container.config
 fi
 
 # Getting date and time for logging
@@ -200,12 +200,12 @@ echo "Done."
 echo ' '
 
 # Checking for first run of a new installation and renaming ioBroker
-if [ -f /opt/iobroker/.docker_config/.install_host ]
+if [ -f /opt/scripts/.docker_config/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    bash iobroker host $(cat /opt/iobroker/.docker_config/.install_host)
-    rm -f /opt/iobroker/.docker_config/.install_host
+    bash iobroker host $(cat /opt/scripts/.docker_config/.install_host)
+    rm -f /opt/scripts/.docker_config/.install_host
   echo "Done."
   echo ' '
 elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
@@ -498,7 +498,7 @@ echo "Starting ioBroker..."
 echo ' '
 
 # Setting healthcheck status to "running"
-echo "running" > /opt/iobroker/.docker_config/.healthcheck
+echo "running" > /opt/scripts/.docker_config/.healthcheck
 
 # Function for graceful shutdown by SIGTERM signal
 shut_down() {
diff --git a/armv7hf/scripts/maintenance.sh b/armv7hf/scripts/maintenance.sh
index 0ece4a0..4f77980 100644
--- a/armv7hf/scripts/maintenance.sh
+++ b/armv7hf/scripts/maintenance.sh
@@ -2,11 +2,11 @@
 
 if [ "$1" == "status" ]
 then
-  if [ $(cat /opt/iobroker/.docker_config/.healthcheck) == 'maintenance' ]
+  if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ]
   then
     echo 'Maintenance mode is ON.'
     exit 0
-  elif [ $(cat /opt/iobroker/.docker_config/.healthcheck) != 'maintenance' ]
+  elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ]
   then
     echo 'Maintenance mode is OFF.'
     exit 0
@@ -18,7 +18,7 @@ then
   if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
   then
     echo 'Activating maintenance mode...'
-    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
     sleep 1
     echo 'Done.'
     echo 'Stopping ioBroker...'
@@ -37,7 +37,7 @@ then
   if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
   then
     echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
-    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
     pkill -u root
     exit 0
   else

From 3c8c6fcd2286001edb052adc68451a07c1186599 Mon Sep 17 00:00:00 2001
From: andre <>
Date: Wed, 29 Jul 2020 23:26:07 +0200
Subject: [PATCH 15/20] removing not needed lines

---
 aarch64/scripts/iobroker_startup.sh | 17 -----------------
 amd64/scripts/iobroker_startup.sh   | 18 ------------------
 armv7hf/scripts/iobroker_startup.sh | 17 -----------------
 3 files changed, 52 deletions(-)

diff --git a/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh
index c4bdf08..f9d281f 100644
--- a/aarch64/scripts/iobroker_startup.sh
+++ b/aarch64/scripts/iobroker_startup.sh
@@ -19,23 +19,6 @@ statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
-# Writing necessary ENVs to /opt/scripts/.docker_config/container.config for using it in other scripts
-
-echo '# Simple config file to store ENVs' > /opt/scripts/.docker_config/container.config
-echo ' ' >> /opt/scripts/.docker_config/container.config
-if [ "$multihost" = "" ]
-then
-  echo "multihost=master" >> /opt/scripts/.docker_config/container.config
-else
-  echo "multihost=$multihost" >> /opt/scripts/.docker_config/container.config
-fi
-if [ "$adminport" = "" ]
-then
-  echo "adminport=8081" >> /opt/scripts/.docker_config/container.config
-else
-  echo "adminport=$adminport" >> /opt/scripts/.docker_config/container.config
-fi
-
 # Getting date and time for logging
 dati=`date '+%Y-%m-%d %H:%M:%S'`
 
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index c4bdf08..8520220 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -19,23 +19,6 @@ statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
-# Writing necessary ENVs to /opt/scripts/.docker_config/container.config for using it in other scripts
-
-echo '# Simple config file to store ENVs' > /opt/scripts/.docker_config/container.config
-echo ' ' >> /opt/scripts/.docker_config/container.config
-if [ "$multihost" = "" ]
-then
-  echo "multihost=master" >> /opt/scripts/.docker_config/container.config
-else
-  echo "multihost=$multihost" >> /opt/scripts/.docker_config/container.config
-fi
-if [ "$adminport" = "" ]
-then
-  echo "adminport=8081" >> /opt/scripts/.docker_config/container.config
-else
-  echo "adminport=$adminport" >> /opt/scripts/.docker_config/container.config
-fi
-
 # Getting date and time for logging
 dati=`date '+%Y-%m-%d %H:%M:%S'`
 
@@ -80,7 +63,6 @@ if [ "$zwave" != "" ]; then echo -n "-----               " && echo -n "$(printf
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-
 #####
 # STEP 1 - Preparing container
 #####
diff --git a/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh
index c4bdf08..f9d281f 100644
--- a/armv7hf/scripts/iobroker_startup.sh
+++ b/armv7hf/scripts/iobroker_startup.sh
@@ -19,23 +19,6 @@ statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
-# Writing necessary ENVs to /opt/scripts/.docker_config/container.config for using it in other scripts
-
-echo '# Simple config file to store ENVs' > /opt/scripts/.docker_config/container.config
-echo ' ' >> /opt/scripts/.docker_config/container.config
-if [ "$multihost" = "" ]
-then
-  echo "multihost=master" >> /opt/scripts/.docker_config/container.config
-else
-  echo "multihost=$multihost" >> /opt/scripts/.docker_config/container.config
-fi
-if [ "$adminport" = "" ]
-then
-  echo "adminport=8081" >> /opt/scripts/.docker_config/container.config
-else
-  echo "adminport=$adminport" >> /opt/scripts/.docker_config/container.config
-fi
-
 # Getting date and time for logging
 dati=`date '+%Y-%m-%d %H:%M:%S'`
 

From 1ab6945c0d2d815043343d02f976d3b9a210f5ea Mon Sep 17 00:00:00 2001
From: buanet <andre@buanet.de>
Date: Sun, 9 Aug 2020 23:02:02 +0200
Subject: [PATCH 16/20] small fix for installation detection

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

diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 8520220..452b28d 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -124,6 +124,7 @@ then
 elif [ -f /opt/iobroker/iobroker ]
 then
   echo "Existing installation of ioBroker detected in /opt/iobroker."
+    rm -f /opt/scripts/.docker_config/.install_host
 elif [ $(ls *_backupiobroker.tar.gz 2> /dev/null | wc -l) != "0" ] && [ $(tar -ztvf /opt/iobroker/*_backupiobroker.tar.gz "backup/backup.json" 2> /dev/null | wc -l) != "0" ]
 then
   if [ "$multihost" = "slave" ]

From c30b441a57da66f3d177881f0715b224a797ffbe Mon Sep 17 00:00:00 2001
From: buanet <info@buanet.de>
Date: Fri, 16 Oct 2020 19:11:24 +0200
Subject: [PATCH 17/20] added hint for env "IOB_OBJECTSDB_TYPE"

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

diff --git a/README.md b/README.md
index dbe41ed..58c644a 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ You do not have to declare every single variable when setting up your container.
 |IOB_MULTIHOST|[not set]|Sets ioBroker instance as "master" or "slave" for multihost support (needs additional config for objectsdb and statesdb!)|
 |IOB_OBJECTSDB_HOST|127.0.0.1|Sets host 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_OBJECTSDB_TYPE|file|Sets type of ioBroker objects db, cloud be "file", "redis" or "couch"<br>(at the moment redis as objects db is [not supported by ioBroker](https://github.com/ioBroker/ioBroker#databases))|
 |IOB_STATESDB_HOST|127.0.0.1|Sets host 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"|

From abca929f806c6f56680a0da23da9e54415454c85 Mon Sep 17 00:00:00 2001
From: buanet <info@buanet.de>
Date: Tue, 27 Oct 2020 19:50:55 +0100
Subject: [PATCH 18/20] fixing permission error during restore

---
 amd64/scripts/iobroker_startup.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 452b28d..ff23abd 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -134,11 +134,14 @@ then
     echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
     exit 1
   else
-    echo "IoBroker backup file detected in /opt/iobroker. Restoring ioBroker..."
+    echo "IoBroker backup file detected in /opt/iobroker. Preparing restore..."
       mv /opt/iobroker/*.tar.gz /opt/
       tar -xf /opt/initial_iobroker.tar -C /
       mkdir /opt/iobroker/backups
       mv /opt/*.tar.gz /opt/iobroker/backups/
+      chown -R $setuid:$setgid /opt/iobroker                        # fixes permission error during restore
+    echo "Done."
+    echo "Restoring ioBroker..."
       iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
     echo "Done."
     echo ' '

From a1436e08d3f4b826e6ac30acdf79747bc8877465 Mon Sep 17 00:00:00 2001
From: buanet <info@buanet.de>
Date: Thu, 5 Nov 2020 21:00:19 +0100
Subject: [PATCH 19/20] added major version latest docker tag, preparing ne
 stable

---
 .VERSION    |  2 +-
 .travis.yml |  7 +++++++
 README.md   | 36 +++++++++++++++++++++---------------
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/.VERSION b/.VERSION
index 51afd4a..6b7ace3 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v5.0.2beta
+v5.1.0
diff --git a/.travis.yml b/.travis.yml
index 2d8e913..c9e103f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ env:
   - secure: "iqK7JBsQiYceKOvRkmSa6okzXn3BygEPZjffby4agaVCwIt2SYLAcBOisOoKDpyAX+DUWlHz3gITImVa+uIna6Ue7k4C2AGJVDr87G6iq57Tn6yjrfhPs/TW9/CWvKg/G4uvKEnycMiLDXdcctSMwRr3ZwzJEdeEdmNZVsd2LP/5U0I/2K2Io22tNciSKhqlSaIfhK4f6Jk7xffnQFjwy+P9qPN18oI1fDyeHx6ZWyN3YhQQ4eGyxHjxZjlhCxSvu5R4DMf1jFIoLRAr6G5jrQacn0pG8PtBVLoYT4RsPy+fwUtXmnWWjeXK0IrU1njZf/DUteI9xnaDcHzZYj+d7MeSUc6BuWOyx9lO3ZwBWDNycYsKaF5so4RpdzoY/gfJMlK3uWDbADb46dWzPD5gb3pEROKau3fBDHS5eaR5e1Bxzz6FGoYWYfsQHqpg9g7v4BRFq+Jh0+v47fdyMxgK/Nm4+r7+ht77Usu29+X6X8F4iwrBJ/ix5xIf7iMoH/ZGvq6BEKi/1t9zdXMugcWOqwlYx9k6J9bQhBfw8YucLmgl3ynzrPaLlPEpY9cnb7hcOUDZoHI7KK2zF/y3yfNr2BqlRbm39HFWfnwuJPO5VLYGs5QubeVj9u1M+5Qo4erPuQBBc4mHP4eF2PmRA+wiVWki0z+U2skFQppkCfrbH8c="
   - secure: "iqoZUcWgZueNQrNldF/ugwyU1LR5E+doTfjY0exQqAKjntG5n2QqYZ/+dX1gqvkfy1kuMINTBWfqSALbhfTTK7EfUjqmcnaks4CMVZQkhH/FyCOYHqSBSSN7j4XeHt1sXn1FRiSpyrZOUoOuyqoBRe3JoWhdQZAGxNzX3sJllwnKa6M0D6D2l9tUyTWO/jxhgTIoYBSrXvb68ZsCU9jlNBJbylfvEFwuSlwvfa+Mz9vAeCTuza9XDnvcxgwVq3r+YGxfmAhK9fOAvN+lPN+KA0LcIzBaW0sh24voqjfh/pLpsl03zeGNdWzS9r2qYPCP0N3asb5P6CVEbbAGYO1T5PvU78ILXGi4+/x/32O6/I9oXpMVQCFHNn0Gn/8BPRHY4ZOYI9ItnhV9Ncp7hhAWAAqf3KC5GM89l9R5KxFY3bhN/p8nuGresUDU5d57YkaV8rOhPpr0dbAyKFtuzG0+bT1N2ekXyTyMHeAGKiGwfD9bAS4qx6asFO5uw6UriBHNzJ59Cy3GT+W1CctaEuvqJlc6Iqz2KaBozEqnNFcpE2Grny4bzr5fp+b1qCO9TE2LhHU/LR5FTLjQ2wf9/raTM6yboq+guKeXxpySa2w8ABDq0OUAw4mrKqJQJohzBkl3oYTpWUG2JGEyMAJxjkmH0/3GwZESPNLaaYVjQByTDDY="
   - VERSION="$(cat .VERSION)"
+  - MAJORVERSION="$(cat .version | cut -c 1-2 | sed -r 's#^(.{0})#\1latest-#')"
 
 before_install:
   - wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool
@@ -78,12 +79,18 @@ after_success:
       #manifest for image: buanet/iobroker:latest
       cat manifest.yaml | sed "s/\$DOCKERTAG/latest/g" > manifestlatest.yaml
 
+      #manifest for image: buanet/iobroker:latest-majorversion
+      cat manifest.yaml | sed "s/\$DOCKERTAG/${MAJORVERSION}/g" > manifestmajorversion.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
+
+      mv manifestmajorversion.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
diff --git a/README.md b/README.md
index 58c644a..6ce3663 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ In any case make a backup first!
 
 ## Getting started
 
-A detailed tutorial (German, based on v3.0.0) can be found here: [https://buanet.de](https://buanet.de/2019/05/iobroker-unter-docker-auf-der-synology-diskstation-v3/). Please notice that the old tutorial is outdated and does no longer work!
+A detailed tutorial (German, based on v3.0.0) can be found here: [https://smarthome.buanet.de](https://smarthome.buanet.de/2019/05/iobroker-unter-docker-auf-der-synology-diskstation-v3/). Please notice that the old tutorial is outdated and does no longer work!
 
 For discussion and support please visit [ioBroker forum thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) or use the comments section at the linked tutorial.
 
@@ -102,7 +102,7 @@ You do not have to declare every single variable when setting up your container.
 
 It is possible to mount an empty folder to /opt/iobroker during first startup of the container. The startup script 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 using `iobroker backup` command or backitup adapter. The name of your backup file ending like this: `*_backupiobroker.tar.gz"`.
+Since v4.1.0 it is also possible mount a folder filled up with an iobroker backup file created using `iobroker backup` command or backitup adapter. Please make sure the name of your backup file ends like this: `*_backupiobroker.tar.gz"`.
 
 The startup script will then detect this backup and restore it during the start of the container. Please see container logs when starting the container for more details!
 
@@ -125,19 +125,21 @@ When you mount an empty folder the startup script will restore two example scrip
 
 Feel free to test it with my example code. Take a look at the log. In "Step 4 of 5: Applying special settings" you will see the messages generated by the example userscripts.
 
-### Multihost (beta)
+### Multihost
 
 With the help of the ENV "IOB_MULTIHOST" and the ENVs for objects and states db connections (see ENVs table above) it is now possible to run a container as standalone, multihost master or multihost slave. This is more or less a feature for advanced users. Please make sure you know how ioBroker multihost is working and set the ENVs as with `ìobroker setup custom`.
 
+There is no need for executing `iobroker multihost enable` or `iobroker multihost connect` inside the container. Just configure the mentioned ENVs. The startup script will do all the magic.
+
 For general information about iobroker multihost feature please see [official ioBroker documentation](https://www.iobroker.net/docu/index-24.htm?page_id=3068&lang=de).
 
-### Healthcheck (beta)
+### Healthcheck
 
-Since v5.0.2beta the image contains a simple Docker healthcheck. At the moment it only checks if js-controller is running inside the container and reports "healthy" or "unhealthy" to the Docker daemon. Further development is planned.
+Since v5.1.0 the image contains a simple Docker healthcheck. At the moment it only checks if js-controller is running inside the container and reports "healthy" or "unhealthy" to the Docker daemon. Further development is planned.
 
 The healthcheck is configured to 5 retries in an 15s interval with a timeout of 5s. So a container needs a minimum of one minute to get unhealthy.   
 
-Hint: As the Docker daemon itself gives no opportunity to automatically restart an unhealthy container you might want to setup some kind of "watchdog container" like this simple one: https://hub.docker.com/r/willfarrell/autoheal/ (works great so far!).
+Hint: As the Docker daemon itself gives no opportunity to automatically restart an unhealthy container you might want to setup some kind of "watchdog container" like this simple one: https://github.com/buanet/docker-watchdog.
 
 ### Maintenance script (beta)
 
@@ -149,9 +151,11 @@ After your maintenance is done just type `maintenance off`. Depending on the sel
 
 ## Best practices
 
-### Avoid using "latest" tag
+### Avoid using "latest" docker tag
 
-To avoid conflicts when upgrading your container or getting in trouble when accidentally upgrading your container to a new major version I prefer using the version tag like "V4.2.0" instead of "latest" for creating your container.
+To avoid conflicts when upgrading your container or getting in trouble when accidentally upgrading your container to a new major version I prefer using a version docker tag like "v4.2.0" instead of "latest" for creating your container.
+
+With v5.1.0 an additional docker tag "latest-[major version]" is available. This gives you the possibility update your container automatically while always staying in the same major version.
 
 ### Upgrading your container
 
@@ -162,7 +166,7 @@ If you want to upgrade your ioBroker container to a new major version (e.g. from
 * create a new container as your old or as you need it and use the new data folder/ volume for the /opt/iobroker mount point
 * follow the log output of the container and be patient
 
-After this the startup script inside the container will automatically detect and restore your backup to a new ioBroker instance. When iobroker is started after the restore it will install your adapters to the new ioBroker instance by itself. This might take some time but will get you the best and cleanest results...
+After this steps the startup script inside the container will automatically detect and restore your backup to a new ioBroker instance. When iobroker is started after the restore it will install your adapters to the new ioBroker instance by itself. This might take some time but will give you the best and cleanest results...
 
 ## Miscellaneous
 
@@ -172,7 +176,7 @@ If you want to get the newest features and changes feel free to use/ test the be
 
 ### 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.
+If you want the newest updates about the image and my tutorials at https://smarthome.buanet.de 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
@@ -184,11 +188,13 @@ Thank you!
 
 ## Changelog
 
-### v5.0.2beta (2020-07-28)
-* extend readme.md doku
-* added maintenance script
-* added container healthcheck
-* fixed configuration procedure and logging for objects and states db setup
+### v5.1.0 (2020-11-05)
+* v5.0.2beta (2020-07-28)
+  * added docker tag for majorversion latest
+  * extend readme.md doku
+  * added maintenance script
+  * added container healthcheck
+  * fixed configuration procedure and logging for objects and states db setup
 * v5.0.1beta (2020-07-01)
   * fixing backup detection in startup script
   * fixing permission issue on iobroker restored

From e12da80fceb8ee605c13873c9221f39e262fff29 Mon Sep 17 00:00:00 2001
From: buanet <info@buanet.de>
Date: Thu, 5 Nov 2020 21:21:17 +0100
Subject: [PATCH 20/20] prepare new stable

---
 aarch64/scripts/iobroker_startup.sh | 7 +++++--
 armv7hf/scripts/iobroker_startup.sh | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh
index f9d281f..ff23abd 100644
--- a/aarch64/scripts/iobroker_startup.sh
+++ b/aarch64/scripts/iobroker_startup.sh
@@ -63,7 +63,6 @@ if [ "$zwave" != "" ]; then echo -n "-----               " && echo -n "$(printf
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-
 #####
 # STEP 1 - Preparing container
 #####
@@ -125,6 +124,7 @@ then
 elif [ -f /opt/iobroker/iobroker ]
 then
   echo "Existing installation of ioBroker detected in /opt/iobroker."
+    rm -f /opt/scripts/.docker_config/.install_host
 elif [ $(ls *_backupiobroker.tar.gz 2> /dev/null | wc -l) != "0" ] && [ $(tar -ztvf /opt/iobroker/*_backupiobroker.tar.gz "backup/backup.json" 2> /dev/null | wc -l) != "0" ]
 then
   if [ "$multihost" = "slave" ]
@@ -134,11 +134,14 @@ then
     echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
     exit 1
   else
-    echo "IoBroker backup file detected in /opt/iobroker. Restoring ioBroker..."
+    echo "IoBroker backup file detected in /opt/iobroker. Preparing restore..."
       mv /opt/iobroker/*.tar.gz /opt/
       tar -xf /opt/initial_iobroker.tar -C /
       mkdir /opt/iobroker/backups
       mv /opt/*.tar.gz /opt/iobroker/backups/
+      chown -R $setuid:$setgid /opt/iobroker                        # fixes permission error during restore
+    echo "Done."
+    echo "Restoring ioBroker..."
       iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
     echo "Done."
     echo ' '
diff --git a/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh
index f9d281f..ff23abd 100644
--- a/armv7hf/scripts/iobroker_startup.sh
+++ b/armv7hf/scripts/iobroker_startup.sh
@@ -63,7 +63,6 @@ if [ "$zwave" != "" ]; then echo -n "-----               " && echo -n "$(printf
 echo "$(printf -- '-%.0s' {1..60})"
 echo ' '
 
-
 #####
 # STEP 1 - Preparing container
 #####
@@ -125,6 +124,7 @@ then
 elif [ -f /opt/iobroker/iobroker ]
 then
   echo "Existing installation of ioBroker detected in /opt/iobroker."
+    rm -f /opt/scripts/.docker_config/.install_host
 elif [ $(ls *_backupiobroker.tar.gz 2> /dev/null | wc -l) != "0" ] && [ $(tar -ztvf /opt/iobroker/*_backupiobroker.tar.gz "backup/backup.json" 2> /dev/null | wc -l) != "0" ]
 then
   if [ "$multihost" = "slave" ]
@@ -134,11 +134,14 @@ then
     echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
     exit 1
   else
-    echo "IoBroker backup file detected in /opt/iobroker. Restoring ioBroker..."
+    echo "IoBroker backup file detected in /opt/iobroker. Preparing restore..."
       mv /opt/iobroker/*.tar.gz /opt/
       tar -xf /opt/initial_iobroker.tar -C /
       mkdir /opt/iobroker/backups
       mv /opt/*.tar.gz /opt/iobroker/backups/
+      chown -R $setuid:$setgid /opt/iobroker                        # fixes permission error during restore
+    echo "Done."
+    echo "Restoring ioBroker..."
       iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
     echo "Done."
     echo ' '