Merge branch 'master' into node8

Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER Andre Germann <info@buanet.de>
 
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get update && apt-get install -y build-essential python apt-utils curl avahi-daemon git libpcap-dev libavahi-compat-libdnssd-dev libfontconfig gnupg2 locales procps libudev-dev libpam0g-dev unzip sudo wget
+RUN apt-get update && apt-get install -y build-essential python apt-utils curl avahi-daemon git libpcap-dev libavahi-compat-libdnssd-dev libfontconfig gnupg2 locales procps libudev-dev libpam0g-dev unzip sudo wget ffmpeg android-tools-adb android-tools-fastboot
 
 RUN curl -sL https://deb.nodesource.com/setup_8.x | bash
 RUN apt-get install -y nodejs
@@ -13,6 +13,7 @@ RUN sed -i '/^rlimit-nproc/s/^\(.*\)/#\1/g' /etc/avahi/avahi-daemon.conf
 RUN sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen && \dpkg-reconfigure --frontend=noninteractive locales && \update-locale LANG=de_DE.UTF-8
 ENV LANG de_DE.UTF-8 
 RUN cp /usr/share/zoneinfo/Europe/Berlin /etc/localtime
+ENV TZ Europe/Berlin
 
 RUN mkdir -p /opt/iobroker/ && chmod 777 /opt/iobroker/
 RUN mkdir -p /opt/scripts/ && chmod 777 /opt/scripts/

README.md

@@ -1,17 +1,32 @@
 # docker-iobroker
 Docker image for ioBroker (http://iobroker.net) based on debian:latest (http://hub.docker.com/_/debian/)
 
-This project creates a Docker image for running ioBroker in a Docker container. It is made for and tested on a Synology disk station with DSM 6.0.2 and Docker 1.11.2. But it should also work on other systems running Docker.<br>
+This project creates a Docker image for running ioBroker in a Docker container. It is made for and tested on a Synology Disk Station 1515+ with DSM 6 and Docker-package installed. But it should also work on other systems with Docker!<br>
 Cause the container ist based on debian:latest, it acts nearly like a full virtual machine. That makes it possible to easily add some additional dependies for some ioBroker-Adapters.
 
 ## Installation & Usage
 
-For instructions and discussion (in german) please visit ioBroker-Forum (http://forum.iobroker.net/viewtopic.php?f=17&t=5089).
+A detailed tutorial (german) can be found on my website (https://buanet.de/2017/09/iobroker-unter-docker-auf-der-synology-diskstation/).<br>
+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.
+
 
 ## Changelog
 
-### v1.1.1 (2018-03-21)
+### v1.2.1beta (2018-09-12)
+* added support for firetv-adapter
+
+### v1.2.0 (2018-08-21)
+* after testing making 1.1.3beta to latest stable release 
+
+### v1.1.3beta (2018-08-21)
+* added ffmpeg-package for yahka to support webcams
+
+### v1.1.2beta (2018-04-04)
+* added ENV for timezone issue
+
+### v1.1.1beta (2018-03-29)
 * added wget package
+* updated readme.md
 
 ### v1.1.0 (2017-12-10)
 * changed startup call to fix restart issue
@@ -20,7 +35,7 @@ For instructions and discussion (in german) please visit ioBroker-Forum (http://
 * added z-wave support
 * added logging to /opt/scripts/docker_iobroker_log.txt
 
-### v1.0.1 (2017-08-25)
+### v1.0.1beta (2017-08-25)
 * fixed locales issue
 
 ### v1.0.0 (2017-08-22)

maintenance_scripts/iobroker_restart.sh

@@ -4,8 +4,8 @@
 # Kann zum Beispiel aus ioBroker heraus aufgerufen werden um ioBroker neu zu starten. 
 
 cd /opt/iobroker
-./iobroker stop
+pkill io
 sleep 5
-./iobroker start
+node node_modules/iobroker.js-controller/controller.js >/opt/scripts/docker_iobroker_log.txt 2>&1 &
 
 exit 0

maintenance_scripts/iobroker_stop.sh

@@ -4,6 +4,6 @@
 # Kann zum Beispiel aus ioBroker heraus aufgerufen werden um ioBroker zu stoppen. 
 
 cd /opt/iobroker
-./iobroker stop
+pkill io
 
 exit 0