Merge pull request #117 from buanet/beta

Preparing V5.0.0 release

.VERSION

@@ -1 +1 @@
-v4.2.0
+v5.0.0

README.md

@@ -1,31 +1,40 @@
 # ioBroker for Docker
 
-[![Build Status](https://travis-ci.org/buanet/docker-iobroker.svg?branch=master)](https://travis-ci.org/buanet/docker-iobroker)
+[![Release](https://img.shields.io/github/v/release/buanet/docker-iobroker)](https://github.com/buanet/docker-iobroker/releases)
+[![Build Status](https://travis-ci.org/buanet/docker-iobroker.svg?branch=master)](https://travis-ci.org/buanet/docker-iobroker)<br>
+[![Image Size](https://img.shields.io/docker/image-size/buanet/iobroker)](https://hub.docker.com/repository/docker/buanet/iobroker)
+[![Docker Pulls](https://img.shields.io/docker/pulls/buanet/iobroker)](https://hub.docker.com/repository/docker/buanet/iobroker)
+[![Docker Stars](https://img.shields.io/docker/stars/buanet/iobroker)](https://hub.docker.com/repository/docker/buanet/iobroker)<br>
+[![Source](https://img.shields.io/badge/source-github-blue)](https://github.com/buanet/docker-iobroker)
+[![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)
 
-Source: https://github.com/buanet/docker-iobroker
+IoBroker for Docker is a Docker image for ioBroker IoT platform (http://www.iobroker.net).
 
-IoBroker for Docker is an Dockerimage 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 is originally made for and always tested on a Synology Disk Station 1515+ with DSM 6 and official Docker package installed. But it also works on other systems with Docker installed!
-
-Version 4 now supports running the Image in Docker on the following architectures: amd64, armv7hf, aarch64.
-Feel free to ask for more architectures by opening an github issue.
+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
 
-The new v4 comes again with a new major node version (node10)!
-If you are updating an existing installation you have to perform some additional steps inside ioBroker!
-After upgrading your iobroker container you have to call "npm rebuild" or "reinstall.sh" (when js-controller > v1.5 "reinstall.js") for recompileing your installation for the use with node10!
-For more details please see official ioBroker documentation: [EN](https://www.iobroker.net/#en/documentation/install/updatenode.md) | [DE](https://www.iobroker.net/#de/documentation/install/updatenode.md).
-Make backup first!
+Normally 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>
+
+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!
+A detailed tutorial (German, based on v3.0.0) can be found here: [https://buanet.de](https://buanet.de/2019/05/iobroker-unter-docker-auf-der-synology-diskstation-v3/). Please notice that the old tutorial is outdated and does no longer work!
 
-For discussion and support please visit [ioBroker forum thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) or use the comments section at the linked tutorial. Please do not contact me directly for any support-reasons. Every support question should be answered in a public place. Thank you.
+For discussion and support please visit [ioBroker forum thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) or use the comments section at the linked tutorial. Please do not contact me directly for any support-reasons. Every support question should be answered in a public place. Thanks in advance.
+If you think you found a bug or simply want to request a new feature please open an issue on Github.
 
-The following ways to geht iobroker-container running are only examples. Maybe you have to change, add or replace parameters to configure ioBroker for your environment.
+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.
 
 ### Running from command line
 
@@ -61,7 +70,7 @@ The following will give a short overview.
 ### Environment variables
 
 To configure the ioBroker container on startup it is possible to set some environment variables.
-You do not have to declare every single variable when stting up your container. Variables you do not set will come up with their default value.
+You do not have to declare every single variable when setting up your container. Variables you do not set will come up with their default value.
 
 **Important: In v4.2.0 the ENVs "ADMINPORT" and "REDIS" were renamed/ reorganized. For Details see the following table!**
 
@@ -69,6 +78,7 @@ You do not have to declare every single variable when stting up your container.
 |---|---|---|
 |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_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"|
@@ -87,24 +97,24 @@ You do not have to declare every single variable when stting up your container.
 
 ### Mounting folder/ volume
 
-It is possible to mount an empty folder to /opt/iobroker during first startup of the container. The Startupscript will check this folder and restore content if it is empty.
-Since v4.1.0 it is also possible mount a folder filled up with an iobroker backup file (created with backitup adapter) named like this: "iobroker_2020_01_06-01_09_10_backupiobroker.tar.gz".
-The startup script will detect this backup and restore it during the start of the container. Plese see container logs when starting the container for more details!
+It is 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!
 
 Note: It is absolutely recommended to use a mounted folder or persistent volume for /opt/iobroker folder!
 
 You can also mount a folder containing an existing ioBroker-installation (e.g. when moving an existing installation to docker).
-But watch for the used node version. If the existing installation runs with another major version of node you have do perform additional steps. For more Details see the "Important notice" on top.
+But watch for the used node version. If the existing installation runs with another major version of node you have do perform additional steps. For more Details see the "Important notice" on top of this readme.md file.
 
 **Important: If the folder you mount to /opt/iobroker in your container is placed on a mounted device, partition or other storage, the mountpoint on your host should NOT have the "noexec" flag activated. Otherwise you may get problems executing ioBroker inside the container!**   
 
-### Permission fixer
+### Mounting USB device
 
-After some issues with permissions related to the use of a dedicated user for ioBroker, I added some code for fixing permissions on container startup. This might take a few minutes on first startup. Please take a look at the container logs and be patient!
+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 (advanced setting/ beta status)
+### Userdefined startup scripts
 
-In some cases it migth be helpful to add some script code to the startup script of the container. This is now possible by mounting an additional folder to the container and place a userscript in there.
+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.
 
 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).
@@ -112,22 +122,62 @@ Basically there are two different scripts which will be read and called by the s
 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.
 
+### Multihost
+
+Details will follow soon.
+
+## 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.
+
+### Upgrading your container
+
+If you want to upgrade your ioBroker container to a new major version (e.g. from v4 to v5) I would prefer to do that by creating a backup in ioBroker (by "iobroker backup" or backitup adapter) and restoring it to a completely new container. All you need is time an the following steps:
+* make a backup by command line ("iobroker backup") or backitup adapter
+* stop the old container
+* create a new and empty data folder or volume and place your backup file in it
+* 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...
+
 ## Miscellaneous
 
+### Beta testing
+
+If you want to get the newest features and changes feel free to use/ test the beta version of the Docker image. You can find the readme.md file for beta versions [here](https://github.com/buanet/docker-iobroker/blob/beta/README.md). Please make sure to read the changelog before testing beta versions.
+
 ### 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://buanet.de/tutorials you can simply subscribe to my new "news and updates" channel (only in German) on Telegram.
 You will find the channel here: https://t.me/buanet_tutorials
 
 ### Support the project
 
-The easiest way to support this project is to leave me some likes/ stars on github and docker hub!<br>
+The easiest way to support this project is to leave me some likes/ stars on Github and Docker hub!<br>
 If you want to give something back, feel free to take a look into the [open issues](https://github.com/buanet/docker-iobroker/issues) or the [ioBroker forum thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) and helping me answering questions, fixing bugs or adding new features!<br>
 And if you want to buy me a beer instead, you can do this here: <a href="https://www.paypal.me/buanet" target="_blank"><img src="https://buanet.de/wp-content/uploads/2017/08/pp128.png" height="20" width="20"></a><br>
 Thank you!
 
 ## Changelog
 
+### v5.0.0 (2020-06-29)
+* v4.2.4beta (2020-06-23)
+  * added graceful shutdown
+  * small fix for GID/UID handling
+  * adding new ENV "IOB_MULTIHOST" for multihost support
+  * small syntax fixes in iobroker_startup.sh
+* v4.2.3beta (2020-06-05)
+  * ~~updating js-controller to not stable version 3.1.5 to fix renaming issue~~ (is stable now)
+* v4.2.2beta (2020-06-03)
+  * ~~workaround for renaming issues on startup~~ (fixed in js-controller)
+* v4.2.1beta (2020-05-10)
+  * using node 12 instead of 10
+  * updated documentation in readme.md
+
 ### v4.2.0 (2020-04-14)
 * v4.1.4beta (2020-04-07)
   * switching base image to buster
@@ -179,7 +229,7 @@ Thank you!
 ### v3.0.0 (2019-05-09)
 * v2.0.6beta (2019-04-14)
   * added some additional logging
-  * fixing some issues for languag env
+  * fixing some issues for language env
   * added permission fixing on first start
 * v2.0.5beta (2019-02-09)
   * added ENV to docker file
@@ -195,7 +245,7 @@ Thank you!
   * optimizing logging output
   * optimizing scripts
 * v2.0.2beta (2019-01-23)
-  * optimizing and rearraged dockerfile
+  * optimizing and rearranged docker file
   * changes for new ioBroker install script
   * added restoring for empty mounted /opt/iobroker folder
   * some more small fixes
@@ -230,7 +280,7 @@ Thank you!
 
 ### v1.0.0 (2017-08-22)
 * moved and renamed iobroker startup script
-* disabled iobroker deamon to (hopefully) fix restart issue
+* disabled iobroker daemon to (hopefully) fix restart issue
 * added some maintenance scripts
 
 ### v0.2.1 (2017-08-16)

aarch64/Dockerfile

@@ -30,8 +30,8 @@ RUN apt-get update && apt-get install -y \
     wget \
     && rm -rf /var/lib/apt/lists/*
 
-# Install node10
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash \
+# Install node
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash \
     && apt-get update && apt-get install -y nodejs \
     && rm -rf /var/lib/apt/lists/*
 
@@ -61,7 +61,7 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
 # Install ioBroker
 WORKDIR /
 RUN apt-get update \
-    && curl -sL https://raw.githubusercontent.com/ioBroker/ioBroker/stable-installer/installer.sh | bash - \
+    && curl -sL https://iobroker.net/install.sh | bash - \
     && echo $(hostname) > /opt/iobroker/.install_host \
     && echo $(hostname) > /opt/.firstrun \
     && rm -rf /var/lib/apt/lists/*
@@ -76,14 +76,15 @@ RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
 
 # Setting up iobroker-user (shell and home directory)
 RUN chsh -s /bin/bash iobroker \
-    && usermod --home /opt/iobroker iobroker
+    && usermod --home /opt/iobroker iobroker \
+    && usermod -u 1000 iobroker \
+    && groupmod -g 1000 iobroker
 
 # Setting up ENVs
 ENV DEBIAN_FRONTEND="teletype" \
     LANG="de_DE.UTF-8" \
     LANGUAGE="de_DE:de" \
     LC_ALL="de_DE.UTF-8" \
-    PACKAGES="vi" \
     SETGID=1000 \
     SETUID=1000 \
     TZ="Europe/Berlin"

aarch64/scripts/iobroker_startup.sh

@@ -3,6 +3,7 @@
 # Reading ENV
 adminport=$IOB_ADMINPORT
 avahi=$AVAHI
+multihost=$IOB_MULTIHOST
 objectsdbhost=$IOB_OBJECTSDB_HOST
 objectsdbport=$IOB_OBJECTSDB_PORT
 objectsdbtype=$IOB_OBJECTSDB_TYPE
@@ -90,6 +91,7 @@ then
   fi
 else
   echo "Nothing to do here."
+  echo ' '
 fi
 
 # Change directory for next steps
@@ -168,14 +170,14 @@ then
   echo "Hostname needs to be updated to " $(hostname)"..."
     bash iobroker host $(cat /opt/iobroker/.install_host)
     rm -f /opt/iobroker/.install_host
-  echo 'Done.'
+  echo "Done."
   echo ' '
 elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
 then
   echo "Hostname in ioBroker does not match the hostname of this container."
   echo "Updating hostname to " $(hostname)"..."
     bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
-  echo 'Done.'
+  echo "Done."
   echo ' '
 fi
 
@@ -201,7 +203,7 @@ then
     echo "Adminport set by ENV does not match port configured in ioBroker installation."
     echo "Setting Adminport to \""$adminport"\"..."
       bash iobroker set admin.0 --port $adminport
-    echo 'Done.'
+    echo "Done."
     echo ' '
   fi
 fi
@@ -254,6 +256,89 @@ then
 fi
 
 
+# Checking ENV for multihost setup
+# Configuring objects db host
+if [ "$multihost" = "master" ] && [ "$objectsdbtype" = "" ] && [ "$objectsdbhost" = "" ] && [ "$objectsdbport" = "" ]
+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
+  echo "Done."
+  echo ' '
+elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ]
+then
+  echo "Multihost is set as \"master\" by ENV. But objects db host is set to \"127.0.0.1\" by ENV too."
+  echo "This configuration will not work! Please change or remove ENV \"IOB_OBJECTSDB_HOST\" and start over!"
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+elif [ "$multihost" = "master" ] &&  [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
+then
+  echo "Multihost is set as \"master\" by ENV and external objects db is set."
+  echo "Skipping this step..."
+  echo "Done."
+  echo ' '
+elif ([ "$multihost" = "slave" ] && [ "$objectsdbtype" = "" ]) || ([ "$multihost" = "slave" ] && [ "$objectsdbhost" = "" ]) || ([ "$multihost" = "slave" ] && [ "$objectsdbport" = "" ])
+then
+  echo "Multihost is set as \"slave\" by ENV. But no external objects db is set."
+  echo "You have to configure ENVs \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" to connect to a maser objects db."
+  echo "Please check your settings and start over."
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+elif [ "$multihost" = "slave" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
+then
+  echo "Multihost is set as \"slave\" by ENV and external objects db is set."
+  echo "Skipping this step..."
+  echo "Done."
+  echo ' '
+elif [ "$multihost" != "" ]
+then
+  echo "Multihost is set but it seems like some configuration is missing."
+  echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" correctly and start over."
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+fi
+#Configuring states db host
+if [ "$multihost" = "master" ] && [ "$statesdbtype" = "" ] && [ "$statesdbhost" = "" ] && [ "$statesdbport" = "" ]
+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
+  echo "Done."
+  echo ' '
+elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ]
+then
+  echo "Multihost is set as \"master\" by ENV. But states db host is set to \"127.0.0.1\" by ENV too."
+  echo "This configuration will not work! Please change or remove ENV \"IOB_STATESDB_HOST\" and start over!"
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+elif [ "$multihost" = "master" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
+then
+  echo "Multihost is set as \"master\" by ENV and external states db is set."
+  echo "Skipping this step..."
+  echo "Done."
+  echo ' '
+elif ([ "$multihost" = "slave" ] && [ "$statesdbtype" = "" ]) || ([ "$multihost" = "slave" ] && [ "$statesdbhost" = "" ]) || ([ "$multihost" = "slave" ] && [ "$statesdbport" = "" ])
+then
+  echo "Multihost is set as \"slave\" by ENV. But no external states db is set."
+  echo "You have to configure ENVs \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESDB_PORT\" to connect to a maser states db."
+  echo "Please check your settings and start over."
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+elif [ "$multihost" = "slave" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
+then
+  echo "Multihost is set as \"slave\" by ENV and external states db is set."
+  echo "Skipping this step..."
+  echo "Done."
+  echo ' '
+elif [ "$multihost" != "" ]
+then
+  echo "Multihost is set but it seems like some configuration is missing."
+  echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESTDB_PORT\" correctly and start over."
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+fi
+
+
 # Checking ENVs for custom setup of objects db
 if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ]
 then
@@ -354,9 +439,6 @@ then
 fi
 
 
-sleep 5
-
-
 #####
 # Starting ioBroker
 #####
@@ -367,7 +449,21 @@ echo ' '
 echo "Starting ioBroker..."
 echo ' '
 
-gosu iobroker node node_modules/iobroker.js-controller/controller.js
+# Function for graceful shutdown by SIGTERM signal
+shut_down() {
+  echo ' '
+  echo "Recived termination signal (SIGTERM)."
+  echo "Shutting down ioBroker..."
+  pid=$(ps -ef | awk '/[j]s.controller/{print $2}')
+  kill -SIGTERM "$pid"
+  exit
+}
 
-# Preventing container restart by keeping a process alive even if iobroker will be stopped
+# Trap to get signal for graceful shutdown
+trap 'shut_down' SIGTERM
+
+# IoBroker start
+gosu iobroker node node_modules/iobroker.js-controller/controller.js & wait
+
+# Fallback process for keeping container running when ioBroker is stopped for maintenance (e.g. js-controller update)
 tail -f /dev/null

amd64/Dockerfile

@@ -30,8 +30,8 @@ RUN apt-get update && apt-get install -y \
     wget \
     && rm -rf /var/lib/apt/lists/*
 
-# Install node10
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash \
+# Install node
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash \
     && apt-get update && apt-get install -y nodejs \
     && rm -rf /var/lib/apt/lists/*
 
@@ -61,7 +61,7 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
 # Install ioBroker
 WORKDIR /
 RUN apt-get update \
-    && curl -sL https://raw.githubusercontent.com/ioBroker/ioBroker/stable-installer/installer.sh | bash - \
+    && curl -sL https://iobroker.net/install.sh | bash - \
     && echo $(hostname) > /opt/iobroker/.install_host \
     && echo $(hostname) > /opt/.firstrun \
     && rm -rf /var/lib/apt/lists/*
@@ -76,14 +76,15 @@ RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
 
 # Setting up iobroker-user (shell and home directory)
 RUN chsh -s /bin/bash iobroker \
-    && usermod --home /opt/iobroker iobroker
+    && usermod --home /opt/iobroker iobroker \
+    && usermod -u 1000 iobroker \
+    && groupmod -g 1000 iobroker
 
 # Setting up ENVs
 ENV DEBIAN_FRONTEND="teletype" \
     LANG="de_DE.UTF-8" \
     LANGUAGE="de_DE:de" \
     LC_ALL="de_DE.UTF-8" \
-    PACKAGES="vi" \
     SETGID=1000 \
     SETUID=1000 \
     TZ="Europe/Berlin"

amd64/scripts/iobroker_startup.sh

@@ -3,6 +3,7 @@
 # Reading ENV
 adminport=$IOB_ADMINPORT
 avahi=$AVAHI
+multihost=$IOB_MULTIHOST
 objectsdbhost=$IOB_OBJECTSDB_HOST
 objectsdbport=$IOB_OBJECTSDB_PORT
 objectsdbtype=$IOB_OBJECTSDB_TYPE
@@ -90,6 +91,7 @@ then
   fi
 else
   echo "Nothing to do here."
+  echo ' '
 fi
 
 # Change directory for next steps
@@ -168,14 +170,14 @@ then
   echo "Hostname needs to be updated to " $(hostname)"..."
     bash iobroker host $(cat /opt/iobroker/.install_host)
     rm -f /opt/iobroker/.install_host
-  echo 'Done.'
+  echo "Done."
   echo ' '
 elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
 then
   echo "Hostname in ioBroker does not match the hostname of this container."
   echo "Updating hostname to " $(hostname)"..."
     bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
-  echo 'Done.'
+  echo "Done."
   echo ' '
 fi
 
@@ -201,7 +203,7 @@ then
     echo "Adminport set by ENV does not match port configured in ioBroker installation."
     echo "Setting Adminport to \""$adminport"\"..."
       bash iobroker set admin.0 --port $adminport
-    echo 'Done.'
+    echo "Done."
     echo ' '
   fi
 fi
@@ -254,6 +256,89 @@ then
 fi
 
 
+# Checking ENV for multihost setup
+# Configuring objects db host
+if [ "$multihost" = "master" ] && [ "$objectsdbtype" = "" ] && [ "$objectsdbhost" = "" ] && [ "$objectsdbport" = "" ]
+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
+  echo "Done."
+  echo ' '
+elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ]
+then
+  echo "Multihost is set as \"master\" by ENV. But objects db host is set to \"127.0.0.1\" by ENV too."
+  echo "This configuration will not work! Please change or remove ENV \"IOB_OBJECTSDB_HOST\" and start over!"
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+elif [ "$multihost" = "master" ] &&  [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
+then
+  echo "Multihost is set as \"master\" by ENV and external objects db is set."
+  echo "Skipping this step..."
+  echo "Done."
+  echo ' '
+elif ([ "$multihost" = "slave" ] && [ "$objectsdbtype" = "" ]) || ([ "$multihost" = "slave" ] && [ "$objectsdbhost" = "" ]) || ([ "$multihost" = "slave" ] && [ "$objectsdbport" = "" ])
+then
+  echo "Multihost is set as \"slave\" by ENV. But no external objects db is set."
+  echo "You have to configure ENVs \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" to connect to a maser objects db."
+  echo "Please check your settings and start over."
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+elif [ "$multihost" = "slave" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
+then
+  echo "Multihost is set as \"slave\" by ENV and external objects db is set."
+  echo "Skipping this step..."
+  echo "Done."
+  echo ' '
+elif [ "$multihost" != "" ]
+then
+  echo "Multihost is set but it seems like some configuration is missing."
+  echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" correctly and start over."
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+fi
+#Configuring states db host
+if [ "$multihost" = "master" ] && [ "$statesdbtype" = "" ] && [ "$statesdbhost" = "" ] && [ "$statesdbport" = "" ]
+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
+  echo "Done."
+  echo ' '
+elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ]
+then
+  echo "Multihost is set as \"master\" by ENV. But states db host is set to \"127.0.0.1\" by ENV too."
+  echo "This configuration will not work! Please change or remove ENV \"IOB_STATESDB_HOST\" and start over!"
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+elif [ "$multihost" = "master" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
+then
+  echo "Multihost is set as \"master\" by ENV and external states db is set."
+  echo "Skipping this step..."
+  echo "Done."
+  echo ' '
+elif ([ "$multihost" = "slave" ] && [ "$statesdbtype" = "" ]) || ([ "$multihost" = "slave" ] && [ "$statesdbhost" = "" ]) || ([ "$multihost" = "slave" ] && [ "$statesdbport" = "" ])
+then
+  echo "Multihost is set as \"slave\" by ENV. But no external states db is set."
+  echo "You have to configure ENVs \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESDB_PORT\" to connect to a maser states db."
+  echo "Please check your settings and start over."
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+elif [ "$multihost" = "slave" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
+then
+  echo "Multihost is set as \"slave\" by ENV and external states db is set."
+  echo "Skipping this step..."
+  echo "Done."
+  echo ' '
+elif [ "$multihost" != "" ]
+then
+  echo "Multihost is set but it seems like some configuration is missing."
+  echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESTDB_PORT\" correctly and start over."
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+fi
+
+
 # Checking ENVs for custom setup of objects db
 if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ]
 then
@@ -354,9 +439,6 @@ then
 fi
 
 
-sleep 5
-
-
 #####
 # Starting ioBroker
 #####
@@ -367,7 +449,21 @@ echo ' '
 echo "Starting ioBroker..."
 echo ' '
 
-gosu iobroker node node_modules/iobroker.js-controller/controller.js
+# Function for graceful shutdown by SIGTERM signal
+shut_down() {
+  echo ' '
+  echo "Recived termination signal (SIGTERM)."
+  echo "Shutting down ioBroker..."
+  pid=$(ps -ef | awk '/[j]s.controller/{print $2}')
+  kill -SIGTERM "$pid"
+  exit
+}
 
-# Preventing container restart by keeping a process alive even if iobroker will be stopped
+# Trap to get signal for graceful shutdown
+trap 'shut_down' SIGTERM
+
+# IoBroker start
+gosu iobroker node node_modules/iobroker.js-controller/controller.js & wait
+
+# Fallback process for keeping container running when ioBroker is stopped for maintenance (e.g. js-controller update)
 tail -f /dev/null

armv7hf/Dockerfile

@@ -30,8 +30,8 @@ RUN apt-get update && apt-get install -y \
     wget \
     && rm -rf /var/lib/apt/lists/*
 
-# Install node10
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash \
+# Install node
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash \
     && apt-get update && apt-get install -y nodejs \
     && rm -rf /var/lib/apt/lists/*
 
@@ -61,7 +61,7 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
 # Install ioBroker
 WORKDIR /
 RUN apt-get update \
-    && curl -sL https://raw.githubusercontent.com/ioBroker/ioBroker/stable-installer/installer.sh | bash - \
+    && curl -sL https://iobroker.net/install.sh | bash - \
     && echo $(hostname) > /opt/iobroker/.install_host \
     && echo $(hostname) > /opt/.firstrun \
     && rm -rf /var/lib/apt/lists/*
@@ -76,14 +76,15 @@ RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
 
 # Setting up iobroker-user (shell and home directory)
 RUN chsh -s /bin/bash iobroker \
-    && usermod --home /opt/iobroker iobroker
+    && usermod --home /opt/iobroker iobroker \
+    && usermod -u 1000 iobroker \
+    && groupmod -g 1000 iobroker
 
 # Setting up ENVs
 ENV DEBIAN_FRONTEND="teletype" \
     LANG="de_DE.UTF-8" \
     LANGUAGE="de_DE:de" \
     LC_ALL="de_DE.UTF-8" \
-    PACKAGES="vim" \
     SETGID=1000 \
     SETUID=1000 \
     TZ="Europe/Berlin"

armv7hf/scripts/iobroker_startup.sh

@@ -3,6 +3,7 @@
 # Reading ENV
 adminport=$IOB_ADMINPORT
 avahi=$AVAHI
+multihost=$IOB_MULTIHOST
 objectsdbhost=$IOB_OBJECTSDB_HOST
 objectsdbport=$IOB_OBJECTSDB_PORT
 objectsdbtype=$IOB_OBJECTSDB_TYPE
@@ -90,6 +91,7 @@ then
   fi
 else
   echo "Nothing to do here."
+  echo ' '
 fi
 
 # Change directory for next steps
@@ -168,14 +170,14 @@ then
   echo "Hostname needs to be updated to " $(hostname)"..."
     bash iobroker host $(cat /opt/iobroker/.install_host)
     rm -f /opt/iobroker/.install_host
-  echo 'Done.'
+  echo "Done."
   echo ' '
 elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
 then
   echo "Hostname in ioBroker does not match the hostname of this container."
   echo "Updating hostname to " $(hostname)"..."
     bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
-  echo 'Done.'
+  echo "Done."
   echo ' '
 fi
 
@@ -201,7 +203,7 @@ then
     echo "Adminport set by ENV does not match port configured in ioBroker installation."
     echo "Setting Adminport to \""$adminport"\"..."
       bash iobroker set admin.0 --port $adminport
-    echo 'Done.'
+    echo "Done."
     echo ' '
   fi
 fi
@@ -254,6 +256,89 @@ then
 fi
 
 
+# Checking ENV for multihost setup
+# Configuring objects db host
+if [ "$multihost" = "master" ] && [ "$objectsdbtype" = "" ] && [ "$objectsdbhost" = "" ] && [ "$objectsdbport" = "" ]
+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
+  echo "Done."
+  echo ' '
+elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ]
+then
+  echo "Multihost is set as \"master\" by ENV. But objects db host is set to \"127.0.0.1\" by ENV too."
+  echo "This configuration will not work! Please change or remove ENV \"IOB_OBJECTSDB_HOST\" and start over!"
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+elif [ "$multihost" = "master" ] &&  [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
+then
+  echo "Multihost is set as \"master\" by ENV and external objects db is set."
+  echo "Skipping this step..."
+  echo "Done."
+  echo ' '
+elif ([ "$multihost" = "slave" ] && [ "$objectsdbtype" = "" ]) || ([ "$multihost" = "slave" ] && [ "$objectsdbhost" = "" ]) || ([ "$multihost" = "slave" ] && [ "$objectsdbport" = "" ])
+then
+  echo "Multihost is set as \"slave\" by ENV. But no external objects db is set."
+  echo "You have to configure ENVs \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" to connect to a maser objects db."
+  echo "Please check your settings and start over."
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+elif [ "$multihost" = "slave" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
+then
+  echo "Multihost is set as \"slave\" by ENV and external objects db is set."
+  echo "Skipping this step..."
+  echo "Done."
+  echo ' '
+elif [ "$multihost" != "" ]
+then
+  echo "Multihost is set but it seems like some configuration is missing."
+  echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" correctly and start over."
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+fi
+#Configuring states db host
+if [ "$multihost" = "master" ] && [ "$statesdbtype" = "" ] && [ "$statesdbhost" = "" ] && [ "$statesdbport" = "" ]
+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
+  echo "Done."
+  echo ' '
+elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ]
+then
+  echo "Multihost is set as \"master\" by ENV. But states db host is set to \"127.0.0.1\" by ENV too."
+  echo "This configuration will not work! Please change or remove ENV \"IOB_STATESDB_HOST\" and start over!"
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+elif [ "$multihost" = "master" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
+then
+  echo "Multihost is set as \"master\" by ENV and external states db is set."
+  echo "Skipping this step..."
+  echo "Done."
+  echo ' '
+elif ([ "$multihost" = "slave" ] && [ "$statesdbtype" = "" ]) || ([ "$multihost" = "slave" ] && [ "$statesdbhost" = "" ]) || ([ "$multihost" = "slave" ] && [ "$statesdbport" = "" ])
+then
+  echo "Multihost is set as \"slave\" by ENV. But no external states db is set."
+  echo "You have to configure ENVs \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESDB_PORT\" to connect to a maser states db."
+  echo "Please check your settings and start over."
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+elif [ "$multihost" = "slave" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
+then
+  echo "Multihost is set as \"slave\" by ENV and external states db is set."
+  echo "Skipping this step..."
+  echo "Done."
+  echo ' '
+elif [ "$multihost" != "" ]
+then
+  echo "Multihost is set but it seems like some configuration is missing."
+  echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESTDB_PORT\" correctly and start over."
+  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  exit 1
+fi
+
+
 # Checking ENVs for custom setup of objects db
 if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ]
 then
@@ -354,9 +439,6 @@ then
 fi
 
 
-sleep 5
-
-
 #####
 # Starting ioBroker
 #####
@@ -367,7 +449,21 @@ echo ' '
 echo "Starting ioBroker..."
 echo ' '
 
-gosu iobroker node node_modules/iobroker.js-controller/controller.js
+# Function for graceful shutdown by SIGTERM signal
+shut_down() {
+  echo ' '
+  echo "Recived termination signal (SIGTERM)."
+  echo "Shutting down ioBroker..."
+  pid=$(ps -ef | awk '/[j]s.controller/{print $2}')
+  kill -SIGTERM "$pid"
+  exit
+}
 
-# Preventing container restart by keeping a process alive even if iobroker will be stopped
+# Trap to get signal for graceful shutdown
+trap 'shut_down' SIGTERM
+
+# IoBroker start
+gosu iobroker node node_modules/iobroker.js-controller/controller.js & wait
+
+# Fallback process for keeping container running when ioBroker is stopped for maintenance (e.g. js-controller update)
 tail -f /dev/null