From 97b5641372bd086b00f7a5ae0a670bed17ded921 Mon Sep 17 00:00:00 2001 From: andre <> Date: Mon, 28 Jan 2019 22:15:33 +0100 Subject: [PATCH] optimizing logging --- README.md | 23 +++++++++++++++++++++-- scripts/iobroker_startup.sh | 17 +++++++++++------ 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 7af03fb..b2e3b43 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,9 @@ Cause the container ist based on debian:latest, it acts nearly like a full virtu ## Installation & Usage -**Important Notice: Switching an existing ioBroker-installation from node6 to node8 (docker-iobroker v1 to v2) requires an additional step inside ioBroker! After Upgrade you have to call "reinstall.sh" for recompiling your Installation for the use with node8. For Details see official ioBroker-documentation (http://www.iobroker.net/docu/?page_id=5106&lang=de). Make backup first!!!** +**Important Notice 1: Switching an existing ioBroker-installation from node6 to node8 (docker-iobroker v1 to v2) requires an additional step inside ioBroker! After Upgrade you have to call "reinstall.sh" for recompiling your Installation for the use with node8. For Details see official ioBroker-documentation (http://www.iobroker.net/docu/?page_id=5106&lang=de). Make backup first!!!** + +**Important Notice 2: Versions greater than 2.0.0 do no longer support running in host-mode on Synology-devices! Please use bridged or macvlan mode. Tutorial will be updated as soon as possible!** A detailed tutorial (german) can be found on my website (https://buanet.de/2017/09/iobroker-unter-docker-auf-der-synology-diskstation/).
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. @@ -14,7 +16,24 @@ For discussion and support please visit ioBroker-forum-thread (http://forum.iobr ## Changelog -### v2.0.1 (2019-01-07) +### v2.0.4beta (2019-01-28) +* added support for env variables "avahi" and "packages" +* moving avahi-daemon installation into avahi startup script +* added script for installing optional packages +* optimizing logging output + +### v2.0.3beta (2019-01-24) +* added support for running ioBroker under iobroker user +* optimizing logging output +* optimizing scripts + +### v2.0.2beta (2019-01-23) +* optimizing and rearraged dockerfile +* changes for new ioBroker install script +* added restoring for empty mounted /opt/iobroker folder +* some more small fixes + +### v2.0.1beta (2019-01-07) * some changes for supporting other docker-environments than synology ds ### v2.0.0 (2018-12-05) diff --git a/scripts/iobroker_startup.sh b/scripts/iobroker_startup.sh index 3c5559c..8eac1a6 100644 --- a/scripts/iobroker_startup.sh +++ b/scripts/iobroker_startup.sh @@ -1,25 +1,26 @@ #!/bin/bash -# Checking env-variables +# Reading env-variables packages=$PACKAGES avahi=$AVAHI -echo 'ENV packages:' $packages -echo 'ENV avahi:' $avahi +# Version output for logging +echo 'Version: 2.0.9beta' +echo 'Startupscript running...' +# Checking and installing additional packages if [ "$packages" != "" ] then echo 'Installing additional packages...' echo 'The following packages will be installed:' $packages sudo echo $packages > /opt/scripts/.packages - sudo sh /opt/scripts/packages_install.sh # >/opt/scripts/packages_install.log 2>&1 & + sudo sh /opt/scripts/packages_install.sh >/opt/scripts/packages_install.log 2>&1 echo 'Installing additional packages done...' fi cd /opt/iobroker -echo 'Startupscript running...' - +# Checking and restoring ioBroker to mounted folder if [ `ls -1a|wc -l` -lt 3 ] then echo 'Directory /opt/iobroker is empty!' @@ -28,6 +29,7 @@ then echo 'Restoring done...' fi +# Checking for first run and renaming ioBroker if [ -f /opt/iobroker/.install_host ] then echo 'First run preparation! Used Hostname:' $(hostname) @@ -37,6 +39,7 @@ then echo 'First run preparation done...' fi +# Checking and setting up avahi-daemon if [ "$avahi" = "true" ] then echo 'Initializing Avahi-Daemon...' @@ -46,8 +49,10 @@ fi sleep 5 +# Starting ioBroker echo 'Starting ioBroker...' node node_modules/iobroker.js-controller/controller.js >/opt/scripts/docker_iobroker.log 2>&1 & echo 'Starting ioBroker done...' +# Preventing container restart tail -f /dev/null