This commit is contained in:
andre
2019-12-01 21:46:17 +01:00
parent 95af2c3acf
commit 6afd8a3f5d
2 changed files with 33 additions and 29 deletions

View File

@@ -12,31 +12,31 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
curl \
git \
gnupg2 \
gosu \
libavahi-compat-libdnssd-dev \
gosu \
libavahi-compat-libdnssd-dev \
libcap2-bin \
libpam0g-dev \
libudev-dev \
locales \
pkg-config \
procps \
pkg-config \
procps \
python \
python-dev \
sudo \
python-dev \
sudo \
udev \
unzip \
wget \
&& rm -rf /var/lib/apt/lists/*
# Install node10
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash \
&& apt-get update && apt-get install -y \
nodejs \
&& apt-get update && apt-get install -y nodejs \
&& rm -rf /var/lib/apt/lists/*
# 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
&& sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
&& locale-gen
# Create scripts directory and copy scripts
RUN mkdir -p /opt/scripts/ \
@@ -47,7 +47,7 @@ COPY scripts/setup_avahi.sh setup_avahi.sh
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_avahi.sh \
&& chmod +x setup_packages.sh
# Install ioBroker
@@ -70,18 +70,19 @@ RUN chsh -s /bin/bash iobroker \
&& usermod --home /opt/iobroker iobroker
# 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="vi" \
ADMINPORT=8081 \
SETUID=1000 \
SETGID=1000 \
AVAHI="false" \
ZWAVE="false" \
USBDEVICES="none"
ENV ADMINPORT=8081 \
AVAHI="false" \
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"
# Run startup-script
ENTRYPOINT ["/opt/scripts/iobroker_startup.sh"]

View File

@@ -1,13 +1,14 @@
#!/bin/bash
# Reading ENV
packages=$PACKAGES
adminport=$ADMINPORT
uid=$SETUID
gid=$SETGID
zwave=$ZWAVE
avahi=$AVAHI
gid=$SETGID
packages=$PACKAGES
redis=$REDIS
uid=$SETUID
usbdevices=$USBDEVICES
zwave=$ZWAVE
# Getting date and time for logging
dati=`date '+%Y-%m-%d %H:%M:%S'`
@@ -36,12 +37,14 @@ 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" PACKAGES: $PACKAGES)" && echo " -----"
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" ZWAVE: $ZWAVE)" && 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 " -----"
echo "$(printf -- '-%.0s' {1..60})"
echo ' '