audrius/ioBroker.docker
1
0
Fork 0
mirror of https://github.com/buanet/ioBroker.docker.git synced 2026-01-29 18:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

moving avahi to script

Browse Source
This commit is contained in:
buanet
2019-01-28 13:57:27 +01:00
parent 75468e58d6
commit eea1c61ac5
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y \
android-tools-adb \ android-tools-adb \
android-tools-fastboot \ android-tools-fastboot \
apt-utils \ apt-utils \
avahi-daemon \
build-essential \ build-essential \
curl \ curl \
ffmpeg \ ffmpeg \
@@ -35,7 +34,7 @@ RUN apt-get update && apt-get install -y \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Configure avahi-daemon # Configure avahi-daemon
RUN sed -i '/^rlimit-nproc/s/^\(.*\)/#\1/g' /etc/avahi/avahi-daemon.conf # RUN sed -i '/^rlimit-nproc/s/^\(.*\)/#\1/g' /etc/avahi/avahi-daemon.conf
# Configure locales/ language/ timezone # Configure locales/ language/ timezone
RUN sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \ RUN sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
@@ -49,11 +48,10 @@ ENV TZ Europe/Berlin
RUN mkdir -p /opt/scripts/ \ RUN mkdir -p /opt/scripts/ \
&& chmod 777 /opt/scripts/ && chmod 777 /opt/scripts/
WORKDIR /opt/scripts/ WORKDIR /opt/scripts/
ADD scripts/avahi_startup.sh avahi_startup.sh COPY scripts/avahi_startup.sh avahi_startup.sh
ADD scripts/iobroker_startup.sh iobroker_startup.sh COPY scripts/iobroker_startup.sh iobroker_startup.sh
RUN chmod +x avahi_startup.sh \ RUN chmod +x avahi_startup.sh \
&& chmod +x iobroker_startup.sh \ && chmod +x iobroker_startup.sh
&& mkdir /var/run/dbus/
# Install ioBroker # Install ioBroker
WORKDIR / WORKDIR /
@@ -69,7 +67,7 @@ RUN npm install node-gyp -g
# Backup initial ioBroker-folder # Backup initial ioBroker-folder
RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker
# Some Testing # Giving iobroker-user sudo rights
RUN echo 'iobroker ALL=(ALL) NOPASSWD: ALL' | EDITOR='tee -a' visudo \ RUN echo 'iobroker ALL=(ALL) NOPASSWD: ALL' | EDITOR='tee -a' visudo \
&& echo "iobroker:iobroker" | chpasswd \ && echo "iobroker:iobroker" | chpasswd \
&& adduser iobroker sudo && adduser iobroker sudo

21
scripts/avahi_startup.sh
View File

@@ -1,17 +1,30 @@
#!/bin/sh #!/bin/sh
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 && apt-get install -y avahi-daemon && rm -rf /var/lib/apt/lists/*
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 ]; if [ -f /var/run/dbus/pid ];
then then
rm -f /var/run/dbus/pid rm -f /var/run/dbus/pid
fi fi
echo 'Preparing...' echo 'Starting dbus...'
rm /var/run/dbus/pid
dbus-daemon --system dbus-daemon --system
echo 'Restarting...' echo 'Restarting avahi-daemon...'
/etc/init.d/avahi-daemon stop /etc/init.d/avahi-daemon stop
sleep 5 sleep 1
/etc/init.d/avahi-daemon start /etc/init.d/avahi-daemon start
exit 0 exit 0

15
scripts/iobroker_startup.sh
View File

@@ -1,7 +1,11 @@
#!/bin/sh #!/bin/sh
# Checking env-variables
packages=$PACKAGES packages=$PACKAGES
echo 'Additional packages:' $packages avahi=$AVAHI
echo 'ENV packages:' $packages
echo 'ENV avahi:' $avahi
cd /opt/iobroker cd /opt/iobroker
@@ -24,9 +28,12 @@ then
echo 'First run preparation done...' echo 'First run preparation done...'
fi fi
echo 'Initializing Avahi-Daemon...' if [ "$avahi" == "true"];
sudo sh /opt/scripts/avahi_startup.sh then
echo 'Initializing Avahi-Daemon done...' echo 'Initializing Avahi-Daemon...'
sudo sh /opt/scripts/avahi_startup.sh
echo 'Initializing Avahi-Daemon done...'
fi
sleep 5 sleep 5