Update CHANGELOG.md

Bump benc-uk/workflow-dispatch from 1.1 to 1.2

.VERSION

@@ -1 +1 @@
-v7.0.0-beta.1
+v7.1.1

.github/dependencies/.admin-version

@@ -0,0 +1 @@
+6.2.23

.github/dependencies/.backitup-version

@@ -0,0 +1 @@
+2.4.12

.github/dependencies/.discovery-version

@@ -0,0 +1 @@
+3.0.5

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

@@ -1,128 +0,0 @@
-# Github action to build Docker image from beta branch (tag: beta)
-name: Build debian beta-node16
-
-on:
-  release:
-    types: [prereleased]
-  workflow_dispatch:
-
-jobs:
-  build-beta-node16-image:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Getting published prerelease tag
-        run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-    
-      - name: Checkout repo
-        uses: actions/checkout@v3
-        with:
-          repository: 'buanet/ioBroker.docker'
-          ref: ${{ env.RELEASE_TAG }}
-
-      - name: Get and write version and date
-        id: version
-        run: |
-          VERSION="$(cat .VERSION)"
-          MAJORVERSION="$(cat .VERSION | cut -c 1-2 | sed -r 's#^(.{0})#\1latest-#')"
-          DATI="$(date --rfc-3339=seconds | sed 's/ /T/')"
-          echo "This is the Version: $VERSION"
-          echo "version=$VERSION" >> $GITHUB_ENV
-          echo "This is the Major Version: $MAJORVERSION"
-          echo "majorversion=$MAJORVERSION" >> $GITHUB_ENV
-          echo "This is the Buildnumber/Timestamp: $DATI"
-          echo "dati=$DATI" >> $GITHUB_ENV
-          # startup script
-          sed -e "s/\${VERSION}/$VERSION/" -e "s/\${BUILD}/$DATI/" ./debian/scripts/iobroker_startup.sh > ./debian/scripts/iobroker_startup.tmp
-          mv -f ./debian/scripts/iobroker_startup.tmp ./debian/scripts/iobroker_startup.sh
-          # amd64
-          sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" ./debian/node16/Dockerfile > ./debian/node16/Dockerfile.tmp 
-          mv -f ./debian/node16/Dockerfile.tmp ./debian/node16/Dockerfile
-
-      - name: Set up manifest tool
-        run: |
-          wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool
-          chmod +x manifest-tool
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2.0.0
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASS }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.0.0
-        with:
-          registry: ghcr.io
-          username: ${{ secrets.PACKAGES_USER }}
-          password: ${{ secrets.PACKAGES_PASS }}
-
-      - name: Build Docker image (node16-amd64)
-        uses: docker/build-push-action@v3.0.0
-        with:
-          context: ./debian
-          file: ./debian/node16/Dockerfile
-          push: true
-          platforms: linux/amd64
-          tags: |
-            buanet/iobroker:${{ env.version }}-node16-amd64,
-            ghcr.io/buanet/iobroker:${{ env.version }}-node16-amd64
-
-      - name: Build Docker image (node16-arm32v7)
-        uses: docker/build-push-action@v3.0.0
-        with:
-          context: ./debian
-          file: ./debian/node16/Dockerfile
-          push: true
-          platforms: linux/arm/v7
-          tags: |
-            buanet/iobroker:${{ env.version }}-node16-arm32v7,
-            ghcr.io/buanet/iobroker:${{ env.version }}-node16-arm32v7
-
-      - name: Build Docker image (node16-arm64v8)
-        uses: docker/build-push-action@v3.0.0
-        with:
-          context: ./debian
-          file: ./debian/node16/Dockerfile
-          push: true
-          platforms: linux/arm64/v8
-          tags: |
-            buanet/iobroker:${{ env.version }}-node16-arm64v8,
-            ghcr.io/buanet/iobroker:${{ env.version }}-node16-arm64v8
-
-      - name: Create and push manifests
-        run: |
-          sed -e "s/\${VERSION}/${{ env.version }}-node16/g" -e "s/\${DOCKERTAG}/beta-node16/g" ./manifest.yml > manifest_beta-node16.yaml
-          ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_beta-node16.yaml
-          sed -e "s/\${VERSION}/${{ env.version }}-node16/g" -e "s/\${DOCKERTAG}/beta-node16/g" ./manifest_ghcr.yml > manifest_ghcr_beta-node16.yaml
-          ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_beta-node16.yaml
-          sed -e "s/\${VERSION}/${{ env.version }}-node16/g" -e "s/\${DOCKERTAG}/${{ env.version }}-node16/g" ./manifest.yml > manifest_version-node16.yaml
-          ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_version-node16.yaml
-          sed -e "s/\${VERSION}/${{ env.version }}-node16/g" -e "s/\${DOCKERTAG}/${{ env.version }}-node16/g" ./manifest_ghcr.yml > manifest_ghcr_version-node16.yaml
-          ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_version-node16.yaml
-
-      - name: Delete untagged images from GitHub packages
-        uses: actions/github-script@v6
-        with:
-          github-token: ${{ secrets.PACKAGES_PASS }}
-          script: |
-            const response = await github.request("GET /users/${{ env.OWNER }}/packages/container/${{ env.PACKAGE_NAME }}/versions",
-              { per_page: ${{ env.PER_PAGE }}
-            });
-            for(version of response.data) {
-                if (version.metadata.container.tags.length == 0) {
-                    console.log("delete " + version.id)
-                    const deleteResponse = await github.request("DELETE /user/packages/container/${{ env.PACKAGE_NAME }}/versions/" + version.id, { });
-                    console.log("status " + deleteResponse.status)
-                }
-            }
-        env:
-          OWNER: buanet
-          PACKAGE_NAME: iobroker
-          PER_PAGE: 100      

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

@@ -40,31 +40,31 @@ jobs:
 
       - name: Set up manifest tool
         run: |
-          wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool
+          wget https://github.com/estesp/manifest-tool/releases/download/v1.0.3/manifest-tool-linux-amd64 -O manifest-tool
           chmod +x manifest-tool
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.2.1
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2.0.0
+        uses: docker/login-action@v2.1.0
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.0.0
+        uses: docker/login-action@v2.1.0
         with:
           registry: ghcr.io
           username: ${{ secrets.PACKAGES_USER }}
           password: ${{ secrets.PACKAGES_PASS }}
 
       - name: Build Docker image (node18-amd64)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
           file: ./debian/node18/Dockerfile
@@ -75,7 +75,7 @@ jobs:
             ghcr.io/buanet/iobroker:${{ env.version }}-node18-amd64
 
       - name: Build Docker image (node18-arm32v7)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
           file: ./debian/node18/Dockerfile
@@ -86,7 +86,7 @@ jobs:
             ghcr.io/buanet/iobroker:${{ env.version }}-node18-arm32v7
 
       - name: Build Docker image (node18-arm64v8)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
           file: ./debian/node18/Dockerfile

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

@@ -40,31 +40,31 @@ jobs:
 
       - name: Set up manifest tool
         run: |
-          wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool
+          wget https://github.com/estesp/manifest-tool/releases/download/v1.0.3/manifest-tool-linux-amd64 -O manifest-tool
           chmod +x manifest-tool
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.2.1
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2.0.0
+        uses: docker/login-action@v2.1.0
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.0.0
+        uses: docker/login-action@v2.1.0
         with:
           registry: ghcr.io
           username: ${{ secrets.PACKAGES_USER }}
           password: ${{ secrets.PACKAGES_PASS }}
 
       - name: Build Docker image (amd64)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
           file: ./debian/node16/Dockerfile
@@ -75,7 +75,7 @@ jobs:
             ghcr.io/buanet/iobroker:${{ env.version }}-amd64
 
       - name: Build Docker image (arm32v7)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
           file: ./debian/node16/Dockerfile
@@ -86,7 +86,7 @@ jobs:
             ghcr.io/buanet/iobroker:${{ env.version }}-arm32v7
 
       - name: Build Docker image (arm64v8)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
           file: ./debian/node16/Dockerfile

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

@@ -1,119 +0,0 @@
-# Github action to build Docker image from dev branch (tag: dev)
-name: Build debian dev-node16
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build-dev-node16-image:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo (dev)
-        uses: actions/checkout@v3
-        with:
-          repository: 'buanet/ioBroker.docker'
-          ref: 'main'
-
-      - name: Get and write version and date
-        id: version
-        run: |
-          VERSION="$(cat .VERSION)"
-          MAJORVERSION="$(cat .VERSION | cut -c 1-2 | sed -r 's#^(.{0})#\1latest-#')"
-          DATI="$(date --rfc-3339=seconds | sed 's/ /T/')"
-          echo "This is the Version: $VERSION"
-          echo "version=$VERSION" >> $GITHUB_ENV
-          echo "This is the Major Version: $MAJORVERSION"
-          echo "majorversion=$MAJORVERSION" >> $GITHUB_ENV
-          echo "This is the Buildnumber/Timestamp: $DATI"
-          echo "dati=$DATI" >> $GITHUB_ENV
-          # startup script
-          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${BUILD}/$DATI/" ./debian/scripts/iobroker_startup.sh > ./debian/scripts/iobroker_startup.tmp
-          mv -f ./debian/scripts/iobroker_startup.tmp ./debian/scripts/iobroker_startup.sh
-          # amd64
-          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" ./debian/node16/Dockerfile > ./debian/node16/Dockerfile.tmp 
-          mv -f ./debian/node16/Dockerfile.tmp ./debian/node16/Dockerfile
-
-      - name: Set up manifest tool
-        run: |
-          wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool
-          chmod +x manifest-tool
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2.0.0
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASS }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.0.0
-        with:
-          registry: ghcr.io
-          username: ${{ secrets.PACKAGES_USER }}
-          password: ${{ secrets.PACKAGES_PASS }}
-
-      - name: Build Docker image (node16-amd64)
-        uses: docker/build-push-action@v3.0.0
-        with:
-          context: ./debian
-          file: ./debian/node16/Dockerfile
-          push: true
-          platforms: linux/amd64
-          tags: |
-            buanet/iobroker:dev-node16-amd64,
-            ghcr.io/buanet/iobroker:dev-node16-amd64
-
-      - name: Build Docker image (node16-arm32v7)
-        uses: docker/build-push-action@v3.0.0
-        with:
-          context: ./debian
-          file: ./debian/node16/Dockerfile
-          push: true
-          platforms: linux/arm/v7
-          tags: |
-            buanet/iobroker:dev-node16-arm32v7,
-            ghcr.io/buanet/iobroker:dev-node16-arm32v7
-
-      - name: Build Docker image (node16-arm64v8)
-        uses: docker/build-push-action@v3.0.0
-        with:
-          context: ./debian
-          file: ./debian/node16/Dockerfile
-          push: true
-          platforms: linux/arm64/v8
-          tags: |
-            buanet/iobroker:dev-node16-arm64v8,
-            ghcr.io/buanet/iobroker:dev-node16-arm64v8
-
-      - name: Create and push manifests
-        run: |
-          sed -e "s/\${VERSION}/dev-node16/g" -e "s/\${DOCKERTAG}/dev-node16/g" ./manifest.yml > manifest_dev-node16.yaml
-          ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_dev-node16.yaml
-          sed -e "s/\${VERSION}/dev-node16/g" -e "s/\${DOCKERTAG}/dev-node16/g" ./manifest_ghcr.yml > manifest_ghcr_dev-node16.yaml
-          ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_dev-node16.yaml
-
-      - name: Delete untagged images from GitHub packages
-        uses: actions/github-script@v6
-        with:
-          github-token: ${{ secrets.PACKAGES_PASS }}
-          script: |
-            const response = await github.request("GET /users/${{ env.OWNER }}/packages/container/${{ env.PACKAGE_NAME }}/versions",
-              { per_page: ${{ env.PER_PAGE }}
-            });
-            for(version of response.data) {
-                if (version.metadata.container.tags.length == 0) {
-                    console.log("delete " + version.id)
-                    const deleteResponse = await github.request("DELETE /user/packages/container/${{ env.PACKAGE_NAME }}/versions/" + version.id, { });
-                    console.log("status " + deleteResponse.status)
-                }
-            }
-        env:
-          OWNER: buanet
-          PACKAGE_NAME: iobroker
-          PER_PAGE: 100      

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

@@ -35,31 +35,31 @@ jobs:
 
       - name: Set up manifest tool
         run: |
-          wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool
+          wget https://github.com/estesp/manifest-tool/releases/download/v1.0.3/manifest-tool-linux-amd64 -O manifest-tool
           chmod +x manifest-tool
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.2.1
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2.0.0
+        uses: docker/login-action@v2.1.0
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.0.0
+        uses: docker/login-action@v2.1.0
         with:
           registry: ghcr.io
           username: ${{ secrets.PACKAGES_USER }}
           password: ${{ secrets.PACKAGES_PASS }}
 
       - name: Build Docker image (node18-amd64)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
           file: ./debian/node18/Dockerfile
@@ -70,7 +70,7 @@ jobs:
             ghcr.io/buanet/iobroker:dev-node18-amd64
 
       - name: Build Docker image (node18-arm32v7)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
           file: ./debian/node18/Dockerfile
@@ -81,7 +81,7 @@ jobs:
             ghcr.io/buanet/iobroker:dev-node18-arm32v7
 
       - name: Build Docker image (node18-arm64v8)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
           file: ./debian/node18/Dockerfile

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

@@ -12,7 +12,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: 'buanet/ioBroker.docker'
-          ref: 'main'
+          # ref: 'main'
 
       - name: Get and write version and date
         id: version
@@ -35,31 +35,31 @@ jobs:
 
       - name: Set up manifest tool
         run: |
-          wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool
+          wget https://github.com/estesp/manifest-tool/releases/download/v1.0.3/manifest-tool-linux-amd64 -O manifest-tool
           chmod +x manifest-tool
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.2.1
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2.0.0
+        uses: docker/login-action@v2.1.0
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.0.0
+        uses: docker/login-action@v2.1.0
         with:
           registry: ghcr.io
           username: ${{ secrets.PACKAGES_USER }}
           password: ${{ secrets.PACKAGES_PASS }}
 
       - name: Build Docker image (amd64)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
           file: ./debian/node16/Dockerfile
@@ -70,7 +70,7 @@ jobs:
             ghcr.io/buanet/iobroker:dev-amd64
 
       - name: Build Docker image (arm32v7)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
           file: ./debian/node16/Dockerfile
@@ -81,7 +81,7 @@ jobs:
             ghcr.io/buanet/iobroker:dev-arm32v7
 
       - name: Build Docker image (arm64v8)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
           file: ./debian/node16/Dockerfile

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

@@ -39,52 +39,52 @@ jobs:
           sed -e "s/\${VERSION}/$VERSION/" -e "s/\${BUILD}/$DATI/" ./debian/scripts/iobroker_startup.sh > ./debian/scripts/iobroker_startup.tmp
           mv -f ./debian/scripts/iobroker_startup.tmp ./debian/scripts/iobroker_startup.sh
           # amd64
-          sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" ./debian/node14/Dockerfile > ./debian/node14/Dockerfile.tmp 
+          sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" ./debian/node16/Dockerfile > ./debian/node16/Dockerfile.tmp 
-          mv -f ./debian/node14/Dockerfile.tmp ./debian/node14/Dockerfile
+          mv -f ./debian/node16/Dockerfile.tmp ./debian/node16/Dockerfile
 
       - name: Set up manifest tool
         run: |
-          wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool
+          wget https://github.com/estesp/manifest-tool/releases/download/v1.0.3/manifest-tool-linux-amd64 -O manifest-tool
           chmod +x manifest-tool
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.2.1
 
       - name: Login to DockerHub (iobroker)
-        uses: docker/login-action@v2.0.0
+        uses: docker/login-action@v2.1.0
         with:
           username: ${{ secrets.DOCKER_USER_IOB }}
           password: ${{ secrets.DOCKER_PASS_IOB }}
 
       - name: Build Docker image (amd64)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
           push: true
           platforms: linux/amd64
           tags: |
             iobroker/iobroker:${{ env.version }}-amd64,
 
       - name: Build Docker image (arm32v7)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
           push: true
           platforms: linux/arm/v7
           tags: |
             iobroker/iobroker:${{ env.version }}-arm32v7,
 
       - name: Build Docker image (arm64v8)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
           push: true
           platforms: linux/arm64/v8
           tags: |

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

@@ -39,39 +39,39 @@ jobs:
           sed -e "s/\${VERSION}/$VERSION/" -e "s/\${BUILD}/$DATI/" ./debian/scripts/iobroker_startup.sh > ./debian/scripts/iobroker_startup.tmp
           mv -f ./debian/scripts/iobroker_startup.tmp ./debian/scripts/iobroker_startup.sh
           # amd64
-          sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" ./debian/node14/Dockerfile > ./debian/node14/Dockerfile.tmp 
+          sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" ./debian/node16/Dockerfile > ./debian/node16/Dockerfile.tmp 
-          mv -f ./debian/node14/Dockerfile.tmp ./debian/node14/Dockerfile
+          mv -f ./debian/node16/Dockerfile.tmp ./debian/node16/Dockerfile
 
       - name: Set up manifest tool
         run: |
-          wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool
+          wget https://github.com/estesp/manifest-tool/releases/download/v1.0.3/manifest-tool-linux-amd64 -O manifest-tool
           chmod +x manifest-tool
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.2.1
 
       - name: Login to DockerHub (buanet)
-        uses: docker/login-action@v2.0.0
+        uses: docker/login-action@v2.1.0
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.0.0
+        uses: docker/login-action@v2.1.0
         with:
           registry: ghcr.io
           username: ${{ secrets.PACKAGES_USER }}
           password: ${{ secrets.PACKAGES_PASS }}
 
       - name: Build Docker image (amd64)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
           push: true
           platforms: linux/amd64
           tags: |
@@ -79,10 +79,10 @@ jobs:
             ghcr.io/buanet/iobroker:${{ env.version }}-amd64
 
       - name: Build Docker image (arm32v7)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
           push: true
           platforms: linux/arm/v7
           tags: |
@@ -90,10 +90,10 @@ jobs:
             ghcr.io/buanet/iobroker:${{ env.version }}-arm32v7
 
       - name: Build Docker image (arm64v8)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.2.0
         with:
           context: ./debian
-          file: ./debian/node14/Dockerfile
+          file: ./debian/node16/Dockerfile
           push: true
           platforms: linux/arm64/v8
           tags: |

.github/workflows/check-iobroker-versions.yml

@@ -1,8 +1,8 @@
-name: Check js-controller release
+name: Check ioBroker versions
 
 on:
   schedule:
-    - cron:  '42 23 * * *'
+    - cron: '42 23 * * *'
   workflow_dispatch:
 
 jobs:
@@ -15,13 +15,20 @@ jobs:
           repository: 'buanet/ioBroker.docker'
           token: ${{ secrets.ACTIONS_PAT }}
 
-      - name: Fetch js-controller release version
+      - name: Fetch ioBroker versions
         run: |
           curl -sL https://repo.iobroker.live/sources-dist.json | \
           jq -r '."js-controller".version' > .github/dependencies/.js-controller-version
-          # curl -sL https://api.github.com/repos/ioBroker/ioBroker.js-controller/releases/latest | \
-          # jq -r ".tag_name" > .github/dependencies/.js-controller-version
           echo "[LOG] Fetched js-controller version is $(cat .github/dependencies/.js-controller-version)"
+          curl -sL https://repo.iobroker.live/sources-dist.json | \
+          jq -r '."admin".version' > .github/dependencies/.admin-version
+          echo "[LOG] Fetched admin version is $(cat .github/dependencies/.admin-version)"
+          curl -sL https://repo.iobroker.live/sources-dist.json | \
+          jq -r '."backitup".version' > .github/dependencies/.backitup-version
+          echo "[LOG] Fetched backitup version is $(cat .github/dependencies/.backitup-version)"
+          curl -sL https://repo.iobroker.live/sources-dist.json | \
+          jq -r '."discovery".version' > .github/dependencies/.discovery-version
+          echo "[LOG] Fetched discovery version is $(cat .github/dependencies/.discovery-version)"
 
       - name: Check for modified files
         id: git-check
@@ -32,12 +39,12 @@ jobs:
         run: |
           git config --global user.name 'buanet'
           git config --global user.email 'info@buanet.de'
-          git commit -am "new js-controller release"
+          git commit -am "new ioBroker versions"
           git push
 
       - name: Trigger build debian latest (buanet)
         if: steps.git-check.outputs.modified == 'true'
-        uses: benc-uk/workflow-dispatch@v1.1
+        uses: benc-uk/workflow-dispatch@v1.2
         with:
           workflow: Build debian latest (buanet)
           repo: buanet/ioBroker.docker
@@ -45,7 +52,7 @@ jobs:
 
       - name: Trigger build debian latest (iobroker)
         if: steps.git-check.outputs.modified == 'true'
-        uses: benc-uk/workflow-dispatch@v1.1
+        uses: benc-uk/workflow-dispatch@v1.2
         with:
           workflow: Build debian latest (iobroker)
           repo: buanet/ioBroker.docker

CHANGELOG.md

@@ -1,11 +1,30 @@
 ## Changelog
-### v7.0.0-beta.1 (16.06.2022)
+
-* upgrade node version to recommended node16 
+### v7.1.1 (01.11.2022)
-* rewrite maintenance script ([#243 by @agross](https://github.com/buanet/ioBroker.docker/pull/243))
+* fix setting gid of iobroker group ([#289](https://github.com/buanet/ioBroker.docker/issues/289))
-* enhance container shutdown on SIGTERM ([as requested with #264 by @buzz0r](https://github.com/buanet/ioBroker.docker/pull/264))
+
-* enhance startup script logging
+### v7.1.0 (31.10.2022)
-* enhance logging for avahi & zwave install scripts
+* fix [build action node issue](https://forum.iobroker.net/topic/59518/docker-image-7-0-1-auf-node-js-14/14?_=1667244004952) for iobroker/iobroker repo
-* add new env for offline mode (fixes [#255](https://github.com/buanet/ioBroker.docker/issues/255))
+* v7.1.0-beta.1 (12.10.2022)
+  * add env DEBUG for extended debugging log
+  * enhance logging in iobroker-startup.sh
+  * enhance build process
+  * add restart option to maintenance script
+  * add strict mode for iobroker-startup.sh
+  * fix "unary operator expected" error
+
+### v7.0.1 (05.07.2022)
+* backitup restore patch
+
+### v7.0.0 (21.06.2022)
+* update docs & ci
+* v7.0.0-beta.1 (16.06.2022)
+  * upgrade node version to recommended node16 
+  * rewrite maintenance script ([#243 by @agross](https://github.com/buanet/ioBroker.docker/pull/243))
+  * enhance container shutdown on SIGTERM ([as requested with #264 by @buzz0r](https://github.com/buanet/ioBroker.docker/pull/264))
+  * enhance startup script logging
+  * enhance logging for avahi & zwave install scripts
+  * add new env for offline mode (fixes [#255](https://github.com/buanet/ioBroker.docker/issues/255))
 
 ### v6.1.0 (2022-03-01)
 * v6.1.0-beta.2 (2022-02-11)
@@ -20,7 +39,7 @@
   * add alias "m" for maintenance script
 
 ### v6.0.0 (2021-12-09)
-* move docu/ restructuring readme
+* move docs/ restructuring readme
 * v6.0.0-beta1 (2021-10-07)
   * upgrade node version to recommended node14 
   * add beta-node16 tag for beta testing node16

README.md

@@ -60,7 +60,7 @@ Please do not use the issues for support questions. Not every error message is w
 
 ### Beta testing
 
-If you want to get the newest features and changes feel free to use/ test the beta version of the Docker image. You can find the changelog for beta versions [here](https://github.com/buanet/ioBroker.docker/blob/dev/CHANGELOG.md). For more details and beta support join us at the "docker-image" chat on the [ioBroker Discord channel](https://discord.gg/Ne3y6fUac3).
+If you want to get the newest features and changes feel free to use/ test the beta version of the Docker image. For more details and beta support join us at "beta testing & feedback" > "docker-image" on the [ioBroker Discord channel](https://discord.gg/Ne3y6fUac3).
 
 ### Support the project
 

debian/scripts/iobroker_startup.sh

@@ -1,11 +1,16 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+# bash strict mode
+set -euo pipefail
 
 # Setting healthcheck status to "starting"
 echo 'starting' > /opt/scripts/.docker_config/.healthcheck
 
 # Reading ENV
+set +u
 adminport=$IOB_ADMINPORT
 avahi=$AVAHI
+debug=$DEBUG
 multihost=$IOB_MULTIHOST
 offlinemode=$OFFLINE_MODE
 objectsdbhost=$IOB_OBJECTSDB_HOST
@@ -19,6 +24,7 @@ statesdbport=$IOB_STATESDB_PORT
 statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
+set -u
 
 pkill_timeout=10      # timeout for iobroker shutdown in seconds
 
@@ -30,44 +36,47 @@ echo ' '
 echo "$(printf -- '-%.0s' {1..80})"
 echo -n "$(printf -- '-%.0s' {1..25})" && echo -n "     "$dati"      " && echo "$(printf -- '-%.0s' {1..25})"
 echo "$(printf -- '-%.0s' {1..80})"
-echo ' '
+echo '-----                                                                      -----'
-echo "$(printf -- '-%.0s' {1..80})"
+echo "----- ██╗  ██████╗  ██████╗  ██████╗   ██████╗  ██╗  ██╗ ███████╗ ██████╗  -----"
-echo "-----                 Welcome to your ioBroker-container!                  -----"
+echo "----- ██║ ██╔═══██╗ ██╔══██╗ ██╔══██╗ ██╔═══██╗ ██║ ██╔╝ ██╔════╝ ██╔══██╗ -----"
-echo "-----                    Startupscript is now running.                     -----"
+echo "----- ██║ ██║   ██║ ██████╔╝ ██████╔╝ ██║   ██║ █████╔╝  █████╗   ██████╔╝ -----"
+echo "----- ██║ ██║   ██║ ██╔══██╗ ██╔══██╗ ██║   ██║ ██╔═██╗  ██╔══╝   ██╔══██╗ -----"
+echo "----- ██║ ╚██████╔╝ ██████╔╝ ██║  ██║ ╚██████╔╝ ██║  ██╗ ███████╗ ██║  ██║ -----"
+echo "----- ╚═╝  ╚═════╝  ╚═════╝  ╚═╝  ╚═╝  ╚═════╝  ╚═╝  ╚═╝ ╚══════╝ ╚═╝  ╚═╝ -----"
+echo '-----                                                                      -----'
+echo "-----              Welcome to your ioBroker Docker container!              -----"
+echo "-----                    Startupscript is now running!                     -----"
 echo "-----                          Please be patient!                          -----"
 echo "$(printf -- '-%.0s' {1..80})"
 echo ' '
 echo "$(printf -- '-%.0s' {1..80})"
-echo "-----                        Debugging information                         -----"
+echo "-----                          System Information                          -----"
-echo "-----                                                                      -----"
-echo "-----                                System                                -----"
 echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" arch: $(uname -m))" && echo " -----"
 echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" hostname: $(hostname))" && echo " -----"
 echo "-----                                                                      -----"
-echo "-----                             Docker-Image                             -----"
+echo "-----                          Version Information                         -----"
 echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" image: ${VERSION})" && echo " -----"
 echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" build: ${BUILD})" && echo " -----"
-echo "-----                                                                      -----"
-echo "-----                               Versions                               -----"
 echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" node: $(node -v))" && echo " -----"
 echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" npm: $(npm -v))" && echo " -----"
 echo "-----                                                                      -----"
-echo "-----                                 ENV                                  -----"
+echo "-----                        Environment Variables                         -----"
-if [ "$avahi" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" AVAHI: $avahi)" && echo " -----"; fi
+if [[ "$adminport" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_ADMINPORT: $adminport)" && echo " -----"; fi
-if [ "$adminport" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_ADMINPORT: $adminport)" && echo " -----"; fi
+if [[ "$avahi" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" AVAHI: $avahi)" && echo " -----"; fi
-if [ "$multihost" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_MULTIHOST: $multihost)" && echo " -----"; fi
+if [[ "$debug" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" DEBUG: $debug)" && echo " -----"; fi
-if [ "$objectsdbhost" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi
+if [[ "$multihost" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_MULTIHOST: $multihost)" && echo " -----"; fi
-if [ "$objectsdbport" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi
+if [[ "$objectsdbhost" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi
-if [ "$objectsdbtype" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi
+if [[ "$objectsdbport" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi
-if [ "$statesdbhost" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_STATESDB_HOST: $statesdbhost)" && echo " -----"; fi
+if [[ "$objectsdbtype" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi
-if [ "$statesdbport" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_STATESDB_PORT: $statesdbport)" && echo " -----"; fi
+if [[ "$statesdbhost" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_STATESDB_HOST: $statesdbhost)" && echo " -----"; fi
-if [ "$statesdbtype" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_STATESDB_TYPE: $statesdbtype)" && echo " -----"; fi
+if [[ "$statesdbport" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_STATESDB_PORT: $statesdbport)" && echo " -----"; fi
-if [ "$offlinemode" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" OFFLINE_MODE: $offlinemode)" && echo " -----"; fi
+if [[ "$statesdbtype" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" IOB_STATESDB_TYPE: $statesdbtype)" && echo " -----"; fi
-if [ "$packages" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" PACKAGES: "$packages")" && echo " -----"; fi
+if [[ "$offlinemode" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" OFFLINE_MODE: $offlinemode)" && echo " -----"; fi
-if [ "$setgid" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" SETGID: $setgid)" && echo " -----"; fi
+if [[ "$packages" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" PACKAGES: "$packages")" && echo " -----"; fi
-if [ "$setuid" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" SETUID: $setuid)" && echo " -----"; fi
+if [[ "$setgid" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" SETGID: $setgid)" && echo " -----"; fi
-if [ "$usbdevices" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" USBDEVICES: $usbdevices)" && echo " -----"; fi
+if [[ "$setuid" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" SETUID: $setuid)" && echo " -----"; fi
-if [ "$zwave" != "" ]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" ZWAVE: $zwave)" && echo " -----"; fi
+if [[ "$usbdevices" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" USBDEVICES: $usbdevices)" && echo " -----"; fi
+if [[ "$zwave" != "" ]]; then echo -n "-----                    " && echo -n "$(printf "%-20s %-28s" ZWAVE: $zwave)" && echo " -----"; fi
 echo "$(printf -- '-%.0s' {1..80})"
 echo ' '
 
@@ -80,10 +89,10 @@ echo "$(printf -- '-%.0s' {1..80})"
 echo ' '
 
 # Actions running on first start only
-if [ -f /opt/.firstrun ]; then
+if [[ -f /opt/.firstrun ]]; then
   # Updating Linux packages
-  if [ "$offlinemode" = "true" ]; then
+  if [[ "$offlinemode" = "true" ]]; then
-    echo 'Offline mode is activated by ENV. Skipping Linux package updates on first run.'
+    echo 'OFFLINE_MODE is \"true\". Skipping Linux package updates on first run.'
     echo ' '
   else
     echo 'Updating Linux packages on first run...'
@@ -91,6 +100,18 @@ if [ -f /opt/.firstrun ]; then
     echo 'Done.'
     echo ' '
   fi
+  # Installing packages from ENV
+  if [[ "$packages" != "" && "$offlinemode" = "true" ]]; then
+    echo 'PACKAGES is set, but OFFLINE_MODE is \"true\". Skipping Linux package installation.'
+    echo ' '
+  else
+    echo 'PACKAGES is set. Installing additional Linux packages.'
+    echo "Checking the following packages:" $packages"..."
+    echo $packages > /opt/scripts/.docker_config/.packages
+      bash /opt/scripts/setup_packages.sh -install
+    echo 'Done.'
+    echo ' '
+  fi
   # Register maintenance script
   echo -n 'Registering maintenance script as command... '
   echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
@@ -103,26 +124,12 @@ else
   echo ' '
 fi
 
-# Installing packages from ENV
-if [ "$packages" != "" ] && [ "$offlinemode" = "true" ]; then
-  echo 'Installing additional packages is set by ENV but offline mode is activated!'
-  echo 'Skipping Linux packages installation.'
-  echo ' '
-else
-  echo 'Installing additional packages is set by ENV.'
-  echo "Checking the following Packages:" $packages"..."
-  echo $packages > /opt/scripts/.docker_config/.packages
-    bash /opt/scripts/setup_packages.sh -install
-  echo 'Done.'
-  echo ' '
-fi
-
 # Setting UID and/ or GID
-if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]; then
+if [[ "$setgid" != "$(cat /etc/group | grep 'iobroker:' | cut -d':' -f3)" || "$setuid" != "$(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3)" ]]; then
-  echo "Different UID and/ or GID is set by ENV."
+  echo "SETUID and/ or SETGID are set to individual values."
   echo -n "Changing UID to "$setuid" and GID to "$setgid"... "
     usermod -u $setuid iobroker
-    groupmod -g $setgid iobroker
+    groupmod -og $setgid iobroker
   echo 'Done.'
   echo ' '
 fi
@@ -138,25 +145,24 @@ echo "-----             Step 2 of 5: Detecting ioBroker installation
 echo "$(printf -- '-%.0s' {1..80})"
 echo ' '
 
-if [ `find /opt/iobroker -type f | wc -l` -lt 1 ]
+if [[ `find /opt/iobroker -type f | wc -l` -lt 1 ]]; then
-then
   echo "There is no data detected in /opt/iobroker."
   echo -n "Restoring initial ioBroker installation... "
     tar -xf /opt/initial_iobroker.tar -C /
   echo 'Done.'
-elif [ -f /opt/iobroker/iobroker ]
+elif [[ -f /opt/iobroker/iobroker ]]; then
-then
+  echo "Existing installation of ioBroker detected in \"/opt/iobroker\"."
-  echo "Existing installation of ioBroker detected in /opt/iobroker."
+elif [[ "$(ls *_backupiobroker.tar.gz 2> /dev/null | wc -l)" != "0" && "$(tar -ztvf /opt/iobroker/*_backupiobroker.tar.gz "backup/backup.json" 2> /dev/null | wc -l)" != "0" ]]; then
-elif [ $(ls *_backupiobroker.tar.gz 2> /dev/null | wc -l) != "0" ] && [ $(tar -ztvf /opt/iobroker/*_backupiobroker.tar.gz "backup/backup.json" 2> /dev/null | wc -l) != "0" ]
+  if [[ "$multihost" = "slave" ]]; then
-then
-  if [ "$multihost" = "slave" ]
-  then
     echo "IoBroker backup file detected in /opt/iobroker. But Multihost is set to \"slave\"."
     echo "Restoring a backup is not supported on Multihost slaves. Please check configuration and start over."
     echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
     exit 1
   else
     echo "IoBroker backup file detected in /opt/iobroker."
+    if [[ "$debug" == "true" ]]; then
+      echo "[DEBUG] Backup file name: " $(ls *_backupiobroker.tar.gz) 
+    fi
     echo -n "Preparing restore... "
       mv /opt/iobroker/*.tar.gz /opt/
       tar -xf /opt/initial_iobroker.tar -C /
@@ -171,7 +177,7 @@ then
     echo ' '
     echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
     echo "!!!!!                             IMPORTANT NOTE                             !!!!!"
-    echo "!!!!!        The sartup script restored iobroker from a backup file.         !!!!!"
+    echo "!!!!!        The startup script restored iobroker from a backup file.        !!!!!"
     echo "!!!!! Check /opt/iobroker/log/restore.log to see if restore was successful.  !!!!!"
     echo "!!!!! When ioBroker now starts it will reinstall all Adapters automatically. !!!!!"
     echo "!!!!!         This might be take a looooong time! Please be patient!         !!!!!"
@@ -181,6 +187,10 @@ then
 else
   echo "There is data detected in /opt/iobroker but it looks like it is no instance of ioBroker or a valid backup file!"
   echo "Please check/ recreate mounted folder or volume and start over."
+  if [[ "$debug" == "true" ]]; then
+    echo "[DEBUG] Detected files:"
+    ls -al
+  fi
   exit 1
 fi
 echo ' '
@@ -194,14 +204,14 @@ echo "$(printf -- '-%.0s' {1..80})"
 echo ' '
 
 # (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts"
-echo -n "(Re)Setting folder permissions (This might take a while! Please be patient!)... "
+echo -n "(Re)setting permissions (This might take a while! Please be patient!)... "
   chown -R $setuid:$setgid /opt/iobroker
   chown -R $setuid:$setgid /opt/scripts
 echo 'Done.'
 echo ' '
 
 # Backing up original iobroker-file and changing sudo to gosu
-echo -n "Fixing \"sudo-bug\" by replacing sudo in iobroker with gosu... "
+echo -n "Fixing \"sudo-bug\" by replacing sudo with gosu... "
   cp -a /opt/iobroker/iobroker /opt/iobroker/iobroker.bak
   chmod 755 /opt/iobroker/iobroker
   sed -i 's/sudo -H -u/gosu/g' /opt/iobroker/iobroker
@@ -209,13 +219,33 @@ echo 'Done.'
 echo ' '
 
 # checking hostname in ioBroker to match container hostname
-if [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ] && [ "$multihost" != "slave" ]
+if [[ "$(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')" != "$(hostname)" && "$multihost" != "slave" ]]; then
-then
   echo "Hostname in ioBroker does not match the hostname of this container."
-  echo -n "Updating hostname to " $(hostname)"... "
+  if [[ "$debug" == "true" ]]; then
-    bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+    echo "[DEBUG] Detected hostname in ioBroker: " $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+    echo "[DEBUG] Detected hostname in container: " $(hostname)
+  fi
+  echo -n "Updating hostname to "$(hostname)"... "
+    bash iobroker host $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
   echo 'Done.'
   echo ' '
+elif [[ "$multihost" == "slave" ]]; then
+  echo "IOB_MULTIHOST ist set to \"slave\". Hostname check will be skipped."
+  echo ' '
+elif [[ "$(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')" = "$(hostname)" && "$multihost" != "slave" ]]; then
+  echo "Hostname in ioBroker matches the hostname of this container."
+  if [[ "$debug" == "true" ]]; then
+    echo "[DEBUG] Detected hostname in ioBroker: " $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+    echo "[DEBUG] Detected hostname in container: " $(hostname)
+  fi
+  echo "No action required."
+  echo ' '
+else
+  if [[ "$debug" == "true" ]]; then
+    echo "[DEBUG] There was a problem checking the hostname."
+    echo "[DEBUG] Detected hostname in ioBroker: " $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+    echo "[DEBUG] Detected hostname in container: " $(hostname)
+  fi
 fi
 
 #####
@@ -231,11 +261,12 @@ echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.d
 echo ' '
 
 # Checking ENV for Adminport
-if [ "$adminport" != "" ]
+if [[ "$adminport" != "" ]]; then
-then
+  if [[ "$adminport" != "$(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*')" ]]; then
-  if [ "$adminport" != $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ]
+    echo "IOB_ADMINPORT is set and does not match port configured in ioBroker."
-  then
+    if [[ "$debug" == "true" ]]; then
-    echo "Adminport set by ENV does not match port configured in ioBroker installation."
+      echo "[DEBUG] Detected Admin Port in ioBroker: " $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*')
+    fi
     echo -n "Setting Adminport to \""$adminport"\"... "
       bash iobroker set admin.0 --port $adminport
     echo 'Done.'
@@ -244,12 +275,10 @@ then
 fi
 
 # Checking ENV for AVAHI
-if [ "$avahi" = "true" ] && [ "$offlinemode" = "true" ]; then
+if [[ "$avahi" = "true" && "$offlinemode" = "true" ]]; then
-  echo 'Avahi-daemon is activated by ENV but offline mode is activated!'
+  echo 'AVAHI is \"true\", but OFFLINE_MODE is also \"true\". Skipping Avahi daemon setup.'
-  echo 'Skipping Avahi daemon setup.'
+elif [[ "$avahi" = "true" ]]; then
-elif [ "$avahi" = "true" ]; then
+  echo 'AVAHI is \"true\". Running setup script...'
-  echo 'Avahi-daemon is activated by ENV.'
-  echo "Running setup script..."
     chmod 755 /opt/scripts/setup_avahi.sh
     bash /opt/scripts/setup_avahi.sh
   echo 'Done.'
@@ -257,12 +286,10 @@ elif [ "$avahi" = "true" ]; then
 fi
 
 # Checking ENV for Z-WAVE
-if [ "$zwave" = "true" ] && [ "$offlinemode" = "true" ]; then
+if [[ "$zwave" = "true" && "$offlinemode" = "true" ]]; then
-  echo 'Z-Wave is activated by ENV but offline mode is activated!'
+  echo 'ZWAVE is \"true\", but OFFLINE_MODE is also \"true\". Skipping Z-Wave setup.'
-  echo 'Skipping Z-Wave setup.'
+elif [[ "$zwave" = "true" ]]; then
-elif [ "$zwave" = "true" ]; then
+  echo 'ZWAVE is \"true\". Running setup script...'
-  echo "Z-Wave is activated by ENV."
-  echo "Running setup script..."
     chmod 755 /opt/scripts/setup_zwave.sh
     bash /opt/scripts/setup_zwave.sh
   echo 'Done.'    
@@ -270,8 +297,8 @@ elif [ "$zwave" = "true" ]; then
 fi
 
 # checking ENV for USBDEVICES
-if [ "$usbdevices" != "" ] && [ "$usbdevices" != "none" ]; then
+if [[ "$usbdevices" != "" && "$usbdevices" != "none" ]]; then
-  echo "Usb-device-support is activated by ENV."
+  echo 'USBDEVICES is set.'
   IFS=';' read -ra devicearray <<< "$usbdevices"
     for i in "${devicearray[@]}"
     do
@@ -284,74 +311,60 @@ if [ "$usbdevices" != "" ] && [ "$usbdevices" != "none" ]; then
 fi
 
 # Checking ENV for multihost setup
-if [ "$multihost" != "" ]
+if [[ "$multihost" != "" ]]; then
-then
+  echo "Checking for multihost settings..."
-  echo "Checking multihost setup..."
   # Configuring objects db host
-  if [ "$multihost" = "master" ] && [ "$objectsdbtype" = "" ] && [ "$objectsdbhost" = "" ] && [ "$objectsdbport" = "" ]
+  if [[ "$multihost" = "master" && "$objectsdbtype" = "" && "$objectsdbhost" = "" && "$objectsdbport" = "" ]]; then
-  then
+    echo "IOB_MULTIHOST is set to \"master\" and no external objects db is set."
-    echo "Multihost is set as \"master\" by ENV and no external objects db is set."
+    echo -n "Setting host of objects db to \"0.0.0.0\" to allow external connections... "
-    echo -n "Setting host of objects db to \"0.0.0.0\" to allow external communication... "
       jq --arg objectsdbhost "0.0.0.0" '.objects.host = $objectsdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
       chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
     echo 'Done.'
-  elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ]
+  elif [[ "$multihost" = "master" && "$objectsdbhost" = "127.0.0.1" ]]; then
-  then
+    echo "IOB_MULTIHOST is set to \"master\", but IOB_OBJECTSDB_HOST is set to \"127.0.0.1\"."
-    echo "Multihost is set as \"master\" by ENV. But objects db host is set to \"127.0.0.1\" by ENV too."
+    echo "This configuration will not allow slaves to connect to objects db! Please change or remove \"IOB_OBJECTSDB_HOST\" and start over!"
-    echo "This configuration will not allow slaves to connect the objects db! Please change or remove ENV \"IOB_OBJECTSDB_HOST\" and start over!"
     echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
     exit 1
-  elif [ "$multihost" = "master" ] &&  [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
+  elif [[ "$multihost" = "master" && "$objectsdbtype" != "" && "$objectsdbhost" != "" && "$objectsdbport" != "" ]]; then
-  then
+    echo "IOB_MULTIHOST is set to \"master\" and external objects db is set."
-    echo "Multihost is set as \"master\" by ENV and external objects db is set."
+  elif ([[ "$multihost" = "slave" && "$objectsdbtype" = "" ]]) || ([[ "$multihost" = "slave" && "$objectsdbhost" = "" ]]) || ([[ "$multihost" = "slave" && "$objectsdbport" = "" ]]); then
-  elif ([ "$multihost" = "slave" ] && [ "$objectsdbtype" = "" ]) || ([ "$multihost" = "slave" ] && [ "$objectsdbhost" = "" ]) || ([ "$multihost" = "slave" ] && [ "$objectsdbport" = "" ])
+    echo "IOB_MULTIHOST is set to \"slave\", but no external objects db is set."
-  then
+    echo "You have to configure ENVs \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" to connect to a master objects db."
-    echo "Multihost is set as \"slave\" by ENV. But no external objects db is set."
+    echo "Please check your settings and start over!"
-    echo "You have to configure ENVs \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" to connect to a maser objects db."
-    echo "Please check your settings and start over."
     echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
     exit 1
-  elif [ "$multihost" = "slave" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
+  elif [[ "$multihost" = "slave" && "$objectsdbtype" != "" && "$objectsdbhost" != "" && "$objectsdbport" != "" ]]; then
-  then
+    echo "IOB_MULTIHOST is set to \"slave\" and external objects db is set."
-    echo "Multihost is set as \"slave\" by ENV and external objects db is set."
+  elif [[ "$multihost" != "" ]]; then
-  elif [ "$multihost" != "" ]
+    echo "IOB_MULTIHOST is set, but it seems like some configuration is missing."
-  then
-    echo "Multihost is set but it seems like some configuration is missing."
     echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" correctly and start over."
     echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
     exit 1
   fi
-
    # Configuring states db host
-  if [ "$multihost" = "master" ] && [ "$statesdbtype" = "" ] && [ "$statesdbhost" = "" ] && [ "$statesdbport" = "" ]
+  if [[ "$multihost" = "master" && "$statesdbtype" = "" && "$statesdbhost" = "" && "$statesdbport" = "" ]]; then
-  then
+    echo "IOB_MULTIHOST is set to \"master\" and no external states db is set."
-    echo "Multihost is set as \"master\" by ENV and no external states db is set."
+    echo -n "Setting host of states db to \"0.0.0.0\" to allow external connections... "
-    echo -n "Setting host of states db to \"0.0.0.0\" to allow external communication... "
       jq --arg statesdbhost "0.0.0.0" '.states.host = $statesdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
       chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
     echo 'Done.'
-  elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ]
+  elif [[ "$multihost" = "master" && "$statesdbhost" = "127.0.0.1" ]]; then
-  then
+    echo "IOB_MULTIHOST is set to \"master\", but states db host is set to \"127.0.0.1\"."
-    echo "Multihost is set as \"master\" by ENV. But states db host is set to \"127.0.0.1\" by ENV too."
+    echo "This configuration will not allow slaves to connect to objects db! Please change or remove \"IOB_STATESDB_HOST\" and start over!"
-    echo "This configuration will not work! Please change or remove ENV \"IOB_STATESDB_HOST\" and start over!"
     echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
     exit 1
-  elif [ "$multihost" = "master" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
+  elif [[ "$multihost" = "master" && "$statesdbtype" != "" && "$statesdbhost" != "" && "$statesdbport" != "" ]]; then
-  then
+    echo "IOB_MULTIHOST is set to \"master\" and external states db is set."
-    echo "Multihost is set as \"master\" by ENV and external states db is set."
+  elif ([[ "$multihost" = "slave" && "$statesdbtype" = "" ]]) || ([[ "$multihost" = "slave" && "$statesdbhost" = "" ]]) || ([[ "$multihost" = "slave" && "$statesdbport" = "" ]]); then
-  elif ([ "$multihost" = "slave" ] && [ "$statesdbtype" = "" ]) || ([ "$multihost" = "slave" ] && [ "$statesdbhost" = "" ]) || ([ "$multihost" = "slave" ] && [ "$statesdbport" = "" ])
+    echo "IOB_MULTIHOST is set to \"slave\", but no external states db is set."
-  then
-    echo "Multihost is set as \"slave\" by ENV. But no external states db is set."
     echo "You have to configure ENVs \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESDB_PORT\" to connect to a maser states db."
-    echo "Please check your settings and start over."
+    echo "Please check your settings and start over!"
     echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
     exit 1
-  elif [ "$multihost" = "slave" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
+  elif [[ "$multihost" = "slave" && "$statesdbtype" != "" && "$statesdbhost" != "" && "$statesdbport" != "" ]]; then
-  then
+    echo "IOB_MULTIHOST is set to \"slave\" and external states db is set."
-    echo "Multihost is set as \"slave\" by ENV and external states db is set."
+  elif [[ "$multihost" != "" ]]; then
-  elif [ "$multihost" != "" ]
+    echo "IOB_MULTIHOST is set, but it seems like some configuration is missing."
-  then
-    echo "Multihost is set but it seems like some configuration is missing."
     echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESTDB_PORT\" correctly and start over."
     echo "For more information see ioBroker Docker image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
     exit 1
@@ -361,11 +374,9 @@ then
 fi
 
 # Checking ENVs for custom setup of objects db
-if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ]
+if [[ "$objectsdbtype" != "" || "$objectsdbhost" != "" || "$objectsdbport" != "" ]]; then
-then
+  echo "Checking for custom objects db settings ..."
-  echo "Checking custom settings for objects db..."
+  if [[ "$objectsdbtype" != "$(jq -r '.objects.type' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
-  if [ "$objectsdbtype" != $(jq -r '.objects.type' /opt/iobroker/iobroker-data/iobroker.json) ]
-  then
     echo "IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation."
     echo -n "Setting type of objects db to \""$objectsdbtype"\"... "
       jq --arg objectsdbtype "$objectsdbtype" '.objects.type = $objectsdbtype' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
@@ -374,8 +385,7 @@ then
   else
     echo "IOB_OBJECTSDB_TYPE is set and value meets detected ioBroker installation."
   fi
-  if [ "$objectsdbhost" != $(jq -r '.objects.host' /opt/iobroker/iobroker-data/iobroker.json) ]
+  if [[ "$objectsdbhost" != "$(jq -r '.objects.host' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
-  then
     echo "IOB_OBJECTSDB_HOST is set and value is different from detected ioBroker installation."
     echo -n "Setting host of objects db to \""$objectsdbhost"\"... "
       jq --arg objectsdbhost "$objectsdbhost" '.objects.host = $objectsdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
@@ -384,8 +394,7 @@ then
   else
     echo "IOB_OBJECTSDB_HOST is set and value meets detected ioBroker installation."
   fi
-  if [ "$objectsdbport" != $(jq -r '.objects.port' /opt/iobroker/iobroker-data/iobroker.json) ]
+  if [[ "$objectsdbport" != "$(jq -r '.objects.port' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
-  then
     echo "IOB_OBJECTSDB_PORT is set and value is different from detected ioBroker installation."
     echo -n "Setting port of objects db to \""$objectsdbport"\"... "
       jq --arg objectsdbport $objectsdbport '.objects.port = $objectsdbport' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
@@ -399,11 +408,9 @@ then
 fi
 
 # Checking ENVs for custom setup of states db
-if [ "$statesdbtype" != "" ] || [ "$statesdbhost" != "" ] || [ "$statesdbport" != "" ]
+if [[ "$statesdbtype" != "" || "$statesdbhost" != "" || "$statesdbport" != "" ]]; then
-then
+  echo "Checking for custom states db settings..."
-  echo "Checking custom settings for states db..."
+  if [[ "$statesdbtype" != "$(jq -r '.states.type' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
-  if [ "$statesdbtype" != $(jq -r '.states.type' /opt/iobroker/iobroker-data/iobroker.json) ]
-  then
     echo "IOB_STATESDB_TYPE is set and value is different from detected ioBroker installation."
     echo -n "Setting type of states db to \""$statesdbtype"\"... "
       jq --arg statesdbtype "$statesdbtype" '.states.type = $statesdbtype' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
@@ -412,8 +419,7 @@ then
   else
     echo "IOB_STATESDB_TYPE is set and value meets detected ioBroker installation."
   fi
-  if [ "$statesdbhost" != $(jq -r '.states.host' /opt/iobroker/iobroker-data/iobroker.json) ]
+  if [[ "$statesdbhost" != "$(jq -r '.states.host' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
-  then
     echo "IOB_STATESDB_HOST is set and value is different from detected ioBroker installation."
     echo -n "Setting host of states db to \""$statesdbhost"\"... "
       jq --arg statesdbhost "$statesdbhost" '.states.host = $statesdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
@@ -422,8 +428,7 @@ then
   else
     echo "IOB_STATESDB_HOST is set and value meets detected ioBroker installation."
   fi
-  if [ "$statesdbport" != $(jq -r '.states.port' /opt/iobroker/iobroker-data/iobroker.json) ]
+  if [[ "$statesdbport" != "$(jq -r '.states.port' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
-  then
     echo "IOB_STATESDB_PORT is set and value is different from detected ioBroker installation."
     echo -n "Setting port of states db to \""$statesdbport"\"... "
       jq --arg statesdbport $statesdbport '.states.port = $statesdbport' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
@@ -437,18 +442,15 @@ then
 fi
 
 # Checking for Userscripts in /opt/userscripts
-if [ `find /opt/userscripts -type f | wc -l` -lt 1 ]
+if [[ `find /opt/userscripts -type f | wc -l` -lt 1 ]]; then
-then
   echo -n "There is no data detected in /opt/userscripts. Restoring exapmple userscripts... "
     tar -xf /opt/initial_userscripts.tar -C /
     chmod 755 /opt/userscripts/userscript_firststart_example.sh
     chmod 755 /opt/userscripts/userscript_everystart_example.sh
   echo 'Done.'
   echo ' '
-elif [ -f /opt/userscripts/userscript_firststart.sh ] || [ -f /opt/userscripts/userscript_everystart.sh ]
+elif [[ -f /opt/userscripts/userscript_firststart.sh || -f /opt/userscripts/userscript_everystart.sh ]]; then
-then
+  if [[ -f /opt/userscripts/userscript_firststart.sh && -f /opt/.firstrun ]]; then
-  if [ -f /opt/userscripts/userscript_firststart.sh ] && [ -f /opt/.firstrun ]
-  then
     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
@@ -456,8 +458,7 @@ then
     echo "Done."
     echo ' '
   fi
-  if [ -f /opt/userscripts/userscript_everystart.sh ]
+  if [[ -f /opt/userscripts/userscript_everystart.sh ]]; then
-  then
     echo "Userscript for every start detected. Running userscript_everystart.sh..."
       chmod 755 /opt/userscripts/userscript_everystart.sh
       bash /opt/userscripts/userscript_everystart.sh
@@ -467,9 +468,8 @@ then
 fi
 
 # Removing first run marker when exists
-if [ -f /opt/.firstrun ]
+if [[ -f /opt/.firstrun ]]; then
-then
+  rm -f /opt/.firstrun
-rm -f /opt/.firstrun
 fi
 
 #####
@@ -481,6 +481,7 @@ echo "$(printf -- '-%.0s' {1..80})"
 echo ' '
 echo "Starting ioBroker..."
 echo ' '
+echo "##### #### ### ## # iobroker.js-controller log output # ## ### #### #####"
 
 # Setting healthcheck status to "running"
 echo "running" > /opt/scripts/.docker_config/.healthcheck

debian/scripts/maintenance.sh

@@ -22,6 +22,7 @@ display_help() {
   echo '       on         > switches mantenance mode ON'
   echo '       off        > switches mantenance mode OFF and stops or restarts the container'
   echo '       upgrade    > puts the container to maintenance mode and upgrades ioBroker'
+  echo '       restart    > stops iobroker and stops or restarts the container'
   echo '       help       > shows this help'
   echo ''
   echo 'OPTIONS'
@@ -54,13 +55,16 @@ enable_maintenance() {
 
   if [[ "$killbyname" == yes ]]; then
     # undocumented option, only for use with backitup restore scripts
+    # stops iobroker by terminating js-controller process by name (the old way)
     echo 'This command will activate maintenance mode and stop js-controller.'
     echo 'Activating maintenance mode...'
     echo 'maintenance' > "$healthcheck"
     sleep 1
     echo 'Done.'
     echo -n 'Stopping ioBroker...'
-    stop_iob
+    pkill -u iobroker -f iobroker.js-controller
+    sleep 5
+    echo 'Done.'
     return
   fi
 
@@ -154,6 +158,33 @@ upgrade_jscontroller() {
   pkill -u root
 }
 
+# restart container
+restart_container() {
+  echo 'You are now going to call a restart of your container.'
+  echo 'Restarting will work depending on the configured restart policy.'
+
+  if [[ "$autoconfirm" != yes ]]; then
+    local reply
+
+    read -rp 'Do you want to continue [yes/no]? ' reply
+    if [[ "$reply" == y || "$reply" == Y || "$reply" == yes ]]; then
+      : # continue
+    else
+      return 1
+    fi
+  else
+    echo 'This command was already confirmed by the -y or --yes option.'
+  fi
+
+  echo -n 'Stopping ioBroker...'
+  stop_iob
+
+  echo 'Container will be stopped or restarted in 5 seconds...'
+  sleep 5
+  echo 'stopping' > "$healthcheck"
+  pkill -u root
+}
+
 # stop iobroker and wait until all processes stopped or pkill_timeout is reached
 stop_iob() {
   local status timeout
@@ -208,6 +239,9 @@ for arg in "$@"; do
     upgrade)
       run=(upgrade_jscontroller)
       ;;
+    restart)
+      run=(restart_container)
+      ;;
     -y|--yes)
       autoconfirm=yes
       ;;

debian/scripts/setup_packages.sh

@@ -23,13 +23,8 @@ else
   exit 1
 fi
 
-# Cleanup
+# Silent Cleanup
-apt-get autoclean -y
+apt-get -qq autoclean -y && apt-get -qq autoremove && apt-get -qq clean
-apt-get autoremove
+rm -rf /tmp/* /var/tmp/* && rm -rf /root/.cache/* && rm -rf /var/lib/apt/lists/* && rm -f /opt/scripts/.docker_config/.packages
-apt-get 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

docs/README_docker_hub_buanet.md

@@ -26,10 +26,14 @@ New major image versions (e.g. v4, v5, v6) always come with a new major version
 
 # Supported tags
 
-It is highly recommended not to use the `latest` tag for production, especially when using any kind of automated update procedure like watchtower. Please use the `latest-vX` tag instead.
+It is highly recommended not to use the `latest` tag for production, especially when using any kind of automated update procedure like watchtower. Please use the `latest-v[X]` tag instead.
+
+### Node 16 versions
+* [`v7.0.1`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`latest-v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile)
+* [`v7.0.0`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile)
 
 ### Node 14 versions
-* [`v6.1.0`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`latest-v6`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile)
+* [`v6.1.0`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`latest-v6`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile)
 * [`v6.0.0`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile)
 
 ### Node 12 versions
@@ -106,9 +110,11 @@ You could use environment variables to auto configure your ioBroker container on
 
 ### Configure environment:
 
+* `DEBUG` (optional, default: false) Set true to get extended logging messages on container startup
 * `LANG` (optional, default: de_DE.UTF‑8) The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8
 * `LANGUAGE` (optional, default: de_DE:de) The following locales are pre-generated: de_DE:de, en_US:en
 * `LC_ALL` (optional, default: de_DE.UTF-8) The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8
+* `OFFLINE_MODE` (optional & experimental, default: false) Set true if you container has no or limited internet connection
 * `PACKAGES` (optional) Installs additional linux packages to your container, packages should be separated by whitespace like this: "package1 package2 package3".
 * `SETGID` (default: 1000) In some cases it might be useful to specify the gid of the containers iobroker user to match an existing group on the docker host
 * `SETUID` (default: 1000) In some cases it might be useful to specify the uid of the containers iobroker user to match an existing user on the docker host

docs/README_docker_hub_iobroker.md

@@ -27,10 +27,14 @@ New major image versions (e.g. v4, v5, v6) always come with a new major version
 
 # Supported tags
 
-It is highly recommended not to use the `latest` tag for production, especially when using any kind of automated update procedure like watchtower. Please use the `latest-vX` tag instead.
+It is highly recommended not to use the `latest` tag for production, especially when using any kind of automated update procedure like watchtower. Please use the `latest-v[X]` tag instead.
+
+### Node 16 versions
+* [`v7.0.1`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`latest-v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile)
+* [`v7.0.0`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile)
 
 ### Node 14 versions
-* [`v6.1.0`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`latest-v6`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile)
+* [`v6.1.0`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`latest-v6`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile)
 * [`v6.0.0`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile)
 
 ### Node 12 versions
@@ -107,9 +111,11 @@ You could use environment variables to auto configure your ioBroker container on
 
 ### Configure environment:
 
+* `DEBUG` (optional, default: false) Set true to get extended logging messages on container startup
 * `LANG` (optional, default: de_DE.UTF‑8) The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8
 * `LANGUAGE` (optional, default: de_DE:de) The following locales are pre-generated: de_DE:de, en_US:en
 * `LC_ALL` (optional, default: de_DE.UTF-8) The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8
+* `OFFLINE_MODE` (optional & experimental, default: false) Set true if you container has no or limited internet connection
 * `PACKAGES` (optional) Installs additional linux packages to your container, packages should be separated by whitespace like this: "package1 package2 package3".
 * `SETGID` (default: 1000) In some cases it might be useful to specify the gid of the containers iobroker user to match an existing group on the docker host
 * `SETUID` (default: 1000) In some cases it might be useful to specify the uid of the containers iobroker user to match an existing user on the docker host