improve maintenance command by symlinking

add error handling for user scripts

.VERSION

@@ -1 +1 @@
-v9.0.0
+v9.1.0-beta.1

.github/workflows/build-debian12-beta.yml

@@ -43,10 +43,10 @@ jobs:
           echo "[LOG] Buildnumber/Timestamp: $DATI"
           echo "dati=$DATI" >> $GITHUB_ENV
           # Set values in iobroker_startup.sh
-          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${BUILD}/$DATI/" ./debian12/scripts/iobroker_startup.sh > ./debian12/scripts/iobroker_startup.tmp
+          sed -e "s/\${VERSION}/$VERSION/" -e "s/\${BUILD}/$DATI/" ./debian12/scripts/iobroker_startup.sh > ./debian12/scripts/iobroker_startup.tmp
           mv -f ./debian12/scripts/iobroker_startup.tmp ./debian12/scripts/iobroker_startup.sh
           # Set values in Dockerfile
-          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.RECOMMENDED_NODE_VERSION }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp 
+          sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.RECOMMENDED_NODE_VERSION }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp 
           mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile
 
       - name: Set up QEMU
@@ -115,10 +115,10 @@ jobs:
             echo "[LOG] Buildnumber/Timestamp: $DATI"
             echo "dati=$DATI" >> $GITHUB_ENV
             # Set values in iobroker_startup.sh
-            sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${BUILD}/$DATI/" ./debian12/scripts/iobroker_startup.sh > ./debian12/scripts/iobroker_startup.tmp
+            sed -e "s/\${VERSION}/$VERSION/" -e "s/\${BUILD}/$DATI/" ./debian12/scripts/iobroker_startup.sh > ./debian12/scripts/iobroker_startup.tmp
             mv -f ./debian12/scripts/iobroker_startup.tmp ./debian12/scripts/iobroker_startup.sh
             # Set values in Dockerfile
-            sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.EXPERIMENTAL_NODE_VERSION }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp 
+            sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.EXPERIMENTAL_NODE_VERSION }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp 
             mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile
 
         - name: Set up QEMU

.github/workflows/build-debian12-dev.yml

@@ -85,7 +85,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4.1.0
         with:
           repository: 'buanet/ioBroker.docker'
 
@@ -134,7 +134,7 @@ jobs:
         with:
           context: ./debian12
           file: ./debian12/Dockerfile
-          push: false
+          push: true
           platforms: |
             linux/amd64
             linux/arm64

.github/workflows/build-debian12-latest.yml

@@ -37,10 +37,10 @@ jobs:
           echo "[LOG] Buildnumber/Timestamp: $DATI"
           echo "dati=$DATI" >> $GITHUB_ENV
           # Set values in iobroker_startup.sh
-          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${BUILD}/$DATI/" ./debian12/scripts/iobroker_startup.sh > ./debian12/scripts/iobroker_startup.tmp
+          sed -e "s/\${VERSION}/$VERSION/" -e "s/\${BUILD}/$DATI/" ./debian12/scripts/iobroker_startup.sh > ./debian12/scripts/iobroker_startup.tmp
           mv -f ./debian12/scripts/iobroker_startup.tmp ./debian12/scripts/iobroker_startup.sh
           # Set values in Dockerfile
-          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.RECOMMENDED_NODE_VERSION }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp 
+          sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.RECOMMENDED_NODE_VERSION }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp 
           mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile
 
       - name: Set up QEMU
@@ -113,10 +113,10 @@ jobs:
           echo "[LOG] Buildnumber/Timestamp: $DATI"
           echo "dati=$DATI" >> $GITHUB_ENV
           # Set values in iobroker_startup.sh
-          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${BUILD}/$DATI/" ./debian12/scripts/iobroker_startup.sh > ./debian12/scripts/iobroker_startup.tmp
+          sed -e "s/\${VERSION}/$VERSION/" -e "s/\${BUILD}/$DATI/" ./debian12/scripts/iobroker_startup.sh > ./debian12/scripts/iobroker_startup.tmp
           mv -f ./debian12/scripts/iobroker_startup.tmp ./debian12/scripts/iobroker_startup.sh
           # Set values in Dockerfile
-          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.RECOMMENDED_NODE_VERSION }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp 
+          sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.RECOMMENDED_NODE_VERSION }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp 
           mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile
 
       - name: Set up QEMU
@@ -137,7 +137,7 @@ jobs:
         with:
           context: ./debian12
           file: ./debian12/Dockerfile
-          push: false ##### For first test of new workflow
+          push: true
           platforms: |
             linux/amd64
             linux/arm/v7

CHANGELOG.md

@@ -1,5 +1,18 @@
 ## Changelog
 
+### v9.1.0-beta.1 (03.11.2023)
+* improve maintenance command by symlinking ([#390](https://github.com/buanet/ioBroker.docker/issues/390))
+* fix restore/ adding backup file selection ([#394](https://github.com/buanet/ioBroker.docker/issues/394))
+* fix calling iob start|stop with parameters
+* enhance logging in iobroker_startup.sh
+* add error handling for user scripts
+
+### v9.0.1 (10.10.2023)
+* fix issue with avahi setup ([#384](https://github.com/buanet/ioBroker.docker/issues/384); [#385 by @z1r0](https://github.com/buanet/ioBroker.docker/pull/385))
+* add silent cleanup to setup_avahi.sh
+* add error handling for package updates/ install
+* fix calling iob in iobroker_startup.sh ([#388](https://github.com/buanet/ioBroker.docker/issues/388))
+
 ### v9.0.0 (09.10.2023)
 * update official docs
 * v9.0.0-beta.2 (28.09.2023)

debian12/scripts/iobroker.sh

@@ -39,27 +39,48 @@ iob_diag () {
   fi
 }
 
-if [ "$1" = "fix" ]; then # call iobroker fixer
+# run iobroker maintenance script
-  iob_fix
+iob_maint() {
-elif [ "$1" = "node fix" ]; then # call iobroker node fixer
-  echo "The execution of this command is blocked as your ioBroker is running inside a Docker container!"
-  echo "To fix any issues with nodejs, please pull the latest version of the Docker image and recreate your container."
-elif [ "$1" = "diag" ]; then # call iobroker diag script
-  iob_diag
-elif [ "$1" = "start" ] || [ "$1" = "stop" ] || [ "$1" = "restart" ]; then # block execution of iobroker start | stop | restart
-  echo "The execution of this command is blocked as your ioBroker is running inside a Docker container!"
-  echo "For more details see ioBroker Docker image docs (https://docs.buanet.de/iobroker-docker-image/docs/) or use the maintenance script 'maintenance --help'."
-elif [ "$1" = "m" ] || [ "$1" = "maint" ] || [ "$1" = "maintenance" ]; then # call iobroker maintenance script
   shift
-  if [ "$(id -u)" -eq 0 ]; then # check for execution as root
+  if [ "$(id -u)" -eq 0 ]; then
     gosu iobroker bash /opt/scripts/maintenance.sh "$@"
   else
     bash /opt/scripts/maintenance.sh "$@"
   fi
-else # passing all other parameters to iobroker.js
+}
-  if [ "$(id -u)" -eq 0 ]; then # check for execution as root
+
+# pass parameters and run iobroker.js
+iob_run() {
+  if [ "$(id -u)" -eq 0 ]; then
     gosu iobroker node /opt/iobroker/node_modules/iobroker.js-controller/iobroker.js "$@"
   else
     node /opt/iobroker/node_modules/iobroker.js-controller/iobroker.js "$@"
   fi
+}
+
+if [ "$1" = "fix" ]; then
+  # call iobroker fixer
+  iob_fix
+elif [ "$1" = "node fix" ]; then
+  # call iobroker node fixer
+  echo "The execution of this command is blocked as your ioBroker is running inside a Docker container!"
+  echo "To fix any issues with nodejs, please pull the latest version of the Docker image and recreate your container."
+elif [ "$1" = "diag" ]; then
+  # call iobroker diag script
+  iob_diag
+elif [ "$1" = "start" ] || [ "$1" = "stop" ] || [ "$1" = "restart" ]; then
+  # block execution of iobroker start | stop | restart but pass start | stop for adapters
+  if [ ! "$2" ]; then
+    echo "The execution of this command is blocked as your ioBroker is running inside a Docker container!"
+    echo "For more details see ioBroker Docker image docs (https://docs.buanet.de/iobroker-docker-image/docs/) or use the maintenance script 'maintenance --help'."
+  else
+    # passing all other parameters to iobroker.js but check for execution as root
+    iob_run "$@"
+  fi
+elif [ "$1" = "m" ] || [ "$1" = "maint" ] || [ "$1" = "maintenance" ]; then
+  # call iobroker maintenance script but check for execution as root
+  iob_maint "$@"
+else
+  # passing all other parameters to iobroker.js but check for execution as root
+  iob_run "$@"
 fi

debian12/scripts/iobroker_startup.sh

@@ -133,7 +133,7 @@ if [[ -f /opt/.docker_config/.first_run ]]; then
   if [[ "$offlinemode" = "true" ]]; then
     echo "OFFLINE_MODE is \"true\". Skipping Linux package updates on first run."
   else
-    bash /opt/scripts/setup_packages.sh -update
+    if ! bash /opt/scripts/setup_packages.sh -update; then echo "Failed."; fi
   fi
   echo " "
   # Installing packages from ENV
@@ -141,14 +141,14 @@ if [[ -f /opt/.docker_config/.first_run ]]; then
     echo "PACKAGES is set, but OFFLINE_MODE is \"true\". Skipping Linux package installation."
   elif [[ "$packages" != "" ]]; then
     echo "PACKAGES is set. Installing the following additional Linux packages: ""$packages"
-      bash /opt/scripts/setup_packages.sh -install
+    if ! bash /opt/scripts/setup_packages.sh -install; then echo "Failed."; fi
   fi
   echo " "
   # Register maintenance script
   echo -n "Registering maintenance script as command... "
-  echo "alias maintenance='/opt/scripts/maintenance.sh'" >> /etc/bash.bashrc
+  ln -s /opt/scripts/maintenance.sh /bin/maintenance
-  echo "alias maint='/opt/scripts/maintenance.sh'" >> /etc/bash.bashrc
+  ln -s /opt/scripts/maintenance.sh /bin/maint
-  echo "alias m='/opt/scripts/maintenance.sh'" >> /etc/bash.bashrc
+  ln -s /opt/scripts/maintenance.sh /bin/m
   echo "Done."
 else
   echo "This is not the first run of this container. Skipping first run preparation."
@@ -308,7 +308,7 @@ if [[ -f /opt/iobroker/.fresh_install && "$multihost" != "slave" ]]; then
   echo -n "Initializing a fresh installation of ioBroker... "
   if [[ ! -d "/opt/iobroker/log" ]]; then gosu iobroker mkdir "/opt/iobroker/log"; fi
   set +e
-  bash iob setup first > /opt/iobroker/log/iob_setup_first.log 2>&1
+  gosu iobroker iob setup first > /opt/iobroker/log/iob_setup_first.log 2>&1
   return=$?
   set -e
   rm -f /opt/iobroker/.fresh_install
@@ -323,11 +323,11 @@ if [[ -f /opt/iobroker/.fresh_install && "$multihost" != "slave" ]]; then
 else
   echo -n "Checking Database connection... "
   set +e
-  if iob uuid &> /dev/null; then
+  if gosu iobroker iob uuid &> /dev/null; then
     echo "Done."
     echo " "
   else
-    errormsg=$(iob uuid 2>&1 | sed 's/^/[DEBUG] /')
+    errormsg=$(gosu iobroker iob uuid 2>&1 | sed 's/^/[DEBUG] /')
     echo "Failed."
     if [[ "$debug" == "true" ]]; then
       echo "[DEBUG] Error message: "
@@ -347,20 +347,20 @@ if [[ "$multihost" == "slave" ]]; then
 else
   # get admin instance and hostname
   set +e
-  admininstance=$(bash iobroker list instances | grep 'enabled' | grep -m 1 -o 'system.adapter.admin..')
+  admininstance=$(gosu iobroker iob list instances | grep 'enabled' | grep -m 1 -o 'system.adapter.admin..')
   set -e
   if [[ "$admininstance" != "" ]]; then
     if [[ "$debug" == "true" ]]; then echo "[DEBUG] Detected admin instance is:" "$admininstance"; fi 
-    adminhostname=$(bash iobroker object get "$admininstance" --pretty | grep -oP '(?<="host": ")[^"]*')
+    adminhostname=$(gosu iobroker iob object get "$admininstance" --pretty | grep -oP '(?<="host": ")[^"]*')
     if [[ "$debug" == "true" ]]; then echo "[DEBUG] Detected admin hostname is:" "$adminhostname"; fi
   else
     set +e
-    admininstance=$(bash iobroker list instances | grep 'disabled' | grep -m 1 -o 'system.adapter.admin..')
+    admininstance=$(gosu iobroker iob list instances | grep 'disabled' | grep -m 1 -o 'system.adapter.admin..')
     set -e
     if [[ "$admininstance" != "" ]]; then
       if [[ "$debug" == "true" ]]; then echo "[DEBUG] Detected admin instance is disabled."; fi 
       if [[ "$debug" == "true" ]]; then echo "[DEBUG] Detected admin instance is:" "$admininstance"; fi 
-      adminhostname=$(bash iobroker object get "$admininstance" --pretty | grep -oP '(?<="host": ")[^"]*')
+      adminhostname=$(gosu iobroker iob object get "$admininstance" --pretty | grep -oP '(?<="host": ")[^"]*')
       if [[ "$debug" == "true" ]]; then echo "[DEBUG] Detected admin hostname is:" "$adminhostname"; fi
     else
       echo "There was a problem detecting the admin instance of your iobroker."
@@ -373,7 +373,7 @@ else
   if [[ "$adminhostname" != "" && "$adminhostname" != "$(hostname)" ]]; then
     echo "Hostname in ioBroker does not match the hostname of this container."
     echo -n "Updating hostname to \"""$(hostname)""\"... "
-      bash iobroker host "$adminhostname"
+      gosu iobroker iob host "$adminhostname"
     echo "Done."
     echo " "
   elif [[ "$adminhostname" = "$(hostname)" ]]; then
@@ -431,13 +431,13 @@ echo " "
 
 # Checking ENV for Adminport
 if [[ "$adminport" != "" && "$multihost" != "slave" ]]; then
-  adminportold=$(bash iobroker object get "$admininstance" --pretty | grep -oP '(?<="port": )[^,]*')
+  adminportold=$(gosu iobroker iob object get "$admininstance" --pretty | grep -oP '(?<="port": )[^,]*')
   admininstanceshort=$(echo "$admininstance" | grep -m 1 -o 'admin..')
   if [[ "$adminport" != "$adminportold" ]]; then
     echo "IOB_ADMINPORT is set and does not match port configured in ioBroker."
     if [[ "$debug" == "true" ]]; then echo "[DEBUG] Detected Admin Port in ioBroker: " "$adminportold"; fi
     echo "Setting Adminport to \"""$adminport""\"... "
-      bash iobroker set "$admininstanceshort" --port "$adminport"
+      gosu iobroker iob set "$admininstanceshort" --port "$adminport"
     echo "Done."
     echo " "
   fi
@@ -497,17 +497,24 @@ elif [[ -f /opt/userscripts/userscript_firststart.sh || -f /opt/userscripts/user
     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
+      if ! bash /opt/userscripts/userscript_firststart.sh; then
+        echo "Failed."
+      else
         echo "Done."
       fi
+  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
+      if ! bash /opt/userscripts/userscript_everystart.sh; then
+        echo "Failed."
+      else
         echo "Done."
       fi
+  fi
+  echo " "
 fi
-echo " "
+
 
 # Removing first run an fresh install markers when exists
 if [[ -f /opt/.docker_config/.first_run ]]; then rm -f /opt/.docker_config/.first_run; fi

debian12/scripts/maintenance.sh

@@ -165,12 +165,12 @@ stop_iob() {
 
   if [[ "$killbyname" != yes ]]; then
     # pgrep exits with status 1 when there are no matches
-    while pgrep -u iobroker -f 'io.' > /dev/null; (( $? != 1 )); do
+    while pgrep -u iobroker -f 'io\..' > /dev/null; (( $? != 1 )); do
       if (($(date +%s) > timeout)); then
         echo -e "\nTimeout reached. Killing remaining processes..."
-        pgrep --list-full -u iobroker
+        pgrep --list-full -u iobroker -f 'io\..'
-        pkill --signal SIGKILL -u iobroker -f 'io.'
+        pkill --signal SIGKILL -u iobroker -f 'io\..'
-        echo "\nDone."
+        echo "Done."
         return
       fi
       sleep 1
@@ -184,6 +184,7 @@ stop_iob() {
   fi
 
   echo -e "Done."
+  echo " "
 }
 
 # restart container
@@ -219,35 +220,63 @@ restore_iobroker() {
   echo "During the restore process, the container will automatically switch into maintenance mode and stop ioBroker."
   echo "Depending on the restart policy, your container will be stopped or restarted automatically after the restore."
   
+  # check autoconfirm
   if [[ "$autoconfirm" != yes ]]; then
     local reply
 
     read -rp 'Do you want to continue [yes/no]? ' reply
-    if [[ "$reply" == y || "$reply" == Y || "$reply" == yes ]]; then
+    if [[ "$reply" != y && "$reply" != Y && "$reply" != yes ]]; then
-      : # continue
-    else
         return 1
     fi
   fi
+  echo " "
 
+  # check startup script running
   if check_starting > /dev/null; then
     echo "Startup script is still running."
     echo "Please check container log and wait until ioBroker is sucessfully started."
-    echo "Then try again."
     return 1
   fi
 
+  # check mainenance mode
   if ! maintenance_enabled > /dev/null; then
     autoconfirm=yes
     enable_maintenance
   fi
 
-  echo -n "Restoring ioBroker... "
+  # list backup files
+  backup_dir="/opt/iobroker/backups"
+  backup_files=($(find $backup_dir -type f))
+  backup_count=${#backup_files[@]}
+
+  if [[ $backup_count -eq 0 ]]; then
+      echo "Ther are no backup files in $backup_dir."
+      echo "Please check and try again."
+      return 1
+  elif [[ $backup_count -eq 1 ]]; then
+      selected_backup=$(basename "${backup_files[0]}")
+      echo "There is one backup file in $backup_dir."
+  else
+      # more than one backup file found, ask user to select
+      echo "There is more than one backup file in $backup_dir."
+      echo "Please select file for restore:"
+      for ((i=0; i<$backup_count; i++)); do
+        echo "$i: $(basename "${backup_files[$i]}")"
+      done
+      echo
+
+      read -rp "Enter the number of the backup to restore (0-$((backup_count - 1))): " selected_number
+      selected_backup=$(basename "${backup_files[$selected_number]}")
+  fi
+
+  # restoe backup
+  echo -n "Restoring ioBroker from $selected_backup... "
   set +e
-  bash iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
+  bash iobroker restore "$selected_backup" > /opt/iobroker/log/restore.log 2>&1
-  return=$?
+  return_value=$?
   set -e
-  if [[ "$return" -ne 0 ]]; then
+
+  if [[ "$return_value" -ne 0 ]]; then
       echo "Failed."
       echo "For more details see \"/opt/iobroker/log/restore.log\"."
       echo "Please check backup file location and permissions and try again."
@@ -265,8 +294,8 @@ restore_iobroker() {
   echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
   sleep 10
   echo "Container will be stopped or restarted in 10 seconds..."
-  sleep 10
   echo "stopping" > "$healthcheck"
+  sleep 10
   pkill -u iobroker
 }
 

debian12/scripts/setup_avahi.sh

@@ -5,9 +5,11 @@ then
   echo "[setup_avahi.sh] Avahi is already installed. Nothing to do here."
 else
   echo -n "[setup_avahi.sh] Avahi-daemon is NOT installed. Going to install it now... "
-    apt-get update > /opt/scripts/avahi_startup.log 2>&1
+    apt-get -q update > /opt/scripts/avahi_startup.log 2>&1
-    apt-get install -y --no-install-recommends libavahi-compat-libdnssd-dev avahi-daemon >> /opt/scripts/avahi_startup.log 2>&1
+    apt-get -q -y --no-install-recommends install libavahi-compat-libdnssd-dev avahi-daemon >> /opt/scripts/avahi_startup.log 2>&1
-    rm -rf /var/lib/apt/lists/* >> /opt/scripts/avahi_startup.log 2>&1
+    # Silent Cleanup
+    apt-get -qq autoclean -y && apt-get -qq autoremove && apt-get -qq clean
+    rm -rf /tmp/* /var/tmp/* /root/.cache/* /var/lib/apt/lists/* || true
   echo "Done."
   echo -n "[setup_avahi.sh] Configuring avahi-daemon... "
     sed -i '/^rlimit-nproc/s/^\(.*\)/#\1/g' /etc/avahi/avahi-daemon.conf
@@ -32,7 +34,7 @@ echo -n "[setup_avahi.sh] Starting dbus... "
 echo "Done."
 
 echo -n "[setup_avahi.sh] Starting avahi-daemon... "
-  /etc/init.d/avahi-daemon start >> /opt/scripts/avahi_startup.log 2>&1
+  avahi-daemon >> /opt/scripts/avahi_startup.log 2>&1 &
 echo "Done."
 
 exit 0