some testing

This commit is contained in:
buanet
2020-06-22 16:24:30 +02:00
parent 4b3f57b063
commit 397b4ea536
2 changed files with 38 additions and 47 deletions

View File

@@ -80,20 +80,17 @@ RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
# Setting up iobroker-user (shell and home directory) # Setting up iobroker-user (shell and home directory)
RUN chsh -s /bin/bash iobroker \ RUN chsh -s /bin/bash iobroker \
&& usermod --home /opt/iobroker iobroker \ && usermod --home /opt/iobroker iobroker \
&& usermod -u 901 iobroker \ && usermod -u 1000 iobroker \
&& groupmod -g 901 iobroker && groupmod -g 1000 iobroker
# Setting up ENVs # Setting up ENVs
ENV DEBIAN_FRONTEND="teletype" \ ENV DEBIAN_FRONTEND="teletype" \
LANG="de_DE.UTF-8" \ LANG="de_DE.UTF-8" \
LANGUAGE="de_DE:de" \ LANGUAGE="de_DE:de" \
LC_ALL="de_DE.UTF-8" \ LC_ALL="de_DE.UTF-8" \
PACKAGES="vi" \ SETGID=1000 \
SETGID=901 \ SETUID=1000 \
SETUID=901 \
TZ="Europe/Berlin" TZ="Europe/Berlin"
# Run startup-script # Run startup-script
# ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"] ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"]
CMD ["iob"]

View File

@@ -1,8 +1,5 @@
#!/bin/bash #!/bin/bash
set -e
if [ "$1" = 'iob' ];
then
# Reading ENV # Reading ENV
adminport=$IOB_ADMINPORT adminport=$IOB_ADMINPORT
avahi=$AVAHI avahi=$AVAHI
@@ -94,6 +91,7 @@ then
fi fi
else else
echo "Nothing to do here." echo "Nothing to do here."
echo ' '
fi fi
# Change directory for next steps # Change directory for next steps
@@ -454,11 +452,7 @@ echo ' '
echo "Starting ioBroker..." echo "Starting ioBroker..."
echo ' ' echo ' '
exec gosu iobroker node node_modules/iobroker.js-controller/controller.js "$@" exec gosu iobroker node node_modules/iobroker.js-controller/controller.js
fi
exec "$@"
# Preventing container restart by keeping a process alive even if iobroker will be stopped # Preventing container restart by keeping a process alive even if iobroker will be stopped
# tail -f /dev/null tail -f /dev/null