Compare commits

...

12 Commits

Author SHA1 Message Date
buanet
74b0f246cd release new stable 2019-08-21 21:10:27 +02:00
Andre
e0c1cec14b change image 2019-07-14 22:27:21 +02:00
buanet
79aa59cf69 deletions 2019-07-04 11:36:07 +02:00
buanet
b89ee16f44 added armv7 support 2019-07-03 16:10:17 +02:00
Andre
b74cfe57c1 fixing avahi issue 2019-06-21 23:23:37 +02:00
Andre
305a13b0b0 deletions after testing 2019-06-13 14:45:58 +02:00
Andre
c80f25cca1 some changes for new beta 2019-06-13 13:58:36 +02:00
Andre
aed7604906 Merge pull request #26 from smarthomefans/use_gosu
Try to use gosu, not sudo
2019-06-13 13:20:05 +02:00
SchumyHao
a8dd8897eb Try to use gosu, not sudo
Signed-off-by: SchumyHao <schumyhaojl@126.com>
2019-06-07 01:41:24 +08:00
andre
7736e05e08 docu 2019-05-18 22:55:03 +02:00
andre
2c2abee86a new beta 2019-05-18 22:51:38 +02:00
andre
b28250e9f8 some testing 2019-05-18 19:41:52 +02:00
3 changed files with 30 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
FROM debian:latest
FROM debian:stretch
MAINTAINER Andre Germann <https://buanet.de>
@@ -12,14 +12,13 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
curl \
git \
gnupg2 \
libavahi-compat-libdnssd-dev \
libcap2-bin \
libpam0g-dev \
libudev-dev \
locales \
procps \
python \
sudo \
gosu \
unzip \
wget \
&& rm -rf /var/lib/apt/lists/*

View File

@@ -1,14 +1,12 @@
# 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 (Normally I do a small additional test on my Debian-VM with Docker CE)!
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!!!
At the moment v3.0.0 does no longer support running in host-mode on Synology-devices because of a kernel issue in actual DSM-kernel! Please use bridged or macvlan mode. For details see new tutorial linked in the following.
## Installation & Usage
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!
@@ -40,10 +38,21 @@ This also works with mounting a folder containing an existing ioBroker-installat
### 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 be patient!
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

View File

@@ -10,7 +10,7 @@ dati=`date '+%Y-%m-%d %H:%M:%S'`
# Information
echo ''
echo '----------------------------------------'
echo '----- Image-Version: 3.0.0 -----'
echo '----- Image-Version: 3.1.0 -----'
echo '----- '$dati' -----'
echo '----------------------------------------'
echo ''
@@ -39,6 +39,10 @@ then
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
@@ -76,8 +80,14 @@ sleep 5
# Starting ioBroker
echo ''
echo 'Starting ioBroker...'
sudo -u iobroker node node_modules/iobroker.js-controller/controller.js > /opt/scripts/iobroker.log 2>&1 &
echo 'Starting ioBroker done...'
echo ''
echo '----------------------------------------'
echo '------- ioBroker Logging -------'
echo '----------------------------------------'
echo ''
# Preventing container restart by keeping a process alive
# 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