Merge branch 'beta' into dependabot/github_actions/main/docker/build-push-action-4.1.1

.VERSION

@@ -1 +1 @@
-v8.0.1
+v8.1.0-beta.2

.github/dependencies/.backitup-version

@@ -1 +1 @@
-2.6.19
+2.6.23

.github/workflows/build-debian-image-beta-node20.yml

@@ -39,11 +39,11 @@ jobs:
           mv -f ./debian/node20/Dockerfile.tmp ./debian/node20/Dockerfile
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/setup-qemu-action@v2.2.0
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.5.0
+        uses: docker/setup-buildx-action@v2.8.0
 
       - name: Login to DockerHub
         uses: docker/login-action@v2.1.0
@@ -64,12 +64,17 @@ jobs:
           context: ./debian
           file: ./debian/node20/Dockerfile
           push: true
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
+          platforms: |
+            linux/amd64
+            linux/arm/v7
+            linux/arm64/v8
           tags: |
             buanet/iobroker:beta-node20,
             buanet/iobroker:${{ env.version }}-node20,
             ghcr.io/buanet/iobroker:beta-node20,
             ghcr.io/buanet/iobroker:${{ env.version }}-node20
+          provenance: false
+          outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=Official Docker image for ioBroker smarthome software (https://www.iobroker.net)
 
       - name: Delete untagged images from GitHub packages
         uses: actions/github-script@v6

.github/workflows/build-debian-image-beta.yml

@@ -39,11 +39,11 @@ jobs:
           mv -f ./debian/node18/Dockerfile.tmp ./debian/node18/Dockerfile
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/setup-qemu-action@v2.2.0
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.5.0
+        uses: docker/setup-buildx-action@v2.8.0
 
       - name: Login to DockerHub
         uses: docker/login-action@v2.1.0

.github/workflows/build-debian-image-dev-node20.yml

@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.0
         with:
           repository: 'buanet/ioBroker.docker'
 
-      - name: Fetching version tag and date
+      - name: Fetch version tag and date
         id: version
         run: |
           VERSION="$(cat .VERSION)"
@@ -33,11 +33,11 @@ jobs:
           mv -f ./debian/node20/Dockerfile.tmp ./debian/node20/Dockerfile
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/setup-qemu-action@v2.2.0
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.5.0
+        uses: docker/setup-buildx-action@v2.8.0
 
       - name: Login to DockerHub
         uses: docker/login-action@v2.1.0
@@ -58,13 +58,18 @@ jobs:
           context: ./debian
           file: ./debian/node20/Dockerfile
           push: true
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
+          platforms: |
+            linux/amd64
+            linux/arm/v7
+            linux/arm64/v8
           tags: |
             buanet/iobroker:dev-node20,
             ghcr.io/buanet/iobroker:dev-node20
+          provenance: false
+          outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=Official Docker image for ioBroker smarthome software (https://www.iobroker.net)
 
-      - name: Delete untagged images from GitHub packages
-        uses: actions/github-script@v6
+      - name: Delete untagged images from GitHub Container Registry
+        uses: actions/github-script@v6.4.1
         with:
           github-token: ${{ secrets.PACKAGES_PASS }}
           script: |
@@ -81,4 +86,4 @@ jobs:
         env:
           OWNER: buanet
           PACKAGE_NAME: iobroker
-          PER_PAGE: 100      
+          PER_PAGE: 100

.github/workflows/build-debian-image-dev.yml

@@ -33,11 +33,11 @@ jobs:
           mv -f ./debian/node18/Dockerfile.tmp ./debian/node18/Dockerfile
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/setup-qemu-action@v2.2.0
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.5.0
+        uses: docker/setup-buildx-action@v2.8.0
 
       - name: Login to DockerHub
         uses: docker/login-action@v2.1.0

.github/workflows/build-debian-image-latest-iob.yml

@@ -42,11 +42,11 @@ jobs:
           mv -f ./debian/node18/Dockerfile.tmp ./debian/node18/Dockerfile
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/setup-qemu-action@v2.2.0
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.5.0
+        uses: docker/setup-buildx-action@v2.8.0
 
       - name: Login to DockerHub (iobroker)
         uses: docker/login-action@v2.1.0

.github/workflows/build-debian-image-latest.yml

@@ -42,11 +42,11 @@ jobs:
           mv -f ./debian/node18/Dockerfile.tmp ./debian/node18/Dockerfile
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/setup-qemu-action@v2.2.0
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.5.0
+        uses: docker/setup-buildx-action@v2.8.0
       - name: Login to DockerHub (buanet)
         uses: docker/login-action@v2.1.0
         with:

CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Changelog
 
+### v8.1.0-beta.2 (coming soon)
+* prohibit restore when startup script is still running
+* extend time before restart after restore is done
+* influx data repo will be added automatically when PACKAGES contains influxdb or influxdb2-cli package
+* v8.1.0-beta.1 (14.04.2023)
+  * enhance github actions
+  * enhance log output of maintenance script on restore ([#333](https://github.com/buanet/ioBroker.docker/issues/333))
+  * allow iobroker admin to be disabled at startup ([#332](https://github.com/buanet/ioBroker.docker/issues/332))
+  * allow deletion of objects and states db password with value "none" ([#306](https://github.com/buanet/ioBroker.docker/issues/306))
+
 ### v8.0.1 (17.04.2023)
 * fix calling of "iob setup first" on slaves ([#335](https://github.com/buanet/ioBroker.docker/issues/335)) 
 

debian/node20/Dockerfile

@@ -0,0 +1,102 @@
+FROM debian:bullseye-slim
+
+LABEL org.opencontainers.image.title="Official ioBroker Docker Image" \
+      org.opencontainers.image.description="Official Docker image for ioBroker smarthome software (https://www.iobroker.net)" \
+      org.opencontainers.image.documentation="https://github.com/buanet/ioBroker.docker#readme" \
+      org.opencontainers.image.authors="André Germann <info@buanet.de>" \
+      org.opencontainers.image.url="https://github.com/buanet/ioBroker.docker" \
+      org.opencontainers.image.source="https://github.com/buanet/ioBroker.docker" \
+      org.opencontainers.image.base.name="docker.io/library/debian:bullseye-slim" \
+      org.opencontainers.image.version="${VERSION}" \
+      org.opencontainers.image.created="${DATI}"
+
+ENV DEBIAN_FRONTEND noninteractive
+
+# Copy scripts
+COPY scripts /opt/scripts
+COPY userscripts /opt/userscripts
+
+# Install prerequisites (including node) and generating locales
+RUN apt-get update && apt-get install -y \
+    apt-utils \
+    cifs-utils \
+    curl \
+    gosu \
+    iputils-ping \
+    jq \
+    locales \
+    nfs-common \
+    procps \
+    python3 \
+    python3-dev \
+    sudo \
+    tar \
+    tzdata \
+    udev \
+    wget \
+    # Install node
+    && curl -sL https://deb.nodesource.com/setup_20.x | bash \
+    && apt-get update && apt-get install -y nodejs \
+    # Install node-gyp
+    && npm install -g node-gyp \
+    # Generating locales
+    && sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
+    && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
+    && locale-gen \
+    # Change permissions for scripts
+    && chmod 777 /opt/scripts/ \
+    && chmod 777 /opt/userscripts/ \
+    && chmod +x /opt/scripts/*.sh \
+    && chmod +x /opt/userscripts/*.sh \
+    # Prepare
+    && mkdir -p /opt/scripts/.docker_config/ \
+    && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
+    && echo "${VERSION}" > /opt/scripts/.docker_config/.thisisdocker \
+    && echo "true" > /opt/.first_run \
+    # Run installer
+    && curl -sL https://iobroker.net/install.sh | bash - \
+    # Deleting UUID from build
+    && iobroker unsetup -y \
+    && echo "true" > /opt/iobroker/.fresh_install \
+    # Backup initial ioBroker and userscript folder
+    && tar -cf /opt/initial_iobroker.tar /opt/iobroker \
+    && tar -cf /opt/initial_userscripts.tar /opt/userscripts \
+    # Setting up iobroker-user (shell, home dir and rights)
+    && chsh -s /bin/bash iobroker \
+    && usermod --home /opt/iobroker iobroker \
+    && usermod -u 1000 iobroker \
+    && groupmod -g 1000 iobroker \
+    && chown root:iobroker /usr/sbin/gosu \
+    && chmod +s /usr/sbin/gosu \
+    # Clean up installation cache
+    && apt-get autoclean -y \
+    && apt-get autoremove \
+    && apt-get clean \
+    && rm -rf /tmp/* /var/tmp/* \
+    && rm -rf /root/.cache/* /root/.npm/* \
+    && rm -rf /var/lib/apt/lists/*
+
+# Setting up default ENVs
+ENV DEBIAN_FRONTEND="teletype" \
+    LANG="de_DE.UTF-8" \
+    LANGUAGE="de_DE:de" \
+    LC_ALL="de_DE.UTF-8" \
+    SETGID=1000 \
+    SETUID=1000 \
+    TZ="Europe/Berlin"
+
+# Expose default admin ui port
+EXPOSE 8081
+
+# Change work dir
+WORKDIR /opt/iobroker/
+
+# Healthcheck
+HEALTHCHECK --interval=15s --timeout=5s --retries=5 \
+    CMD ["/bin/bash", "-c", "/opt/scripts/healthcheck.sh"]
+
+# Volumes for persistent data
+VOLUME ["/opt/iobroker"]
+
+# Run startup-script
+ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]

debian/scripts/iobroker_startup.sh

@@ -143,9 +143,10 @@ if [[ -f /opt/.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"
-    echo "$packages" > /opt/scripts/.docker_config/.packages
+#    echo "$packages" > /opt/scripts/.docker_config/.packages
       bash /opt/scripts/setup_packages.sh -install
   fi
+  echo ' '
   # Register maintenance script
   echo -n 'Registering maintenance script as command... '
   echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc

debian/scripts/maintenance.sh

@@ -38,6 +38,11 @@ maintenance_enabled() {
   [[ -f "$healthcheck" && "$(cat "$healthcheck")" == maintenance ]]
 }
 
+# check status starting
+check_starting() {
+  [[ -f "$healthcheck" && "$(cat "$healthcheck")" == starting ]]
+}
+
 # display maintenance status
 maintenance_status() {
   if maintenance_enabled; then
@@ -221,6 +226,8 @@ restart_container() {
 # restore iobroker
 restore_iobroker() {
   echo 'You are now going to perform a restore of your 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.'
 
   if [[ "$autoconfirm" != yes ]]; then
     local reply
@@ -235,11 +242,17 @@ restore_iobroker() {
     echo 'This command was already confirmed by the -y or --yes option.'
   fi
 
-  echo -n 'Stopping ioBroker...'
-  stop_iob
+  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
 
-  # fixing permission errors during restore
-  #chown -R $setuid:$setgid /opt/iobroker/backup
+  if ! maintenance_enabled > /dev/null; then
+    autoconfirm=yes
+    enable_maintenance
+  fi
 
   echo -n "Restoring ioBroker... "
   set +e
@@ -263,8 +276,8 @@ restore_iobroker() {
   echo "!!!!  You can view installation process by taking a look at ioBroker log.   !!!!"
   echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
   sleep 10
-  echo 'Container will be stopped or restarted in 5 seconds...'
-  sleep 5
+  echo 'Container will be stopped or restarted in 10 seconds...'
+  sleep 10
   echo 'stopping' > "$healthcheck"
   pkill -u root
 }

debian/scripts/setup_packages.sh

@@ -1,36 +1,69 @@
 #!/bin/bash
 
+# bash strict mode
+set -euo pipefail
+
+# Reading ENV
+set +u
+packages=$PACKAGES
+debug=$DEBUG
+set -u
+
 export DEBIAN_FRONTEND=noninteractive
 
-if [ "$1" == "-install" ]
-then
-  apt-get -q update >> /opt/scripts/setup_packages.log 2>&1
-  packages=$(cat /opt/scripts/.docker_config/.packages)
-  echo ' '
-  for i in $packages; do
-    if [ "$(dpkg-query -W -f='${Status}' "$i" 2>/dev/null | grep -c "ok installed")" -eq 0 ];
-      then
-        echo -n "$i is not installed. Installing... "
-        DEBIAN_FRONTEND=noninteractive apt-get -q -y install "$i" >> /opt/scripts/setup_packages.log 2>&1
-        return=$?
-        if [[ "$return" -ne 0 ]]; then
-          echo "Failed."
-          echo "For more details see \"/opt/scripts/setup_packages.log\"."
-          echo ' '
-        else
-        echo "Done."
-        fi
-      else
-        echo "$i is already installed."
-      fi
+check_package_preq() {
+  # check for influx packages
+  if [[ "$i" == "influxdb" || "$i" == "influxdb2-cli" ]]; then
+    # add influxdata repo keys
+    wget -qO- https://repos.influxdata.com/influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null
+    echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list
+    apt-get -q update >> /opt/scripts/setup_packages.log 2>&1
+  fi
+}
+check_package_validity() {
+  # check string for double spaces
+  while echo "$packages" | grep -q '  '; do
+    packages=$(echo "$packages" | sed 's/  / /g')
   done
-elif [ "$1" == "-update" ]; then
+  # remove packages when "influxdb" AND "influxdb2-cli"
+  if echo "$packages" | grep -qw "influxdb" && echo "$packages" | grep -qw "influxdb2-cli"; then
+    echo "PACKAGES includes influxdb AND influxdb2-cli."
+    echo "As installing both packages together is not possible, they will be skipped."
+    packages=$(echo "$packages" | sed 's/influxdb2-cli//g;s/influxdb//g')
+    # check string for double spaces again
+    while echo "$packages" | grep -q '  '; do
+      packages=$(echo "$packages" | sed 's/  / /g')
+    done
+    if [[ $debug == "true" ]]; then echo "[DEBUG] New list of packages: ""$packages"; fi
+    echo ' '
+  fi
+}
+
+if [[ "$1" == "-install" ]]; then
+  echo ' '
+  apt-get -q update >> /opt/scripts/setup_packages.log 2>&1
+  check_package_validity
+  for i in $packages; do
+    if ! dpkg -s "$i" >/dev/null 2>&1; then
+      echo -n "$i is not installed. Installing... "
+      check_package_preq >> /opt/scripts/setup_packages.log 2>&1
+      if ! apt-get -q -y install "$i" >> /opt/scripts/setup_packages.log 2>&1; then
+        echo "Failed."
+        echo "For more details see \"/opt/scripts/setup_packages.log\"."
+      else
+        echo "Done."
+      fi
+    else
+      echo "$i is already installed."
+    fi
+  done
+elif [[ "$1" == "-update" ]]; then
   echo -n "Updating Linux packages on first run... "
   apt-get -q update >> /opt/scripts/setup_packages.log 2>&1
-  return=$?
-  apt-get -q -y upgrade >> /opt/scripts/setup_packages.log 2>&1
   return1=$?
-  if [[ "$return" -ne 0 || "$return1" -ne 0 ]]; then
+  apt-get -q -y upgrade >> /opt/scripts/setup_packages.log 2>&1
+  return2=$?
+  if [[ "$return1" -ne 0 || "$return2" -ne 0 ]]; then
     echo "Failed."
     echo "For more details see \"/opt/scripts/setup_packages.log\"."
     echo "Make sure the container has internet access to get the latest package updates."
@@ -47,4 +80,4 @@ fi
 apt-get -qq autoclean -y && apt-get -qq autoremove && apt-get -qq clean
 rm -rf /tmp/* /var/tmp/* && rm -rf /root/.cache/* && rm -rf /var/lib/apt/lists/* && rm -f /opt/scripts/.docker_config/.packages
 
-exit 0
+exit 0