diff --git a/.VERSION b/.VERSION index b913b7c..51be872 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -v4.1.0 +v4.2.0 diff --git a/.travis.yml b/.travis.yml index 885322b..2d8e913 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ jobs: - docker run --rm --privileged multiarch/qemu-user-static:register --reset - sed -i "s/\$VERSION/${VERSION}/g" $ARCH/scripts/iobroker_startup.sh - docker build -t "buanet/iobroker:$VERSION-$ARCH" ./armv7hf - + - stage: Manifest env: - JOB_NAME="Manifest" @@ -62,44 +62,44 @@ after_success: if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Build images" ] ; then docker push buanet/iobroker:$VERSION-$ARCH fi - + if [ "$TRAVIS_BRANCH" == "beta" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Build images" ] ; then docker push buanet/iobroker:$VERSION-$ARCH fi - + # update repository manifest for multiarch and push to hub - > if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Manifest" ]; then cat manifest.yml | sed "s/\$VERSION/${VERSION}/g" > manifest.yaml - + #manifest for image: buanet/iobroker:version cat manifest.yaml | sed "s/\$DOCKERTAG/${VERSION}/g" > manifestversion.yaml - + #manifest for image: buanet/iobroker:latest cat manifest.yaml | sed "s/\$DOCKERTAG/latest/g" > manifestlatest.yaml #push to hub mv manifestversion.yaml iobroker.yaml ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml - + mv manifestlatest.yaml iobroker.yaml ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml fi - + if [ "$TRAVIS_BRANCH" == "beta" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Manifest" ]; then - + cat manifest.yml | sed "s/\$VERSION/${VERSION}/g" > manifest.yaml - + #manifest for image: buanet/iobroker:version cat manifest.yaml | sed "s/\$DOCKERTAG/${VERSION}/g" > manifestversion.yaml - + #manifest for image: buanet/iobroker:beta cat manifest.yaml | sed "s/\$DOCKERTAG/beta/g" > manifestbeta.yaml #push to hub mv manifestversion.yaml iobroker.yaml ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml - + mv manifestbeta.yaml iobroker.yaml ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml fi diff --git a/README.md b/README.md index e9a3573..eb21684 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,12 @@ Source: https://github.com/buanet/docker-iobroker -IoBroker for Docker is an Dockerimage for ioBroker IoT platform (http://www.iobroker.net). +IoBroker for Docker is an Dockerimage for ioBroker IoT platform (http://www.iobroker.net). 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. +Feel free to ask for more architectures by opening an github issue. ## Important notice @@ -29,7 +29,7 @@ The following ways to geht iobroker-container running are only examples. Maybe y ### Running from commandline -For taking a first look at the iobroker docker container it would be enough to simply run the following basic docker run command: +For taking a first look at the iobroker docker container it would be enough to simply run the following basic docker run command: ``` docker run -p 8081:8081 --name iobroker -v iobrokerdata:/opt/iobroker buanet/iobroker:latest @@ -60,24 +60,32 @@ The following will give a short overview. ### Environment variables -To configure the ioBroker container on startup it is possible to set some 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. + +**Important: In v4.2.0 the ENVs "ADMINPORT" and "REDIS" were renamed/ reorganized. For Details see the following table!** |env|default|description| |---|---|---| -|ADMINPORT|8081|Sets ioBroker adminport on startup| |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_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"| +|IOB_STATESDB_HOST|127.0.0.1|Sets hostname for ioBroker states db| +|IOB_STATESDB_PORT|9000|Sets port for ioBroker states db| +|IOB_STATESDB_TYPE|file|Sets type of ioBroker states db, could be "file" or "redis"| |LANG|de_DE.UTF‑8|The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8| |LANGUAGE|de_DE:de|The following locales are pre-generated: de_DE:de, en_US:en| |LC_ALL|de_DE.UTF-8|The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8| |PACKAGES|vi|Installs additional packages to your container needed by some adapters, packages should be seperated by whitespace like "package1 package2 package3"| -|REDIS|false|Activates the uses of redis as states-db on startup, fill with "hostname:port" to set redis connection, redis db has to be set up seperately (e.g. in another container)| |SETGID|1000|For security reasons it might be useful to specify the gid of the containers iobroker user to match an existing group on the docker host| |SETUID|1000|For security reasons it might be useful to specify the uid of the containers iobroker user to match an existing user on the docker host| |TZ|Europe/Berlin|All valid Linux-timezones| |USBDEVICES|none|Sets relevant permissions on mounted devices like "/dev/ttyACM0", for more than one device separate with ";" like "/dev/ttyACM0;/dev/ttyACM1"| |ZWAVE|false|Will install openzwave to support zwave-adapter, can be "true" or "false"| -### Mounting Folder/ Volume +### 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". @@ -88,19 +96,59 @@ Note: It is absolutely recommended to use a mounted folder or persistent volume 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. -### Permission Fixer +**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 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! +### Userdefined startup scripts (advanced setting/ beta status) + +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. +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). + +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. + +## Miscellaneous + +### 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. +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!
+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!
+And if you want to buy me a beer instead, you can do this here:
+Thank you! + ## Changelog +### v4.2.0 (2020-04-14) +* v4.1.4beta (2020-04-07) + * switching base image to buster + * optimizing installation of packages defined by ENV "PACKAGES" +* v4.1.3beta (2020-02-08) + * renamed ENV for adminport (new "IOB_ADMINPORT)") + * added new ENVs for "iobroker setup custom" (replacing "REDIS") + * enhancements in startupscript logging +* v4.1.2beta (2020-02-02) + * added feature for running userdefined scripts on startup + * small fix for permissions issues on some systems +* v4.1.1beta (2020-01-17) + * updated openzwave to version 1.6.1007 + ### v4.1.0 (2020-01-17) * improved readme.md * v4.0.3beta (2020-01-06) * added support to restore backup on startup * small fixes according to "docker best practices" * v4.0.2beta (2019-12-10) - * added env for activating redis + * ~~added env for activating redis~~ * enhancements in startupscript and dockerfile * v4.0.1beta (2019-11-25) * added env for iobroker admin port @@ -135,7 +183,7 @@ After some issues with permissions related to the use of a dedicated user for io * added permission fixing on first start * v2.0.5beta (2019-02-09) * added ENV to dockerfile - * added EXPOSE for admin + * added EXPOSE for admin * final testing * v2.0.4beta (2019-01-28) * added support for env variables "avahi" and "packages" @@ -156,12 +204,12 @@ After some issues with permissions related to the use of a dedicated user for io ### v2.0.0 (2018-12-05) * v1.2.2beta (2018-12-05) - * using node8 instead of node6 + * using node8 instead of node6 * changes for new iobroker setup * v1.2.1beta (2018-09-12) * added support for firetv-adapter -### v1.2.0 (2018-08-21) +### v1.2.0 (2018-08-21) * v1.1.3beta (2018-08-21) * added ffmpeg-package for yahka to support webcams * v1.1.2beta (2018-04-04) diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile index a8cde0f..0c85450 100644 --- a/aarch64/Dockerfile +++ b/aarch64/Dockerfile @@ -1,7 +1,7 @@ -FROM balenalib/aarch64-debian:stretch +FROM balenalib/aarch64-debian:buster -LABEL maintainer="Andre Germann" \ - url="" +LABEL maintainer="Andre Germann" \ + url="https://buanet.de" ENV DEBIAN_FRONTEND noninteractive @@ -14,6 +14,7 @@ RUN apt-get update && apt-get install -y \ git \ gnupg2 \ gosu \ + jq \ libavahi-compat-libdnssd-dev \ libcap2-bin \ libpam0g-dev \ @@ -39,9 +40,11 @@ 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 +# Create scripts directorys and copy scripts RUN mkdir -p /opt/scripts/ \ - && chmod 777 /opt/scripts/ + && mkdir -p /opt/userscripts/ \ + && chmod 777 /opt/scripts/ \ + && chmod 777 /opt/userscripts/ WORKDIR /opt/scripts/ COPY scripts/iobroker_startup.sh iobroker_startup.sh COPY scripts/setup_avahi.sh setup_avahi.sh @@ -49,7 +52,11 @@ COPY scripts/setup_packages.sh setup_packages.sh COPY scripts/setup_zwave.sh setup_zwave.sh RUN chmod +x iobroker_startup.sh \ && chmod +x setup_avahi.sh \ - && chmod +x setup_packages.sh + && chmod +x setup_packages.sh \ + && chmod +x setup_zwave.sh +WORKDIR /opt/userscripts/ +COPY scripts/userscript_firststart_example.sh userscript_firststart_example.sh +COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh # Install ioBroker WORKDIR / @@ -63,27 +70,23 @@ RUN apt-get update \ WORKDIR /opt/iobroker/ RUN npm install -g node-gyp -# Backup initial ioBroker-folder -RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker +# Backup initial ioBroker and userscript folder +RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \ + && tar -cf /opt/initial_userscripts.tar /opt/userscripts # Setting up iobroker-user (shell and home directory) RUN chsh -s /bin/bash iobroker \ && usermod --home /opt/iobroker iobroker # Setting up ENVs -ENV ADMINPORT=8081 \ - AVAHI="false" \ - DEBIAN_FRONTEND="teletype" \ +ENV DEBIAN_FRONTEND="teletype" \ LANG="de_DE.UTF-8" \ LANGUAGE="de_DE:de" \ LC_ALL="de_DE.UTF-8" \ PACKAGES="vi" \ - REDIS="false" \ SETGID=1000 \ SETUID=1000 \ - TZ="Europe/Berlin" \ - USBDEVICES="none" \ - ZWAVE="false" - + TZ="Europe/Berlin" + # Run startup-script -ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"] +ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"] diff --git a/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh index 5653468..1e9b430 100644 --- a/aarch64/scripts/iobroker_startup.sh +++ b/aarch64/scripts/iobroker_startup.sh @@ -1,16 +1,21 @@ #!/bin/bash # Reading ENV -adminport=$ADMINPORT +adminport=$IOB_ADMINPORT avahi=$AVAHI -gid=$SETGID +objectsdbhost=$IOB_OBJECTSDB_HOST +objectsdbport=$IOB_OBJECTSDB_PORT +objectsdbtype=$IOB_OBJECTSDB_TYPE packages=$PACKAGES -redis=$REDIS -uid=$SETUID +setgid=$SETGID +setuid=$SETUID +statesdbhost=$IOB_STATESDB_HOST +statesdbport=$IOB_STATESDB_PORT +statesdbtype=$IOB_STATESDB_TYPE usbdevices=$USBDEVICES zwave=$ZWAVE -# Getting date and time for logging +# Getting date and time for logging dati=`date '+%Y-%m-%d %H:%M:%S'` # Logging header @@ -37,23 +42,23 @@ echo -n "----- " && echo -n "$(printf "%-10s %-23s" node: $(node - echo -n "----- " && echo -n "$(printf "%-10s %-23s" npm: $(npm -v))" && echo " -----" echo "----- -----" echo "----- ENV -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $ADMINPORT)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" AVAHI: $AVAHI)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" PACKAGES: $PACKAGES)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" REDIS: $REDIS)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETGID: $SETGID)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETUID: $SETUID)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $USBDEVICES)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" ZWAVE: $ZWAVE)" && echo " -----" +if [ "$adminport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $adminport)" && echo " -----"; fi +if [ "$avahi" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" AVAHI: $avahi)" && echo " -----"; fi +if [ "$objectsdbhost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi +if [ "$objectsdbport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi +if [ "$objectsdbtype" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi +if [ "$packages" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" PACKAGES: $packages)" && echo " -----"; fi +if [ "$setgid" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETGID: $setgid)" && echo " -----"; fi +if [ "$setuid" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETUID: $setuid)" && echo " -----"; fi +if [ "$statesdbhost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_HOST: $statesdbhost)" && echo " -----"; fi +if [ "$statesdbport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_PORT: $statesdbport)" && echo " -----"; fi +if [ "$statesdbtype" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_TYPE: $statesdbtype)" && echo " -----"; fi +if [ "$usbdevices" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $usbdevices)" && echo " -----"; fi +if [ "$zwave" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" ZWAVE: $zwave)" && echo " -----"; fi echo "$(printf -- '-%.0s' {1..60})" echo ' ' -# Not in use -# if [ -f /opt/.firstrun ] -# rm -f /opt/.firstrun - - ##### # STEP 1 - Preparing container ##### @@ -62,31 +67,30 @@ echo "----- Step 1 of 5: Preparing container -----" echo "$(printf -- '-%.0s' {1..60})" echo ' ' -# Installing additional packages -if [ "$packages" != "" ] +# Installing additional packages and setting uid/gid +if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ] then - echo "Installing additional packages is set by ENV." - 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 "Done." + if [ "$packages" != "" ] + then + echo "Installing additional packages is set by ENV." + echo "The following packages will be installed:" $packages"..." + echo $packages > /opt/scripts/.packages + bash /opt/scripts/setup_packages.sh + echo "Done." + echo ' ' + fi + if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ] + then + echo "Different UID and/ or GID is set by ENV." + echo "Changing UID to "$setuid" and GID to "$setgid"..." + usermod -u $setuid iobroker + groupmod -g $setgid iobroker + echo "Done." + echo ' ' + fi else - echo "There are no additional packages defined." + echo "Nothing to do here." fi -echo ' ' - -# Checking and setting uid/gid -if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $gid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $uid ] -then - echo "Different UID and/ or GID is set by ENV." - echo "Changing UID to "$uid" and GID to "$gid"..." - usermod -u $uid iobroker - groupmod -g $gid iobroker - echo "Done." -else - echo "There are no changes in UID/ GID needed." -fi -echo ' ' # Change directory for next steps cd /opt/iobroker @@ -142,10 +146,10 @@ echo "----- Step 3 of 5: Checking ioBroker installation -----" echo "$(printf -- '-%.0s' {1..60})" echo ' ' -# (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts" +# (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts" echo "(Re)Setting folder permissions (This might take a while! Please be patient!)..." - chown -R $uid:$gid /opt/iobroker - chown -R $uid:$gid /opt/scripts + chown -R $setuid:$setgid /opt/iobroker + chown -R $setuid:$setgid /opt/scripts echo "Done." echo ' ' @@ -162,15 +166,15 @@ if [ -f /opt/iobroker/.install_host ] then echo "Looks like this is a new and empty installation of ioBroker." echo "Hostname needs to be updated to " $(hostname)"..." - sh /opt/iobroker/iobroker host $(cat /opt/iobroker/.install_host) + bash iobroker host $(cat /opt/iobroker/.install_host) rm -f /opt/iobroker/.install_host echo 'Done.' echo ' ' -elif [ $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ] +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)"..." - sh /opt/iobroker/iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') + bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') echo 'Done.' echo ' ' fi @@ -188,68 +192,168 @@ echo "Some adapters have special requirements/ settings which can be activated b echo "For more information take a look at readme.md on Github!" echo ' ' + # Checking ENV for Adminport -if [ "$adminport" != $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ] +if [ "$adminport" != "" ] then - echo "Adminport set by ENV does not match port configured in ioBroker installation." - echo "Setting Adminport to" $adminport"..." - iobroker set admin.0 --port $adminport - echo 'Done.' - echo ' ' + if [ "$adminport" != $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ] + 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 ' ' + fi fi + # Checking ENV for AVAHI -if [ "$avahi" = "true" ] +if [ "$avahi" != "" ] then - echo "Avahi-daemon is activated by ENV." - chmod 764 /opt/scripts/setup_avahi.sh - sh /opt/scripts/setup_avahi.sh - echo "Done." - echo ' ' + if [ "$avahi" = "true" ] + then + echo "Avahi-daemon is activated by ENV." + chmod 755 /opt/scripts/setup_avahi.sh + bash /opt/scripts/setup_avahi.sh + echo "Done." + echo ' ' + fi fi + # Checking ENV for Z-WAVE -if [ "$zwave" = "true" ] +if [ "$zwave" != "" ] then - echo "Z-Wave is activated by ENV." - chmod 764 /opt/scripts/setup_zwave.sh - sh /opt/scripts/setup_zwave.sh - echo "Done." - echo ' ' + if [ "$zwave" = "true" ] + then + echo "Z-Wave is activated by ENV." + chmod 755 /opt/scripts/setup_zwave.sh + bash /opt/scripts/setup_zwave.sh + echo "Done." + echo ' ' + fi fi + # checking ENV for USBDEVICES -if [ "$usbdevices" != "none" ] +if [ "$usbdevices" != "" ] then - echo "Usb-device-support is activated by ENV." - - IFS=';' read -ra devicearray <<< "$usbdevices" - for i in "${devicearray[@]}" - do - echo "Setting permissions for" $i"..." - chown root:dialout $i - chmod g+rw $i - done - echo "Done." + if [ "$usbdevices" != "none" ] + then + echo "Usb-device-support is activated by ENV." + IFS=';' read -ra devicearray <<< "$usbdevices" + for i in "${devicearray[@]}" + do + echo "Setting permissions for" $i"..." + chown root:dialout $i + chmod g+rw $i + done + echo "Done." + echo ' ' + fi +fi + + +# Checking ENVs for custom setup of objects db +if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ] +then + if [ "$objectsdbtype" != $(jq '.objects.type' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation." + echo "Setting type of objects db to \""$objectsdbtype"\"..." + jq --arg objectsdbtype "$objectsdbtype" '.objects.type = $objectsdbtype' /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." + else + echo "ENV IOB_OBJECTSDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here." + fi + if [ "$objectsdbhost" != $(jq '.objects.host' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_OBJECTSDB_HOST is set and value is different from detected ioBroker installation." + echo "Setting host of objects db to \""$objectsdbhost"\"..." + jq --arg objectsdbhost "$objectsdbhost" '.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." + else + echo "ENV IOB_OBJECTSDB_HOST is set and value meets detected ioBroker installation. Nothing to do here." + fi + if [ "$objectsdbport" != $(jq '.objects.port' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_OBJECTSDB_PORT is set and value is different from detected ioBroker installation." + echo "Setting port of objects db to \""$objectsdbport"\"..." + jq --arg objectsdbport "$objectsdbport" '.objects.port = $objectsdbport' /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." + else + echo "ENV IOB_OBJECTSDB_PORT is set and value meets detected ioBroker installation. Nothing to do here." + fi echo ' ' fi -# Checking ENV for REDIS -if [ "$redis" != "false" ] + +# Checking ENVs for custom setup of states db# +if [ "$statesdbtype" != "" ] || [ "$statesdbhost" != "" ] || [ "$statesdbport" != "" ] then - echo "Connection to Redis is configured by ENV." - echo "Installing prerequisites..." - apt-get update 2>&1> /dev/null && apt-get install -y jq 2>&1> /dev/null && rm -rf /var/lib/apt/lists/* 2>&1> /dev/null - redisserver=$(echo $redis | sed -E 's/(.*):(.*)/\1/') - redisport=$(echo $redis | sed -E 's/(.*):(.*)/\2/') - echo "Setting configuration for Redis (Server: "$redisserver", Port: "$redisport") in ioBroker..." - cd /opt/iobroker/iobroker-data - jq --arg redisserver "$redisserver" --arg redisport "$redisport" '.states.type = "redis" | .states.host = $redisserver | .states.port = $redisport' iobroker.json > iobroker.json.tmp && mv iobroker.json.tmp iobroker.json - cd /opt/iobroker - echo "Done." + if [ "$statesdbtype" != $(jq '.states.type' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_STATESDB_TYPE is set and value is different from detected ioBroker installation." + echo "Setting type of states db to \""$statesdbtype"\"..." + jq --arg statesdbtype "$statesdbtype" '.states.type = $statesdbtype' /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." + else + echo "ENV IOB_STATESDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here." + fi + if [ "$statesdbhost" != $(jq '.states.host' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_STATESDB_HOST is set and value is different from detected ioBroker installation." + echo "Setting host of states db to \""$statesdbhost"\"..." + jq --arg statesdbhost "$statesdbhost" '.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." + else + echo "ENV IOB_STATESDB_HOST is set and value meets detected ioBroker installation. Nothing to do here." + fi + if [ "$statesdbport" != $(jq '.states.port' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_STATESDB_PORT is set and value is different from detected ioBroker installation." + echo "Setting port of states db to \""$statesdbport"\"..." + jq --arg statesdbport "$statesdbport" '.states.port = $statesdbport' /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." + else + echo "ENV IOB_STATESDB_PORT is set and value meets detected ioBroker installation. Nothing to do here." + fi echo ' ' fi + +# Checking for Userscripts in /opt/userscripts +if [ `find /opt/userscripts -type f | wc -l` -lt 1 ] +then + echo "There is no data detected in /opt/userscripts. Restoring exapmple userscripts..." + tar -xf /opt/initial_userscripts.tar -C / + chmod 755 /opt/userscripts/userscript_firststart_example.sh + chmod 755 /opt/userscripts/userscript_everystart_example.sh + echo "Done." + echo ' ' +elif [ -f /opt/userscripts/userscript_firststart.sh ] || [ -f /opt/userscripts/userscript_everystart.sh ] +then + if [ -f /opt/userscripts/userscript_firststart.sh ] && [ -f /opt/.firstrun ] + then + echo "Userscript for first start detected and this is the first start of a new container." + echo "Running userscript_firststart.sh..." + chmod 755 /opt/userscripts/userscript_firststart.sh + bash /opt/userscripts/userscript_firststart.sh + rm -f /opt/.firstrun + echo "Done." + echo ' ' + fi + if [ -f /opt/userscripts/userscript_everystart.sh ] + then + echo "Userscript for every start detected. Running userscript_everystart.sh..." + chmod 755 /opt/userscripts/userscript_everystart.sh + bash /opt/userscripts/userscript_everystart.sh + echo "Done." + echo ' ' + fi +fi + + sleep 5 diff --git a/aarch64/scripts/setup_packages.sh b/aarch64/scripts/setup_packages.sh index 8dc6848..449900f 100644 --- a/aarch64/scripts/setup_packages.sh +++ b/aarch64/scripts/setup_packages.sh @@ -1,7 +1,12 @@ #!/bin/bash -apt-get update -apt-get install -y $(cat /opt/scripts/.packages) +apt-get -qq update + +packages=$(cat /opt/scripts/.packages) +for i in $packages; do + sudo apt-get -qq -y install $i +done + rm -rf /var/lib/apt/lists/* rm -f /opt/scripts/.packages diff --git a/aarch64/scripts/setup_zwave.sh b/aarch64/scripts/setup_zwave.sh index e9710d0..11d8024 100644 --- a/aarch64/scripts/setup_zwave.sh +++ b/aarch64/scripts/setup_zwave.sh @@ -8,9 +8,9 @@ then else echo "Openzwave is NOT installed. Going to install it now..." cd /opt - curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.945.tar.gz - tar -xf openzwave-1.6.945.tar.gz && rm openzwave-1.6.945.tar.gz - cd openzwave-1.6.945 && make > /dev/null 2>&1 && make install > /dev/null 2>&1 + curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.1007.tar.gz + tar -xf openzwave-1.6.1007.tar.gz && rm openzwave-1.6.1007.tar.gz + cd openzwave-1.6.1007 && make > /dev/null 2>&1 && make install > /dev/null 2>&1 ldconfig /usr/local/lib64 cd /opt/iobroker # echo "Openzwave is now installed..." diff --git a/aarch64/scripts/userscript_everystart_example.sh b/aarch64/scripts/userscript_everystart_example.sh new file mode 100644 index 0000000..9023677 --- /dev/null +++ b/aarch64/scripts/userscript_everystart_example.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +# This is an example script file. +# To run the Script on every start of the container you have to rename it to userscript_everystart.sh. + +# You can add your advanced script code here! + +echo ' ' +echo "I'm your startscript userscript_everystart.sh. I will run on EVERY container startup." +echo ' ' + + +exit 0 diff --git a/aarch64/scripts/userscript_firststart_example.sh b/aarch64/scripts/userscript_firststart_example.sh new file mode 100644 index 0000000..4fef50d --- /dev/null +++ b/aarch64/scripts/userscript_firststart_example.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# This is an example script file. +# To run the Script on the first start of a new container you have to rename it to userscript_firststart.sh. + +# You can add your advanced script code here! + +echo ' ' +echo "I'm your startscript userscript_firststart.sh. I will run only on the FIRST startup of the container." +echo ' ' + +exit 0 diff --git a/amd64/Dockerfile b/amd64/Dockerfile index 43dd2fe..9f15b1d 100644 --- a/amd64/Dockerfile +++ b/amd64/Dockerfile @@ -1,7 +1,7 @@ -FROM debian:stretch +FROM amd64/debian:buster -LABEL maintainer="Andre Germann" \ - url="" +LABEL maintainer="Andre Germann" \ + url="https://buanet.de" ENV DEBIAN_FRONTEND noninteractive @@ -14,6 +14,7 @@ RUN apt-get update && apt-get install -y \ git \ gnupg2 \ gosu \ + jq \ libavahi-compat-libdnssd-dev \ libcap2-bin \ libpam0g-dev \ @@ -39,9 +40,11 @@ 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 +# Create scripts directorys and copy scripts RUN mkdir -p /opt/scripts/ \ - && chmod 777 /opt/scripts/ + && mkdir -p /opt/userscripts/ \ + && chmod 777 /opt/scripts/ \ + && chmod 777 /opt/userscripts/ WORKDIR /opt/scripts/ COPY scripts/iobroker_startup.sh iobroker_startup.sh COPY scripts/setup_avahi.sh setup_avahi.sh @@ -49,7 +52,11 @@ COPY scripts/setup_packages.sh setup_packages.sh COPY scripts/setup_zwave.sh setup_zwave.sh RUN chmod +x iobroker_startup.sh \ && chmod +x setup_avahi.sh \ - && chmod +x setup_packages.sh + && chmod +x setup_packages.sh \ + && chmod +x setup_zwave.sh +WORKDIR /opt/userscripts/ +COPY scripts/userscript_firststart_example.sh userscript_firststart_example.sh +COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh # Install ioBroker WORKDIR / @@ -63,27 +70,23 @@ RUN apt-get update \ WORKDIR /opt/iobroker/ RUN npm install -g node-gyp -# Backup initial ioBroker-folder -RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker +# Backup initial ioBroker and userscript folder +RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \ + && tar -cf /opt/initial_userscripts.tar /opt/userscripts # Setting up iobroker-user (shell and home directory) RUN chsh -s /bin/bash iobroker \ && usermod --home /opt/iobroker iobroker # Setting up ENVs -ENV ADMINPORT=8081 \ - AVAHI="false" \ - DEBIAN_FRONTEND="teletype" \ +ENV DEBIAN_FRONTEND="teletype" \ LANG="de_DE.UTF-8" \ LANGUAGE="de_DE:de" \ LC_ALL="de_DE.UTF-8" \ PACKAGES="vi" \ - REDIS="false" \ SETGID=1000 \ SETUID=1000 \ - TZ="Europe/Berlin" \ - USBDEVICES="none" \ - ZWAVE="false" - + TZ="Europe/Berlin" + # Run startup-script -ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"] +ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"] diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh index 5653468..1e9b430 100644 --- a/amd64/scripts/iobroker_startup.sh +++ b/amd64/scripts/iobroker_startup.sh @@ -1,16 +1,21 @@ #!/bin/bash # Reading ENV -adminport=$ADMINPORT +adminport=$IOB_ADMINPORT avahi=$AVAHI -gid=$SETGID +objectsdbhost=$IOB_OBJECTSDB_HOST +objectsdbport=$IOB_OBJECTSDB_PORT +objectsdbtype=$IOB_OBJECTSDB_TYPE packages=$PACKAGES -redis=$REDIS -uid=$SETUID +setgid=$SETGID +setuid=$SETUID +statesdbhost=$IOB_STATESDB_HOST +statesdbport=$IOB_STATESDB_PORT +statesdbtype=$IOB_STATESDB_TYPE usbdevices=$USBDEVICES zwave=$ZWAVE -# Getting date and time for logging +# Getting date and time for logging dati=`date '+%Y-%m-%d %H:%M:%S'` # Logging header @@ -37,23 +42,23 @@ echo -n "----- " && echo -n "$(printf "%-10s %-23s" node: $(node - echo -n "----- " && echo -n "$(printf "%-10s %-23s" npm: $(npm -v))" && echo " -----" echo "----- -----" echo "----- ENV -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $ADMINPORT)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" AVAHI: $AVAHI)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" PACKAGES: $PACKAGES)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" REDIS: $REDIS)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETGID: $SETGID)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETUID: $SETUID)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $USBDEVICES)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" ZWAVE: $ZWAVE)" && echo " -----" +if [ "$adminport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $adminport)" && echo " -----"; fi +if [ "$avahi" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" AVAHI: $avahi)" && echo " -----"; fi +if [ "$objectsdbhost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi +if [ "$objectsdbport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi +if [ "$objectsdbtype" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi +if [ "$packages" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" PACKAGES: $packages)" && echo " -----"; fi +if [ "$setgid" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETGID: $setgid)" && echo " -----"; fi +if [ "$setuid" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETUID: $setuid)" && echo " -----"; fi +if [ "$statesdbhost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_HOST: $statesdbhost)" && echo " -----"; fi +if [ "$statesdbport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_PORT: $statesdbport)" && echo " -----"; fi +if [ "$statesdbtype" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_TYPE: $statesdbtype)" && echo " -----"; fi +if [ "$usbdevices" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $usbdevices)" && echo " -----"; fi +if [ "$zwave" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" ZWAVE: $zwave)" && echo " -----"; fi echo "$(printf -- '-%.0s' {1..60})" echo ' ' -# Not in use -# if [ -f /opt/.firstrun ] -# rm -f /opt/.firstrun - - ##### # STEP 1 - Preparing container ##### @@ -62,31 +67,30 @@ echo "----- Step 1 of 5: Preparing container -----" echo "$(printf -- '-%.0s' {1..60})" echo ' ' -# Installing additional packages -if [ "$packages" != "" ] +# Installing additional packages and setting uid/gid +if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ] then - echo "Installing additional packages is set by ENV." - 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 "Done." + if [ "$packages" != "" ] + then + echo "Installing additional packages is set by ENV." + echo "The following packages will be installed:" $packages"..." + echo $packages > /opt/scripts/.packages + bash /opt/scripts/setup_packages.sh + echo "Done." + echo ' ' + fi + if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ] + then + echo "Different UID and/ or GID is set by ENV." + echo "Changing UID to "$setuid" and GID to "$setgid"..." + usermod -u $setuid iobroker + groupmod -g $setgid iobroker + echo "Done." + echo ' ' + fi else - echo "There are no additional packages defined." + echo "Nothing to do here." fi -echo ' ' - -# Checking and setting uid/gid -if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $gid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $uid ] -then - echo "Different UID and/ or GID is set by ENV." - echo "Changing UID to "$uid" and GID to "$gid"..." - usermod -u $uid iobroker - groupmod -g $gid iobroker - echo "Done." -else - echo "There are no changes in UID/ GID needed." -fi -echo ' ' # Change directory for next steps cd /opt/iobroker @@ -142,10 +146,10 @@ echo "----- Step 3 of 5: Checking ioBroker installation -----" echo "$(printf -- '-%.0s' {1..60})" echo ' ' -# (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts" +# (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts" echo "(Re)Setting folder permissions (This might take a while! Please be patient!)..." - chown -R $uid:$gid /opt/iobroker - chown -R $uid:$gid /opt/scripts + chown -R $setuid:$setgid /opt/iobroker + chown -R $setuid:$setgid /opt/scripts echo "Done." echo ' ' @@ -162,15 +166,15 @@ if [ -f /opt/iobroker/.install_host ] then echo "Looks like this is a new and empty installation of ioBroker." echo "Hostname needs to be updated to " $(hostname)"..." - sh /opt/iobroker/iobroker host $(cat /opt/iobroker/.install_host) + bash iobroker host $(cat /opt/iobroker/.install_host) rm -f /opt/iobroker/.install_host echo 'Done.' echo ' ' -elif [ $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ] +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)"..." - sh /opt/iobroker/iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') + bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') echo 'Done.' echo ' ' fi @@ -188,68 +192,168 @@ echo "Some adapters have special requirements/ settings which can be activated b echo "For more information take a look at readme.md on Github!" echo ' ' + # Checking ENV for Adminport -if [ "$adminport" != $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ] +if [ "$adminport" != "" ] then - echo "Adminport set by ENV does not match port configured in ioBroker installation." - echo "Setting Adminport to" $adminport"..." - iobroker set admin.0 --port $adminport - echo 'Done.' - echo ' ' + if [ "$adminport" != $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ] + 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 ' ' + fi fi + # Checking ENV for AVAHI -if [ "$avahi" = "true" ] +if [ "$avahi" != "" ] then - echo "Avahi-daemon is activated by ENV." - chmod 764 /opt/scripts/setup_avahi.sh - sh /opt/scripts/setup_avahi.sh - echo "Done." - echo ' ' + if [ "$avahi" = "true" ] + then + echo "Avahi-daemon is activated by ENV." + chmod 755 /opt/scripts/setup_avahi.sh + bash /opt/scripts/setup_avahi.sh + echo "Done." + echo ' ' + fi fi + # Checking ENV for Z-WAVE -if [ "$zwave" = "true" ] +if [ "$zwave" != "" ] then - echo "Z-Wave is activated by ENV." - chmod 764 /opt/scripts/setup_zwave.sh - sh /opt/scripts/setup_zwave.sh - echo "Done." - echo ' ' + if [ "$zwave" = "true" ] + then + echo "Z-Wave is activated by ENV." + chmod 755 /opt/scripts/setup_zwave.sh + bash /opt/scripts/setup_zwave.sh + echo "Done." + echo ' ' + fi fi + # checking ENV for USBDEVICES -if [ "$usbdevices" != "none" ] +if [ "$usbdevices" != "" ] then - echo "Usb-device-support is activated by ENV." - - IFS=';' read -ra devicearray <<< "$usbdevices" - for i in "${devicearray[@]}" - do - echo "Setting permissions for" $i"..." - chown root:dialout $i - chmod g+rw $i - done - echo "Done." + if [ "$usbdevices" != "none" ] + then + echo "Usb-device-support is activated by ENV." + IFS=';' read -ra devicearray <<< "$usbdevices" + for i in "${devicearray[@]}" + do + echo "Setting permissions for" $i"..." + chown root:dialout $i + chmod g+rw $i + done + echo "Done." + echo ' ' + fi +fi + + +# Checking ENVs for custom setup of objects db +if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ] +then + if [ "$objectsdbtype" != $(jq '.objects.type' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation." + echo "Setting type of objects db to \""$objectsdbtype"\"..." + jq --arg objectsdbtype "$objectsdbtype" '.objects.type = $objectsdbtype' /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." + else + echo "ENV IOB_OBJECTSDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here." + fi + if [ "$objectsdbhost" != $(jq '.objects.host' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_OBJECTSDB_HOST is set and value is different from detected ioBroker installation." + echo "Setting host of objects db to \""$objectsdbhost"\"..." + jq --arg objectsdbhost "$objectsdbhost" '.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." + else + echo "ENV IOB_OBJECTSDB_HOST is set and value meets detected ioBroker installation. Nothing to do here." + fi + if [ "$objectsdbport" != $(jq '.objects.port' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_OBJECTSDB_PORT is set and value is different from detected ioBroker installation." + echo "Setting port of objects db to \""$objectsdbport"\"..." + jq --arg objectsdbport "$objectsdbport" '.objects.port = $objectsdbport' /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." + else + echo "ENV IOB_OBJECTSDB_PORT is set and value meets detected ioBroker installation. Nothing to do here." + fi echo ' ' fi -# Checking ENV for REDIS -if [ "$redis" != "false" ] + +# Checking ENVs for custom setup of states db# +if [ "$statesdbtype" != "" ] || [ "$statesdbhost" != "" ] || [ "$statesdbport" != "" ] then - echo "Connection to Redis is configured by ENV." - echo "Installing prerequisites..." - apt-get update 2>&1> /dev/null && apt-get install -y jq 2>&1> /dev/null && rm -rf /var/lib/apt/lists/* 2>&1> /dev/null - redisserver=$(echo $redis | sed -E 's/(.*):(.*)/\1/') - redisport=$(echo $redis | sed -E 's/(.*):(.*)/\2/') - echo "Setting configuration for Redis (Server: "$redisserver", Port: "$redisport") in ioBroker..." - cd /opt/iobroker/iobroker-data - jq --arg redisserver "$redisserver" --arg redisport "$redisport" '.states.type = "redis" | .states.host = $redisserver | .states.port = $redisport' iobroker.json > iobroker.json.tmp && mv iobroker.json.tmp iobroker.json - cd /opt/iobroker - echo "Done." + if [ "$statesdbtype" != $(jq '.states.type' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_STATESDB_TYPE is set and value is different from detected ioBroker installation." + echo "Setting type of states db to \""$statesdbtype"\"..." + jq --arg statesdbtype "$statesdbtype" '.states.type = $statesdbtype' /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." + else + echo "ENV IOB_STATESDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here." + fi + if [ "$statesdbhost" != $(jq '.states.host' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_STATESDB_HOST is set and value is different from detected ioBroker installation." + echo "Setting host of states db to \""$statesdbhost"\"..." + jq --arg statesdbhost "$statesdbhost" '.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." + else + echo "ENV IOB_STATESDB_HOST is set and value meets detected ioBroker installation. Nothing to do here." + fi + if [ "$statesdbport" != $(jq '.states.port' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_STATESDB_PORT is set and value is different from detected ioBroker installation." + echo "Setting port of states db to \""$statesdbport"\"..." + jq --arg statesdbport "$statesdbport" '.states.port = $statesdbport' /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." + else + echo "ENV IOB_STATESDB_PORT is set and value meets detected ioBroker installation. Nothing to do here." + fi echo ' ' fi + +# Checking for Userscripts in /opt/userscripts +if [ `find /opt/userscripts -type f | wc -l` -lt 1 ] +then + echo "There is no data detected in /opt/userscripts. Restoring exapmple userscripts..." + tar -xf /opt/initial_userscripts.tar -C / + chmod 755 /opt/userscripts/userscript_firststart_example.sh + chmod 755 /opt/userscripts/userscript_everystart_example.sh + echo "Done." + echo ' ' +elif [ -f /opt/userscripts/userscript_firststart.sh ] || [ -f /opt/userscripts/userscript_everystart.sh ] +then + if [ -f /opt/userscripts/userscript_firststart.sh ] && [ -f /opt/.firstrun ] + then + echo "Userscript for first start detected and this is the first start of a new container." + echo "Running userscript_firststart.sh..." + chmod 755 /opt/userscripts/userscript_firststart.sh + bash /opt/userscripts/userscript_firststart.sh + rm -f /opt/.firstrun + echo "Done." + echo ' ' + fi + if [ -f /opt/userscripts/userscript_everystart.sh ] + then + echo "Userscript for every start detected. Running userscript_everystart.sh..." + chmod 755 /opt/userscripts/userscript_everystart.sh + bash /opt/userscripts/userscript_everystart.sh + echo "Done." + echo ' ' + fi +fi + + sleep 5 diff --git a/amd64/scripts/setup_packages.sh b/amd64/scripts/setup_packages.sh index 8dc6848..449900f 100644 --- a/amd64/scripts/setup_packages.sh +++ b/amd64/scripts/setup_packages.sh @@ -1,7 +1,12 @@ #!/bin/bash -apt-get update -apt-get install -y $(cat /opt/scripts/.packages) +apt-get -qq update + +packages=$(cat /opt/scripts/.packages) +for i in $packages; do + sudo apt-get -qq -y install $i +done + rm -rf /var/lib/apt/lists/* rm -f /opt/scripts/.packages diff --git a/amd64/scripts/setup_zwave.sh b/amd64/scripts/setup_zwave.sh index e9710d0..11d8024 100644 --- a/amd64/scripts/setup_zwave.sh +++ b/amd64/scripts/setup_zwave.sh @@ -8,9 +8,9 @@ then else echo "Openzwave is NOT installed. Going to install it now..." cd /opt - curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.945.tar.gz - tar -xf openzwave-1.6.945.tar.gz && rm openzwave-1.6.945.tar.gz - cd openzwave-1.6.945 && make > /dev/null 2>&1 && make install > /dev/null 2>&1 + curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.1007.tar.gz + tar -xf openzwave-1.6.1007.tar.gz && rm openzwave-1.6.1007.tar.gz + cd openzwave-1.6.1007 && make > /dev/null 2>&1 && make install > /dev/null 2>&1 ldconfig /usr/local/lib64 cd /opt/iobroker # echo "Openzwave is now installed..." diff --git a/amd64/scripts/userscript_everystart_example.sh b/amd64/scripts/userscript_everystart_example.sh new file mode 100644 index 0000000..9023677 --- /dev/null +++ b/amd64/scripts/userscript_everystart_example.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +# This is an example script file. +# To run the Script on every start of the container you have to rename it to userscript_everystart.sh. + +# You can add your advanced script code here! + +echo ' ' +echo "I'm your startscript userscript_everystart.sh. I will run on EVERY container startup." +echo ' ' + + +exit 0 diff --git a/amd64/scripts/userscript_firststart_example.sh b/amd64/scripts/userscript_firststart_example.sh new file mode 100644 index 0000000..4fef50d --- /dev/null +++ b/amd64/scripts/userscript_firststart_example.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# This is an example script file. +# To run the Script on the first start of a new container you have to rename it to userscript_firststart.sh. + +# You can add your advanced script code here! + +echo ' ' +echo "I'm your startscript userscript_firststart.sh. I will run only on the FIRST startup of the container." +echo ' ' + +exit 0 diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile index 3a159a9..54df7f9 100644 --- a/armv7hf/Dockerfile +++ b/armv7hf/Dockerfile @@ -1,8 +1,8 @@ -FROM balenalib/armv7hf-debian:stretch +FROM balenalib/armv7hf-debian:buster + +LABEL maintainer="Andre Germann" \ + url="https://buanet.de" -LABEL maintainer="Andre Germann" \ - url="" - ENV DEBIAN_FRONTEND noninteractive # Install prerequisites (as listed in iobroker installer.sh) @@ -14,6 +14,7 @@ RUN apt-get update && apt-get install -y \ git \ gnupg2 \ gosu \ + jq \ libavahi-compat-libdnssd-dev \ libcap2-bin \ libpam0g-dev \ @@ -39,9 +40,11 @@ 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 +# Create scripts directorys and copy scripts RUN mkdir -p /opt/scripts/ \ - && chmod 777 /opt/scripts/ + && mkdir -p /opt/userscripts/ \ + && chmod 777 /opt/scripts/ \ + && chmod 777 /opt/userscripts/ WORKDIR /opt/scripts/ COPY scripts/iobroker_startup.sh iobroker_startup.sh COPY scripts/setup_avahi.sh setup_avahi.sh @@ -49,7 +52,11 @@ COPY scripts/setup_packages.sh setup_packages.sh COPY scripts/setup_zwave.sh setup_zwave.sh RUN chmod +x iobroker_startup.sh \ && chmod +x setup_avahi.sh \ - && chmod +x setup_packages.sh + && chmod +x setup_packages.sh \ + && chmod +x setup_zwave.sh +WORKDIR /opt/userscripts/ +COPY scripts/userscript_firststart_example.sh userscript_firststart_example.sh +COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh # Install ioBroker WORKDIR / @@ -63,27 +70,23 @@ RUN apt-get update \ WORKDIR /opt/iobroker/ RUN npm install -g node-gyp -# Backup initial ioBroker-folder -RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker +# Backup initial ioBroker and userscript folder +RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \ + && tar -cf /opt/initial_userscripts.tar /opt/userscripts # Setting up iobroker-user (shell and home directory) RUN chsh -s /bin/bash iobroker \ && usermod --home /opt/iobroker iobroker # Setting up ENVs -ENV ADMINPORT=8081 \ - AVAHI="false" \ - DEBIAN_FRONTEND="teletype" \ +ENV DEBIAN_FRONTEND="teletype" \ LANG="de_DE.UTF-8" \ LANGUAGE="de_DE:de" \ LC_ALL="de_DE.UTF-8" \ - PACKAGES="vi" \ - REDIS="false" \ + PACKAGES="vim" \ SETGID=1000 \ SETUID=1000 \ - TZ="Europe/Berlin" \ - USBDEVICES="none" \ - ZWAVE="false" - + TZ="Europe/Berlin" + # Run startup-script -ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"] +ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"] diff --git a/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh index 5653468..1e9b430 100644 --- a/armv7hf/scripts/iobroker_startup.sh +++ b/armv7hf/scripts/iobroker_startup.sh @@ -1,16 +1,21 @@ #!/bin/bash # Reading ENV -adminport=$ADMINPORT +adminport=$IOB_ADMINPORT avahi=$AVAHI -gid=$SETGID +objectsdbhost=$IOB_OBJECTSDB_HOST +objectsdbport=$IOB_OBJECTSDB_PORT +objectsdbtype=$IOB_OBJECTSDB_TYPE packages=$PACKAGES -redis=$REDIS -uid=$SETUID +setgid=$SETGID +setuid=$SETUID +statesdbhost=$IOB_STATESDB_HOST +statesdbport=$IOB_STATESDB_PORT +statesdbtype=$IOB_STATESDB_TYPE usbdevices=$USBDEVICES zwave=$ZWAVE -# Getting date and time for logging +# Getting date and time for logging dati=`date '+%Y-%m-%d %H:%M:%S'` # Logging header @@ -37,23 +42,23 @@ echo -n "----- " && echo -n "$(printf "%-10s %-23s" node: $(node - echo -n "----- " && echo -n "$(printf "%-10s %-23s" npm: $(npm -v))" && echo " -----" echo "----- -----" echo "----- ENV -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $ADMINPORT)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" AVAHI: $AVAHI)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" PACKAGES: $PACKAGES)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" REDIS: $REDIS)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETGID: $SETGID)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETUID: $SETUID)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $USBDEVICES)" && echo " -----" -echo -n "----- " && echo -n "$(printf "%-10s %-23s" ZWAVE: $ZWAVE)" && echo " -----" +if [ "$adminport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" ADMINPORT: $adminport)" && echo " -----"; fi +if [ "$avahi" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" AVAHI: $avahi)" && echo " -----"; fi +if [ "$objectsdbhost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi +if [ "$objectsdbport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi +if [ "$objectsdbtype" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi +if [ "$packages" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" PACKAGES: $packages)" && echo " -----"; fi +if [ "$setgid" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETGID: $setgid)" && echo " -----"; fi +if [ "$setuid" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETUID: $setuid)" && echo " -----"; fi +if [ "$statesdbhost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_HOST: $statesdbhost)" && echo " -----"; fi +if [ "$statesdbport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_PORT: $statesdbport)" && echo " -----"; fi +if [ "$statesdbtype" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_TYPE: $statesdbtype)" && echo " -----"; fi +if [ "$usbdevices" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $usbdevices)" && echo " -----"; fi +if [ "$zwave" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" ZWAVE: $zwave)" && echo " -----"; fi echo "$(printf -- '-%.0s' {1..60})" echo ' ' -# Not in use -# if [ -f /opt/.firstrun ] -# rm -f /opt/.firstrun - - ##### # STEP 1 - Preparing container ##### @@ -62,31 +67,30 @@ echo "----- Step 1 of 5: Preparing container -----" echo "$(printf -- '-%.0s' {1..60})" echo ' ' -# Installing additional packages -if [ "$packages" != "" ] +# Installing additional packages and setting uid/gid +if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ] then - echo "Installing additional packages is set by ENV." - 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 "Done." + if [ "$packages" != "" ] + then + echo "Installing additional packages is set by ENV." + echo "The following packages will be installed:" $packages"..." + echo $packages > /opt/scripts/.packages + bash /opt/scripts/setup_packages.sh + echo "Done." + echo ' ' + fi + if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ] + then + echo "Different UID and/ or GID is set by ENV." + echo "Changing UID to "$setuid" and GID to "$setgid"..." + usermod -u $setuid iobroker + groupmod -g $setgid iobroker + echo "Done." + echo ' ' + fi else - echo "There are no additional packages defined." + echo "Nothing to do here." fi -echo ' ' - -# Checking and setting uid/gid -if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $gid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $uid ] -then - echo "Different UID and/ or GID is set by ENV." - echo "Changing UID to "$uid" and GID to "$gid"..." - usermod -u $uid iobroker - groupmod -g $gid iobroker - echo "Done." -else - echo "There are no changes in UID/ GID needed." -fi -echo ' ' # Change directory for next steps cd /opt/iobroker @@ -142,10 +146,10 @@ echo "----- Step 3 of 5: Checking ioBroker installation -----" echo "$(printf -- '-%.0s' {1..60})" echo ' ' -# (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts" +# (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts" echo "(Re)Setting folder permissions (This might take a while! Please be patient!)..." - chown -R $uid:$gid /opt/iobroker - chown -R $uid:$gid /opt/scripts + chown -R $setuid:$setgid /opt/iobroker + chown -R $setuid:$setgid /opt/scripts echo "Done." echo ' ' @@ -162,15 +166,15 @@ if [ -f /opt/iobroker/.install_host ] then echo "Looks like this is a new and empty installation of ioBroker." echo "Hostname needs to be updated to " $(hostname)"..." - sh /opt/iobroker/iobroker host $(cat /opt/iobroker/.install_host) + bash iobroker host $(cat /opt/iobroker/.install_host) rm -f /opt/iobroker/.install_host echo 'Done.' echo ' ' -elif [ $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ] +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)"..." - sh /opt/iobroker/iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') + bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') echo 'Done.' echo ' ' fi @@ -188,68 +192,168 @@ echo "Some adapters have special requirements/ settings which can be activated b echo "For more information take a look at readme.md on Github!" echo ' ' + # Checking ENV for Adminport -if [ "$adminport" != $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ] +if [ "$adminport" != "" ] then - echo "Adminport set by ENV does not match port configured in ioBroker installation." - echo "Setting Adminport to" $adminport"..." - iobroker set admin.0 --port $adminport - echo 'Done.' - echo ' ' + if [ "$adminport" != $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ] + 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 ' ' + fi fi + # Checking ENV for AVAHI -if [ "$avahi" = "true" ] +if [ "$avahi" != "" ] then - echo "Avahi-daemon is activated by ENV." - chmod 764 /opt/scripts/setup_avahi.sh - sh /opt/scripts/setup_avahi.sh - echo "Done." - echo ' ' + if [ "$avahi" = "true" ] + then + echo "Avahi-daemon is activated by ENV." + chmod 755 /opt/scripts/setup_avahi.sh + bash /opt/scripts/setup_avahi.sh + echo "Done." + echo ' ' + fi fi + # Checking ENV for Z-WAVE -if [ "$zwave" = "true" ] +if [ "$zwave" != "" ] then - echo "Z-Wave is activated by ENV." - chmod 764 /opt/scripts/setup_zwave.sh - sh /opt/scripts/setup_zwave.sh - echo "Done." - echo ' ' + if [ "$zwave" = "true" ] + then + echo "Z-Wave is activated by ENV." + chmod 755 /opt/scripts/setup_zwave.sh + bash /opt/scripts/setup_zwave.sh + echo "Done." + echo ' ' + fi fi + # checking ENV for USBDEVICES -if [ "$usbdevices" != "none" ] +if [ "$usbdevices" != "" ] then - echo "Usb-device-support is activated by ENV." - - IFS=';' read -ra devicearray <<< "$usbdevices" - for i in "${devicearray[@]}" - do - echo "Setting permissions for" $i"..." - chown root:dialout $i - chmod g+rw $i - done - echo "Done." + if [ "$usbdevices" != "none" ] + then + echo "Usb-device-support is activated by ENV." + IFS=';' read -ra devicearray <<< "$usbdevices" + for i in "${devicearray[@]}" + do + echo "Setting permissions for" $i"..." + chown root:dialout $i + chmod g+rw $i + done + echo "Done." + echo ' ' + fi +fi + + +# Checking ENVs for custom setup of objects db +if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ] +then + if [ "$objectsdbtype" != $(jq '.objects.type' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation." + echo "Setting type of objects db to \""$objectsdbtype"\"..." + jq --arg objectsdbtype "$objectsdbtype" '.objects.type = $objectsdbtype' /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." + else + echo "ENV IOB_OBJECTSDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here." + fi + if [ "$objectsdbhost" != $(jq '.objects.host' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_OBJECTSDB_HOST is set and value is different from detected ioBroker installation." + echo "Setting host of objects db to \""$objectsdbhost"\"..." + jq --arg objectsdbhost "$objectsdbhost" '.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." + else + echo "ENV IOB_OBJECTSDB_HOST is set and value meets detected ioBroker installation. Nothing to do here." + fi + if [ "$objectsdbport" != $(jq '.objects.port' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_OBJECTSDB_PORT is set and value is different from detected ioBroker installation." + echo "Setting port of objects db to \""$objectsdbport"\"..." + jq --arg objectsdbport "$objectsdbport" '.objects.port = $objectsdbport' /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." + else + echo "ENV IOB_OBJECTSDB_PORT is set and value meets detected ioBroker installation. Nothing to do here." + fi echo ' ' fi -# Checking ENV for REDIS -if [ "$redis" != "false" ] + +# Checking ENVs for custom setup of states db# +if [ "$statesdbtype" != "" ] || [ "$statesdbhost" != "" ] || [ "$statesdbport" != "" ] then - echo "Connection to Redis is configured by ENV." - echo "Installing prerequisites..." - apt-get update 2>&1> /dev/null && apt-get install -y jq 2>&1> /dev/null && rm -rf /var/lib/apt/lists/* 2>&1> /dev/null - redisserver=$(echo $redis | sed -E 's/(.*):(.*)/\1/') - redisport=$(echo $redis | sed -E 's/(.*):(.*)/\2/') - echo "Setting configuration for Redis (Server: "$redisserver", Port: "$redisport") in ioBroker..." - cd /opt/iobroker/iobroker-data - jq --arg redisserver "$redisserver" --arg redisport "$redisport" '.states.type = "redis" | .states.host = $redisserver | .states.port = $redisport' iobroker.json > iobroker.json.tmp && mv iobroker.json.tmp iobroker.json - cd /opt/iobroker - echo "Done." + if [ "$statesdbtype" != $(jq '.states.type' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_STATESDB_TYPE is set and value is different from detected ioBroker installation." + echo "Setting type of states db to \""$statesdbtype"\"..." + jq --arg statesdbtype "$statesdbtype" '.states.type = $statesdbtype' /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." + else + echo "ENV IOB_STATESDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here." + fi + if [ "$statesdbhost" != $(jq '.states.host' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_STATESDB_HOST is set and value is different from detected ioBroker installation." + echo "Setting host of states db to \""$statesdbhost"\"..." + jq --arg statesdbhost "$statesdbhost" '.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." + else + echo "ENV IOB_STATESDB_HOST is set and value meets detected ioBroker installation. Nothing to do here." + fi + if [ "$statesdbport" != $(jq '.states.port' /opt/iobroker/iobroker-data/iobroker.json) ] + then + echo "ENV IOB_STATESDB_PORT is set and value is different from detected ioBroker installation." + echo "Setting port of states db to \""$statesdbport"\"..." + jq --arg statesdbport "$statesdbport" '.states.port = $statesdbport' /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." + else + echo "ENV IOB_STATESDB_PORT is set and value meets detected ioBroker installation. Nothing to do here." + fi echo ' ' fi + +# Checking for Userscripts in /opt/userscripts +if [ `find /opt/userscripts -type f | wc -l` -lt 1 ] +then + echo "There is no data detected in /opt/userscripts. Restoring exapmple userscripts..." + tar -xf /opt/initial_userscripts.tar -C / + chmod 755 /opt/userscripts/userscript_firststart_example.sh + chmod 755 /opt/userscripts/userscript_everystart_example.sh + echo "Done." + echo ' ' +elif [ -f /opt/userscripts/userscript_firststart.sh ] || [ -f /opt/userscripts/userscript_everystart.sh ] +then + if [ -f /opt/userscripts/userscript_firststart.sh ] && [ -f /opt/.firstrun ] + then + echo "Userscript for first start detected and this is the first start of a new container." + echo "Running userscript_firststart.sh..." + chmod 755 /opt/userscripts/userscript_firststart.sh + bash /opt/userscripts/userscript_firststart.sh + rm -f /opt/.firstrun + echo "Done." + echo ' ' + fi + if [ -f /opt/userscripts/userscript_everystart.sh ] + then + echo "Userscript for every start detected. Running userscript_everystart.sh..." + chmod 755 /opt/userscripts/userscript_everystart.sh + bash /opt/userscripts/userscript_everystart.sh + echo "Done." + echo ' ' + fi +fi + + sleep 5 diff --git a/armv7hf/scripts/setup_packages.sh b/armv7hf/scripts/setup_packages.sh index 8dc6848..449900f 100644 --- a/armv7hf/scripts/setup_packages.sh +++ b/armv7hf/scripts/setup_packages.sh @@ -1,7 +1,12 @@ #!/bin/bash -apt-get update -apt-get install -y $(cat /opt/scripts/.packages) +apt-get -qq update + +packages=$(cat /opt/scripts/.packages) +for i in $packages; do + sudo apt-get -qq -y install $i +done + rm -rf /var/lib/apt/lists/* rm -f /opt/scripts/.packages diff --git a/armv7hf/scripts/setup_zwave.sh b/armv7hf/scripts/setup_zwave.sh index e9710d0..11d8024 100644 --- a/armv7hf/scripts/setup_zwave.sh +++ b/armv7hf/scripts/setup_zwave.sh @@ -8,9 +8,9 @@ then else echo "Openzwave is NOT installed. Going to install it now..." cd /opt - curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.945.tar.gz - tar -xf openzwave-1.6.945.tar.gz && rm openzwave-1.6.945.tar.gz - cd openzwave-1.6.945 && make > /dev/null 2>&1 && make install > /dev/null 2>&1 + curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.1007.tar.gz + tar -xf openzwave-1.6.1007.tar.gz && rm openzwave-1.6.1007.tar.gz + cd openzwave-1.6.1007 && make > /dev/null 2>&1 && make install > /dev/null 2>&1 ldconfig /usr/local/lib64 cd /opt/iobroker # echo "Openzwave is now installed..." diff --git a/armv7hf/scripts/userscript_everystart_example.sh b/armv7hf/scripts/userscript_everystart_example.sh new file mode 100644 index 0000000..9023677 --- /dev/null +++ b/armv7hf/scripts/userscript_everystart_example.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +# This is an example script file. +# To run the Script on every start of the container you have to rename it to userscript_everystart.sh. + +# You can add your advanced script code here! + +echo ' ' +echo "I'm your startscript userscript_everystart.sh. I will run on EVERY container startup." +echo ' ' + + +exit 0 diff --git a/armv7hf/scripts/userscript_firststart_example.sh b/armv7hf/scripts/userscript_firststart_example.sh new file mode 100644 index 0000000..4fef50d --- /dev/null +++ b/armv7hf/scripts/userscript_firststart_example.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# This is an example script file. +# To run the Script on the first start of a new container you have to rename it to userscript_firststart.sh. + +# You can add your advanced script code here! + +echo ' ' +echo "I'm your startscript userscript_firststart.sh. I will run only on the FIRST startup of the container." +echo ' ' + +exit 0 diff --git a/manifest.yml b/manifest.yml index ae9fa3b..c8d851a 100644 --- a/manifest.yml +++ b/manifest.yml @@ -16,4 +16,4 @@ manifests: platform: architecture: arm variant: v7 - os: linux \ No newline at end of file + os: linux diff --git a/opt/maintenance-scripts/backup_iobroker_folder.sh b/opt/maintenance-scripts/backup_iobroker_folder.sh index 1f9c2e3..aae1bb0 100644 --- a/opt/maintenance-scripts/backup_iobroker_folder.sh +++ b/opt/maintenance-scripts/backup_iobroker_folder.sh @@ -2,7 +2,7 @@ # Backupscript fuer ein Backup von ioBroker unter Docker auf einer Synology Disk Station (Sicherung des ioBroker-Verzeichnises). # Vorhaltezeit der letzten Backups: 90 Tage, ältere Backups werden automatisch geloescht. -# +# # By Andre Germann # Version 1.1 (22.09.2017) # diff --git a/opt/maintenance-scripts/iobroker_restart.sh b/opt/maintenance-scripts/iobroker_restart.sh index 31d3f60..c7e0dde 100644 --- a/opt/maintenance-scripts/iobroker_restart.sh +++ b/opt/maintenance-scripts/iobroker_restart.sh @@ -1,11 +1,10 @@ #!/bin/sh -# Einfaches Script zum Stoppen von ioBroker. -# Kann zum Beispiel aus ioBroker heraus aufgerufen werden um ioBroker neu zu starten. +# Einfaches Script zum Stoppen von ioBroker. +# Kann zum Beispiel aus ioBroker heraus aufgerufen werden um ioBroker neu zu starten. cd /opt/iobroker pkill io sleep 5 -node node_modules/iobroker.js-controller/controller.js >/opt/scripts/docker_iobroker_log.txt 2>&1 & - +gosu iobroker node node_modules/iobroker.js-controller/controller.js exit 0 diff --git a/opt/maintenance-scripts/iobroker_stop.sh b/opt/maintenance-scripts/iobroker_stop.sh index 4c2e4fc..cab7fb3 100644 --- a/opt/maintenance-scripts/iobroker_stop.sh +++ b/opt/maintenance-scripts/iobroker_stop.sh @@ -1,7 +1,7 @@ #!/bin/sh -# Einfaches Script zum Stoppen von ioBroker. -# Kann zum Beispiel aus ioBroker heraus aufgerufen werden um ioBroker zu stoppen. +# Einfaches Script zum Stoppen von ioBroker. +# Kann zum Beispiel aus ioBroker heraus aufgerufen werden um ioBroker zu stoppen. cd /opt/iobroker pkill io