release new stable

Try to use gosu, not sudo

Dockerfile

@@ -1,38 +1,79 @@
-FROM debian:latest
+FROM debian:stretch
 
 MAINTAINER Andre Germann <https://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 ffmpeg android-tools-adb android-tools-fastboot
+# Install prerequisites
+RUN apt-get update && apt-get upgrade -y && apt-get install -y \
+        acl \
+        apt-utils \
+        build-essential \
+        curl \
+        git \
+        gnupg2 \
+        libcap2-bin \
+        libpam0g-dev \
+        libudev-dev \
+        locales \
+        procps \
+        python \
+        gosu \
+        unzip \
+        wget \
+    && rm -rf /var/lib/apt/lists/*
 
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bash
-RUN apt-get install -y nodejs
+# Install node8
+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash \
+    && apt-get update && apt-get install -y \
+        nodejs \
+    && rm -rf /var/lib/apt/lists/*
 
-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/
+# Generating locales
+RUN sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
+	&& sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
+	&& locale-gen
 
+# Create scripts directory and copy scripts
+RUN mkdir -p /opt/scripts/ \
+    && chmod 777 /opt/scripts/
 WORKDIR /opt/scripts/
+COPY scripts/iobroker_startup.sh iobroker_startup.sh
+COPY scripts/setup_avahi.sh setup_avahi.sh
+COPY scripts/setup_packages.sh setup_packages.sh
+RUN chmod +x iobroker_startup.sh \
+	&& chmod +x setup_avahi.sh \
+    && chmod +x setup_packages.sh
 
-ADD scripts/avahi_startup.sh avahi_startup.sh
-RUN chmod +x avahi_startup.sh
-RUN mkdir /var/run/dbus/
-
-ADD scripts/iobroker_startup.sh iobroker_startup.sh
-RUN chmod +x iobroker_startup.sh
+# Install ioBroker
+WORKDIR /
+RUN apt-get update \
+    && curl -sL https://raw.githubusercontent.com/ioBroker/ioBroker/stable-installer/installer.sh | bash - \
+    && echo $(hostname) > /opt/iobroker/.install_host \
+    && echo $(hostname) > /opt/.firstrun \
+    && rm -rf /var/lib/apt/lists/*
 
+# Install node-gyp
 WORKDIR /opt/iobroker/
+RUN npm install -g node-gyp
 
-RUN npm install iobroker --unsafe-perm && npm i --production --unsafe-perm
-RUN update-rc.d iobroker.sh remove && echo $(hostname) > .install_host
-RUN npm install node-gyp -g
+# Backup initial ioBroker-folder
+RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker
 
-CMD ["sh", "/opt/scripts/iobroker_startup.sh"]
+# Setting up iobroker-user
+RUN chsh -s /bin/bash iobroker
 
-ENV DEBIAN_FRONTEND teletype
+# Setting up ENVs
+ENV DEBIAN_FRONTEND="teletype" \
+	LANG="de_DE.UTF-8" \
+	LANGUAGE="de_DE:de" \
+	LC_ALL="de_DE.UTF-8" \
+	TZ="Europe/Berlin" \
+	PACKAGES="nano" \
+	AVAHI="false"
+
+# Setting up EXPOSE for Admin
+EXPOSE 8081/tcp	
+	
+# Run startup-script
+ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"]

README.md

@@ -1,19 +1,92 @@
 # docker-iobroker
-Docker image for ioBroker (http://iobroker.net) based on debian:latest (http://hub.docker.com/_/debian/)
+Docker image for ioBroker (http://iobroker.net) based on debian:stretch (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 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.
+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 installed!
+
+## Important
+
+Switching an existing installation from docker-iobroker-image v1 to v2 or greater means switching iobroker itself from node6 to node8! This requires additional steps inside ioBroker! After upgrading iobroker-container 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=8323&lang=de). Make backup first!!!
 
 ## 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!!!**
+A detailed tutorial (german, based on new 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 does no longer work!
 
-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.
+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.
 
+## Special Settings
+
+In v3.0.0 I added some new features. The following will give some short information about that.
+
+### Environment Variables
+
+|env|value|description|
+|---|---|---|
+|PACKAGES|package1 package2 package2|seperateed by whitespace; will install the listed packages on startup<br>(be paitient, this may take some time!)|
+|AVAHI|true|will install and activate avahi-daemon for supporting yahka-adapter|
+|LANGUAGE|de_DE:de|following locales are pre-generated: de_DE:de, en_US:en|
+|LANG|de_DE.UTF-8|following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8|
+|LC_ALL|de_DE|following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8|
+|TZ|Europe/Berlin|all valid Linux-timezones|
+
+### Mounting Folder/ Volume
+
+It is now 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 empty.
+
+It is absolutely recommended to use a mounted folder or persistent volume for /opt/iobroker folder!
+
+This also works with mounting a folder containing an existing ioBroker-installation (e.g. when moving an existing installation to docker). 
+
+### Permission Fixer
+
+I added some code for fixing permissions for new iobroker-user. Permission-fixing is called on first start of the container. This might take a few minutes. Please take a look at the logs and be patient!
 
 ## Changelog
 
+### v3.1.0 (2019-08-21)
+* switching base image from "debian:latest" to "debian:stretch"
+* bringing beta changes to stable
+
+### v3.0.2beta (2019-06-13)
+* using gosu instead of sudo
+* changing output of ioBroker logging
+
+### v3.0.1beta (2019-05-18)
+* ~~switching back to iobroker-daemon for startup~~
+
+### v3.0.0 (2019-05-09)
+* bringing changes since v2.0.0 to stable
+* new tutorial available
+
+### v2.0.6beta (2019-04-14)
+* added some additional logging
+* fixing some issues for languag env
+* added permission fixing on first start
+
+### v2.0.5beta (2019-02-09)
+* added ENV to dockerfile
+* added EXPOSE for admin 
+* final testing
+
+### 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)
 * using node8 instead of node6 
 * changes for new iobroker setup

scripts/avahi_startup.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-rm /var/run/dbus/pid
-dbus-daemon --system
-
-/etc/init.d/avahi-daemon stop
-sleep 5
-/etc/init.d/avahi-daemon start
-
-exit 0

scripts/iobroker_startup.sh

@@ -1,16 +1,93 @@
-#!/bin/sh
+#!/bin/bash
+
+# Reading env-variables
+packages=$PACKAGES
+avahi=$AVAHI
+
+# Getting date and time for logging 
+dati=`date '+%Y-%m-%d %H:%M:%S'`
+
+# Information
+echo ''
+echo '----------------------------------------'
+echo '-----     Image-Version: 3.1.0     -----'
+echo '-----      '$dati'     -----'
+echo '----------------------------------------'
+echo ''
+echo 'Startupscript running...'
+
+# Checking and installing additional packages
+if [ "$packages" != "" ]
+then
+  echo ''
+  echo 'Installing additional packages...'
+  echo 'The following packages will be installed:' $packages
+  echo $packages > /opt/scripts/.packages
+  sh /opt/scripts/setup_packages.sh > /opt/scripts/setup_packages.log 2>&1
+  echo 'Installing additional packages done...'
+fi
 
 cd /opt/iobroker
 
-if [ -f .install_host ];
+# Checking and restoring ioBroker to empty mounted folder
+if [ `ls -1a|wc -l` -lt 3 ]
 then
-        echo $(hostname) > .install_host && ./iobroker host $(cat .install_host)
-		iobroker del admin.0 && iobroker del discovery.0
-		iobroker add admin && iobroker add discovery
-        rm .install_host
+  echo ''
+  echo 'Directory /opt/iobroker is empty!'
+  echo 'Restoring data from image...'
+	tar -xf /opt/initial_iobroker.tar -C /
+	echo 'Restoring done...'
+fi
+
+# Backing up original iobroker-file and changing sudo to gosu
+cp -a /opt/iobroker/iobroker /opt/iobroker/iobroker.bak
+sed -i 's/sudo -H -u/gosu/g' /opt/iobroker/iobroker
+
+# Checking for first run of a new installation and renaming ioBroker
+if [ -f /opt/iobroker/.install_host ]
+then
+  echo ''
+  echo 'This is the first run of an new installation...'
+  echo 'Hostname given is' $(hostname)'...'
+  echo 'Renaming ioBroker...'
+  iobroker host $(cat /opt/iobroker/.install_host)
+  rm -f /opt/iobroker/.install_host
+  echo 'Renaming ioBroker done...'
+fi
+
+# Checking for first run and change permissions
+if [ -f /opt/.firstrun ]
+then 
+  echo ''
+  echo 'Changing permissions upon first run (This might take a while! Please be patient!)...'
+  chown -R iobroker /opt/iobroker
+  chown -R iobroker /opt/scripts
+  rm -f /opt/.firstrun
+  echo 'Changing permissions done...'
+fi
+
+# Checking for and setting up avahi-daemon
+if [ "$avahi" = "true" ]
+then
+  echo ''
+  echo 'Initializing Avahi-Daemon...'
+  sh /opt/scripts/setup_avahi.sh
+  echo 'Initializing Avahi-Daemon done...'
 fi
 
-/opt/scripts/avahi_startup.sh
 sleep 5
-node node_modules/iobroker.js-controller/controller.js >/opt/scripts/docker_iobroker_log.txt 2>&1 &
-/bin/bash
+
+# Starting ioBroker
+echo ''
+echo 'Starting ioBroker...'
+echo ''
+echo '----------------------------------------'
+echo '-------     ioBroker Logging     -------'
+echo '----------------------------------------'
+echo ''
+
+# gosu iobroker node node_modules/iobroker.js-controller/controller.js > /opt/scripts/iobroker.log 2>&1 &
+gosu iobroker node node_modules/iobroker.js-controller/controller.js
+
+# Preventing container restart by keeping a process alive even if iobroker will be stopped
+tail -f /dev/null

scripts/setup_avahi.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+echo 'Checking avahi-daemon installation state...'
+
+if [ -f /usr/sbin/avahi-daemon ]
+then
+  echo 'Avahi already installed...'
+else
+  echo 'Installing avahi-daemon...'
+  apt-get update > /opt/scripts/avahi_startup.log 2>&1
+  apt-get install -y libavahi-compat-libdnssd-dev avahi-daemon >> /opt/scripts/avahi_startup.log 2>&1
+  rm -rf /var/lib/apt/lists/* >> /opt/scripts/avahi_startup.log 2>&1
+  echo 'Configuring avahi-daemon...'
+  sed -i '/^rlimit-nproc/s/^\(.*\)/#\1/g' /etc/avahi/avahi-daemon.conf
+  echo 'Configuring dbus...'
+  mkdir /var/run/dbus/
+fi
+
+if [ -f /var/run/dbus/pid ];
+then
+  rm -f /var/run/dbus/pid
+fi
+
+if [ -f /var/run/avahi-daemon//pid ];
+then
+  rm -f /var/run/avahi-daemon//pid
+fi
+
+echo 'Starting dbus...'
+dbus-daemon --system
+
+echo 'Starting avahi-daemon...'
+/etc/init.d/avahi-daemon start
+
+exit 0

scripts/setup_packages.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+apt-get update
+apt-get install -y  $(cat /opt/scripts/.packages)
+rm -rf /var/lib/apt/lists/*
+rm -f /opt/scripts/.packages
+
+exit 0