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

Merge pull request #131 from buanet/dev

Browse Source 
Dev to beta
This commit is contained in:
Andre Germann
2020-07-29 23:27:59 +02:00
committed by GitHub
parent 8a2d8c17dc 3c8c6fcd22
commit 6c89d9fa7c
12 changed files with 42 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
aarch64/Dockerfile
View File

@@ -66,9 +66,9 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
WORKDIR / WORKDIR /
RUN apt-get update \ RUN apt-get update \
&& curl -sL https://iobroker.net/install.sh | bash - \ && curl -sL https://iobroker.net/install.sh | bash - \
&& mkdir -p /opt/iobroker/.docker_config/ \ && mkdir -p /opt/scripts/.docker_config/ \
&& echo $(hostname) > /opt/iobroker/.docker_config/.install_host \ && echo $(hostname) > /opt/scripts/.docker_config/.install_host \
&& echo "starting" > /opt/iobroker/.docker_config/.healthcheck \ && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
&& echo $(hostname) > /opt/.firstrun \ && echo $(hostname) > /opt/.firstrun \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

4
aarch64/scripts/healthcheck.sh
View File

@@ -2,11 +2,11 @@
# Script checks health of running container # Script checks health of running container
if [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "starting" ] if [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "starting" ]
then then
echo 'Health status: OK - Startup script is still running.' echo 'Health status: OK - Startup script is still running.'
exit 0 exit 0
elif [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "maintenance" ] elif [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "maintenance" ]
then then
echo 'Health status: OK - Container is running in maintenance mode.' echo 'Health status: OK - Container is running in maintenance mode.'
exit 0 exit 0

27
aarch64/scripts/iobroker_startup.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Setting healthcheck status to "starting" # Setting healthcheck status to "starting"
echo "starting" > /opt/iobroker/.docker_config/.healthcheck echo "starting" > /opt/scripts/.docker_config/.healthcheck
# Reading ENV # Reading ENV
adminport=$IOB_ADMINPORT adminport=$IOB_ADMINPORT
@@ -19,23 +19,6 @@ statesdbtype=$IOB_STATESDB_TYPE
usbdevices=$USBDEVICES usbdevices=$USBDEVICES
zwave=$ZWAVE zwave=$ZWAVE
# Writing necessary ENVs to /opt/iobroker/.docker_config/container.config for using it in other scripts
echo '# Simple config file to store ENVs' > /opt/iobroker/.docker_config/container.config
echo ' ' >> /opt/iobroker/.docker_config/container.config
if [ "$multihost" = "" ]
then
echo "multihost=master" >> /opt/iobroker/.docker_config/container.config
else
echo "multihost=$multihost" >> /opt/iobroker/.docker_config/container.config
fi
if [ "$adminport" = "" ]
then
echo "adminport=8081" >> /opt/iobroker/.docker_config/container.config
else
echo "adminport=$adminport" >> /opt/iobroker/.docker_config/container.config
fi
# Getting date and time for logging # Getting date and time for logging
dati=`date '+%Y-%m-%d %H:%M:%S'` dati=`date '+%Y-%m-%d %H:%M:%S'`
@@ -200,12 +183,12 @@ echo "Done."
echo ' ' echo ' '
# Checking for first run of a new installation and renaming ioBroker # Checking for first run of a new installation and renaming ioBroker
if [ -f /opt/iobroker/.docker_config/.install_host ] if [ -f /opt/scripts/.docker_config/.install_host ]
then then
echo "Looks like this is a new and empty installation of ioBroker." echo "Looks like this is a new and empty installation of ioBroker."
echo "Hostname needs to be updated to " $(hostname)"..." echo "Hostname needs to be updated to " $(hostname)"..."
bash iobroker host $(cat /opt/iobroker/.docker_config/.install_host) bash iobroker host $(cat /opt/scripts/.docker_config/.install_host)
rm -f /opt/iobroker/.docker_config/.install_host rm -f /opt/scripts/.docker_config/.install_host
echo "Done." echo "Done."
echo ' ' echo ' '
elif [ $(bash 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) ]
@@ -498,7 +481,7 @@ echo "Starting ioBroker..."
echo ' ' echo ' '
# Setting healthcheck status to "running" # Setting healthcheck status to "running"
echo "running" > /opt/iobroker/.docker_config/.healthcheck echo "running" > /opt/scripts/.docker_config/.healthcheck
# Function for graceful shutdown by SIGTERM signal # Function for graceful shutdown by SIGTERM signal
shut_down() { shut_down() {

8
aarch64/scripts/maintenance.sh
View File

@@ -2,11 +2,11 @@
if [ "$1" == "status" ] if [ "$1" == "status" ]
then then
if [ $(cat /opt/iobroker/.docker_config/.healthcheck) == 'maintenance' ] if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ]
then then
echo 'Maintenance mode is ON.' echo 'Maintenance mode is ON.'
exit 0 exit 0
elif [ $(cat /opt/iobroker/.docker_config/.healthcheck) != 'maintenance' ] elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ]
then then
echo 'Maintenance mode is OFF.' echo 'Maintenance mode is OFF.'
exit 0 exit 0
@@ -18,7 +18,7 @@ then
if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ] if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
then then
echo 'Activating maintenance mode...' echo 'Activating maintenance mode...'
echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
sleep 1 sleep 1
echo 'Done.' echo 'Done.'
echo 'Stopping ioBroker...' echo 'Stopping ioBroker...'
@@ -37,7 +37,7 @@ then
if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ] if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
then then
echo 'Deactivating maintenance mode and forcing container to stop/ restart...' echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
pkill -u root pkill -u root
exit 0 exit 0
else else

6
amd64/Dockerfile
View File

@@ -66,9 +66,9 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
WORKDIR / WORKDIR /
RUN apt-get update \ RUN apt-get update \
&& curl -sL https://iobroker.net/install.sh | bash - \ && curl -sL https://iobroker.net/install.sh | bash - \
&& mkdir -p /opt/iobroker/.docker_config/ \ && mkdir -p /opt/scripts/.docker_config/ \
&& echo $(hostname) > /opt/iobroker/.docker_config/.install_host \ && echo $(hostname) > /opt/scripts/.docker_config/.install_host \
&& echo "starting" > /opt/iobroker/.docker_config/.healthcheck \ && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
&& echo $(hostname) > /opt/.firstrun \ && echo $(hostname) > /opt/.firstrun \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

4
amd64/scripts/healthcheck.sh
View File

@@ -2,11 +2,11 @@
# Script checks health of running container # Script checks health of running container
if [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "starting" ] if [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "starting" ]
then then
echo 'Health status: OK - Startup script is still running.' echo 'Health status: OK - Startup script is still running.'
exit 0 exit 0
elif [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "maintenance" ] elif [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "maintenance" ]
then then
echo 'Health status: OK - Container is running in maintenance mode.' echo 'Health status: OK - Container is running in maintenance mode.'
exit 0 exit 0

28
amd64/scripts/iobroker_startup.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Setting healthcheck status to "starting" # Setting healthcheck status to "starting"
echo "starting" > /opt/iobroker/.docker_config/.healthcheck echo "starting" > /opt/scripts/.docker_config/.healthcheck
# Reading ENV # Reading ENV
adminport=$IOB_ADMINPORT adminport=$IOB_ADMINPORT
@@ -19,23 +19,6 @@ statesdbtype=$IOB_STATESDB_TYPE
usbdevices=$USBDEVICES usbdevices=$USBDEVICES
zwave=$ZWAVE zwave=$ZWAVE
# Writing necessary ENVs to /opt/iobroker/.docker_config/container.config for using it in other scripts
echo '# Simple config file to store ENVs' > /opt/iobroker/.docker_config/container.config
echo ' ' >> /opt/iobroker/.docker_config/container.config
if [ "$multihost" = "" ]
then
echo "multihost=master" >> /opt/iobroker/.docker_config/container.config
else
echo "multihost=$multihost" >> /opt/iobroker/.docker_config/container.config
fi
if [ "$adminport" = "" ]
then
echo "adminport=8081" >> /opt/iobroker/.docker_config/container.config
else
echo "adminport=$adminport" >> /opt/iobroker/.docker_config/container.config
fi
# Getting date and time for logging # Getting date and time for logging
dati=`date '+%Y-%m-%d %H:%M:%S'` dati=`date '+%Y-%m-%d %H:%M:%S'`
@@ -80,7 +63,6 @@ if [ "$zwave" != "" ]; then echo -n "----- " && echo -n "$(printf
echo "$(printf -- '-%.0s' {1..60})" echo "$(printf -- '-%.0s' {1..60})"
echo ' ' echo ' '
##### #####
# STEP 1 - Preparing container # STEP 1 - Preparing container
##### #####
@@ -200,12 +182,12 @@ echo "Done."
echo ' ' echo ' '
# Checking for first run of a new installation and renaming ioBroker # Checking for first run of a new installation and renaming ioBroker
if [ -f /opt/iobroker/.docker_config/.install_host ] if [ -f /opt/scripts/.docker_config/.install_host ]
then then
echo "Looks like this is a new and empty installation of ioBroker." echo "Looks like this is a new and empty installation of ioBroker."
echo "Hostname needs to be updated to " $(hostname)"..." echo "Hostname needs to be updated to " $(hostname)"..."
bash iobroker host $(cat /opt/iobroker/.docker_config/.install_host) bash iobroker host $(cat /opt/scripts/.docker_config/.install_host)
rm -f /opt/iobroker/.docker_config/.install_host rm -f /opt/scripts/.docker_config/.install_host
echo "Done." echo "Done."
echo ' ' echo ' '
elif [ $(bash 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) ]
@@ -498,7 +480,7 @@ echo "Starting ioBroker..."
echo ' ' echo ' '
# Setting healthcheck status to "running" # Setting healthcheck status to "running"
echo "running" > /opt/iobroker/.docker_config/.healthcheck echo "running" > /opt/scripts/.docker_config/.healthcheck
# Function for graceful shutdown by SIGTERM signal # Function for graceful shutdown by SIGTERM signal
shut_down() { shut_down() {

8
amd64/scripts/maintenance.sh
View File

@@ -2,11 +2,11 @@
if [ "$1" == "status" ] if [ "$1" == "status" ]
then then
if [ $(cat /opt/iobroker/.docker_config/.healthcheck) == 'maintenance' ] if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ]
then then
echo 'Maintenance mode is ON.' echo 'Maintenance mode is ON.'
exit 0 exit 0
elif [ $(cat /opt/iobroker/.docker_config/.healthcheck) != 'maintenance' ] elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ]
then then
echo 'Maintenance mode is OFF.' echo 'Maintenance mode is OFF.'
exit 0 exit 0
@@ -18,7 +18,7 @@ then
if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ] if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
then then
echo 'Activating maintenance mode...' echo 'Activating maintenance mode...'
echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
sleep 1 sleep 1
echo 'Done.' echo 'Done.'
echo 'Stopping ioBroker...' echo 'Stopping ioBroker...'
@@ -37,7 +37,7 @@ then
if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ] if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
then then
echo 'Deactivating maintenance mode and forcing container to stop/ restart...' echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
pkill -u root pkill -u root
exit 0 exit 0
else else

6
armv7hf/Dockerfile
View File

@@ -66,9 +66,9 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
WORKDIR / WORKDIR /
RUN apt-get update \ RUN apt-get update \
&& curl -sL https://iobroker.net/install.sh | bash - \ && curl -sL https://iobroker.net/install.sh | bash - \
&& mkdir -p /opt/iobroker/.docker_config/ \ && mkdir -p /opt/scripts/.docker_config/ \
&& echo $(hostname) > /opt/iobroker/.docker_config/.install_host \ && echo $(hostname) > /opt/scripts/.docker_config/.install_host \
&& echo "starting" > /opt/iobroker/.docker_config/.healthcheck \ && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
&& echo $(hostname) > /opt/.firstrun \ && echo $(hostname) > /opt/.firstrun \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

4
armv7hf/scripts/healthcheck.sh
View File

@@ -2,11 +2,11 @@
# Script checks health of running container # Script checks health of running container
if [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "starting" ] if [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "starting" ]
then then
echo 'Health status: OK - Startup script is still running.' echo 'Health status: OK - Startup script is still running.'
exit 0 exit 0
elif [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "maintenance" ] elif [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "maintenance" ]
then then
echo 'Health status: OK - Container is running in maintenance mode.' echo 'Health status: OK - Container is running in maintenance mode.'
exit 0 exit 0

27
armv7hf/scripts/iobroker_startup.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Setting healthcheck status to "starting" # Setting healthcheck status to "starting"
echo "starting" > /opt/iobroker/.docker_config/.healthcheck echo "starting" > /opt/scripts/.docker_config/.healthcheck
# Reading ENV # Reading ENV
adminport=$IOB_ADMINPORT adminport=$IOB_ADMINPORT
@@ -19,23 +19,6 @@ statesdbtype=$IOB_STATESDB_TYPE
usbdevices=$USBDEVICES usbdevices=$USBDEVICES
zwave=$ZWAVE zwave=$ZWAVE
# Writing necessary ENVs to /opt/iobroker/.docker_config/container.config for using it in other scripts
echo '# Simple config file to store ENVs' > /opt/iobroker/.docker_config/container.config
echo ' ' >> /opt/iobroker/.docker_config/container.config
if [ "$multihost" = "" ]
then
echo "multihost=master" >> /opt/iobroker/.docker_config/container.config
else
echo "multihost=$multihost" >> /opt/iobroker/.docker_config/container.config
fi
if [ "$adminport" = "" ]
then
echo "adminport=8081" >> /opt/iobroker/.docker_config/container.config
else
echo "adminport=$adminport" >> /opt/iobroker/.docker_config/container.config
fi
# Getting date and time for logging # Getting date and time for logging
dati=`date '+%Y-%m-%d %H:%M:%S'` dati=`date '+%Y-%m-%d %H:%M:%S'`
@@ -200,12 +183,12 @@ echo "Done."
echo ' ' echo ' '
# Checking for first run of a new installation and renaming ioBroker # Checking for first run of a new installation and renaming ioBroker
if [ -f /opt/iobroker/.docker_config/.install_host ] if [ -f /opt/scripts/.docker_config/.install_host ]
then then
echo "Looks like this is a new and empty installation of ioBroker." echo "Looks like this is a new and empty installation of ioBroker."
echo "Hostname needs to be updated to " $(hostname)"..." echo "Hostname needs to be updated to " $(hostname)"..."
bash iobroker host $(cat /opt/iobroker/.docker_config/.install_host) bash iobroker host $(cat /opt/scripts/.docker_config/.install_host)
rm -f /opt/iobroker/.docker_config/.install_host rm -f /opt/scripts/.docker_config/.install_host
echo "Done." echo "Done."
echo ' ' echo ' '
elif [ $(bash 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) ]
@@ -498,7 +481,7 @@ echo "Starting ioBroker..."
echo ' ' echo ' '
# Setting healthcheck status to "running" # Setting healthcheck status to "running"
echo "running" > /opt/iobroker/.docker_config/.healthcheck echo "running" > /opt/scripts/.docker_config/.healthcheck
# Function for graceful shutdown by SIGTERM signal # Function for graceful shutdown by SIGTERM signal
shut_down() { shut_down() {

8
armv7hf/scripts/maintenance.sh
View File

@@ -2,11 +2,11 @@
if [ "$1" == "status" ] if [ "$1" == "status" ]
then then
if [ $(cat /opt/iobroker/.docker_config/.healthcheck) == 'maintenance' ] if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ]
then then
echo 'Maintenance mode is ON.' echo 'Maintenance mode is ON.'
exit 0 exit 0
elif [ $(cat /opt/iobroker/.docker_config/.healthcheck) != 'maintenance' ] elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ]
then then
echo 'Maintenance mode is OFF.' echo 'Maintenance mode is OFF.'
exit 0 exit 0
@@ -18,7 +18,7 @@ then
if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ] if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
then then
echo 'Activating maintenance mode...' echo 'Activating maintenance mode...'
echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
sleep 1 sleep 1
echo 'Done.' echo 'Done.'
echo 'Stopping ioBroker...' echo 'Stopping ioBroker...'
@@ -37,7 +37,7 @@ then
if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ] if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
then then
echo 'Deactivating maintenance mode and forcing container to stop/ restart...' echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
pkill -u root pkill -u root
exit 0 exit 0
else else