prepare v6.1.0

Merge pull request #244 from buanet/dependabot/github_actions/main/actions/github-script-6
Bump actions/github-script from 5 to 6
2025-12-18 02:49:01 +02:00 · 2022-03-01 19:27:27 +01:00 · 2022-03-01 15:58:23 +01:00 · 2022-03-01 15:56:58 +01:00 · 2022-02-28 09:23:50 +00:00 · 2022-02-25 23:45:46 +00:00
19 changed files with 293 additions and 181 deletions
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v6.1.0-beta.1
+v6.1.0
--- a/.github/dependencies/.js-controller-version
+++ b/.github/dependencies/.js-controller-version
@@ -0,0 +1 @@
+4.0.15
--- a/.github/workflows/build-debian-image-beta-node16.yml
+++ b/.github/workflows/build-debian-image-beta-node16.yml
@@ -1,10 +1,10 @@
 # Github action to build Docker image from beta branch (tag: beta)
-name: Build buanet/iobroker:beta-node16
+name: Build debian beta-node16

 on:
  release:
-    types:
-      - prereleased
+    types: [prereleased]
+  workflow_dispatch:

 jobs:
  build-beta-node16-image:
@@ -51,20 +51,20 @@ jobs:
        uses: docker/setup-buildx-action@v1.6.0

      - name: Login to DockerHub
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v1.14.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASS }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v1.14.0
        with:
          registry: ghcr.io
          username: ${{ secrets.PACKAGES_USER }}
          password: ${{ secrets.PACKAGES_PASS }}

      - name: Build Docker image (node16-amd64)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node16/Dockerfile
@@ -75,7 +75,7 @@ jobs:
            ghcr.io/buanet/iobroker:${{ env.version }}-node16-amd64

      - name: Build Docker image (node16-arm32v7)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node16/Dockerfile
@@ -86,7 +86,7 @@ jobs:
            ghcr.io/buanet/iobroker:${{ env.version }}-node16-arm32v7

      - name: Build Docker image (node16-arm64v8)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node16/Dockerfile
@@ -108,7 +108,7 @@ jobs:
          ./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@v5
+        uses: actions/github-script@v6
        with:
          github-token: ${{ secrets.PACKAGES_PASS }}
          script: |
--- a/.github/workflows/build-debian-image-beta.yml
+++ b/.github/workflows/build-debian-image-beta.yml
@@ -1,10 +1,10 @@
 # Github action to build Docker image from beta branch (tag: beta)
-name: Build buanet/iobroker:beta
+name: Build debian beta

 on:
  release:
-    types:
-      - prereleased
+    types: [prereleased]
+  workflow_dispatch:

 jobs:
  build-beta-image:
@@ -51,20 +51,20 @@ jobs:
        uses: docker/setup-buildx-action@v1.6.0

      - name: Login to DockerHub
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v1.14.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASS }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v1.14.0
        with:
          registry: ghcr.io
          username: ${{ secrets.PACKAGES_USER }}
          password: ${{ secrets.PACKAGES_PASS }}

      - name: Build Docker image (amd64)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node14/Dockerfile
@@ -75,7 +75,7 @@ jobs:
            ghcr.io/buanet/iobroker:${{ env.version }}-amd64

      - name: Build Docker image (arm32v7)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node14/Dockerfile
@@ -86,7 +86,7 @@ jobs:
            ghcr.io/buanet/iobroker:${{ env.version }}-arm32v7

      - name: Build Docker image (arm64v8)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node14/Dockerfile
@@ -108,7 +108,7 @@ jobs:
          ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_version.yaml

      - name: Delete untagged images from GitHub packages
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
        with:
          github-token: ${{ secrets.PACKAGES_PASS }}
          script: |
--- a/.github/workflows/build-debian-image-dev-node16.yml
+++ b/.github/workflows/build-debian-image-dev-node16.yml
@@ -1,5 +1,5 @@
 # Github action to build Docker image from dev branch (tag: dev)
-name: Build buanet/iobroker:dev-node16
+name: Build debian dev-node16

 on:
  workflow_dispatch:
@@ -46,20 +46,20 @@ jobs:
        uses: docker/setup-buildx-action@v1.6.0

      - name: Login to DockerHub
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v1.14.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASS }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v1.14.0
        with:
          registry: ghcr.io
          username: ${{ secrets.PACKAGES_USER }}
          password: ${{ secrets.PACKAGES_PASS }}

      - name: Build Docker image (node16-amd64)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node16/Dockerfile
@@ -70,7 +70,7 @@ jobs:
            ghcr.io/buanet/iobroker:dev-node16-amd64

      - name: Build Docker image (node16-arm32v7)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node16/Dockerfile
@@ -81,7 +81,7 @@ jobs:
            ghcr.io/buanet/iobroker:dev-node16-arm32v7

      - name: Build Docker image (node16-arm64v8)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node16/Dockerfile
@@ -99,7 +99,7 @@ jobs:
          ./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@v5
+        uses: actions/github-script@v6
        with:
          github-token: ${{ secrets.PACKAGES_PASS }}
          script: |
--- a/.github/workflows/build-debian-image-dev.yml
+++ b/.github/workflows/build-debian-image-dev.yml
@@ -1,5 +1,5 @@
 # Github action to build Docker image from dev branch (tag: dev)
-name: Build buanet/iobroker:dev
+name: Build debian dev

 on:
  workflow_dispatch:
@@ -46,20 +46,20 @@ jobs:
        uses: docker/setup-buildx-action@v1.6.0

      - name: Login to DockerHub
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v1.14.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASS }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v1.14.0
        with:
          registry: ghcr.io
          username: ${{ secrets.PACKAGES_USER }}
          password: ${{ secrets.PACKAGES_PASS }}

      - name: Build Docker image (amd64)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node14/Dockerfile
@@ -70,7 +70,7 @@ jobs:
            ghcr.io/buanet/iobroker:dev-amd64

      - name: Build Docker image (arm32v7)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node14/Dockerfile
@@ -81,7 +81,7 @@ jobs:
            ghcr.io/buanet/iobroker:dev-arm32v7

      - name: Build Docker image (arm64v8)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node14/Dockerfile
@@ -99,7 +99,7 @@ jobs:
          ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_dev.yaml

      - name: Delete untagged images from GitHub packages
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
        with:
          github-token: ${{ secrets.PACKAGES_PASS }}
          script: |
--- a/.github/workflows/build-debian-image-latest-iob.yml
+++ b/.github/workflows/build-debian-image-latest-iob.yml
@@ -1,17 +1,21 @@
 # Github action to build Docker image from main branch for iobroker/iobroker (tag: latest)
-name: Build iobroker/iobroker:latest
+name: Build debian latest (iobroker)

 on:
  release:
    types:
      - released
+  workflow_dispatch:

 jobs:
  build-latest-image:
    runs-on: ubuntu-latest
    steps:
-      - name: Getting published release tag
-        run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+      - name: Fetching latest release tag
+        run: |
+          LATESTRELEASE="$(curl -sL https://api.github.com/repos/buanet/ioBroker.docker/releases/latest | jq -r '.tag_name')"
+          echo "Latest release tag : $LATESTRELEASE"
+          echo "RELEASE_TAG=$LATESTRELEASE" >> $GITHUB_ENV
    
      - name: Checkout repo
        uses: actions/checkout@v2.4.0
@@ -19,7 +23,7 @@ jobs:
          repository: 'buanet/ioBroker.docker'
          ref: ${{ env.RELEASE_TAG }}

-      - name: Get and write version and date
+      - name: Fetching and adding version tag and date
        id: version
        run: |
          VERSION="$(cat .VERSION)"
@@ -51,13 +55,13 @@ jobs:
        uses: docker/setup-buildx-action@v1.6.0

      - name: Login to DockerHub (iobroker)
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v1.14.0
        with:
          username: ${{ secrets.DOCKER_USER_IOB }}
          password: ${{ secrets.DOCKER_PASS_IOB }}

      - name: Build Docker image (amd64)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node14/Dockerfile
@@ -67,7 +71,7 @@ jobs:
            iobroker/iobroker:${{ env.version }}-amd64,

      - name: Build Docker image (arm32v7)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node14/Dockerfile
@@ -77,7 +81,7 @@ jobs:
            iobroker/iobroker:${{ env.version }}-arm32v7,

      - name: Build Docker image (arm64v8)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node14/Dockerfile
--- a/.github/workflows/build-debian-image-latest.yml
+++ b/.github/workflows/build-debian-image-latest.yml
@@ -1,25 +1,29 @@
 # Github action to build Docker image from main branch (tag: latest)
-name: Build buanet/iobroker:latest
+name: Build debian latest (buanet)

 on:
  release:
    types:
      - released
+  workflow_dispatch:

 jobs:
  build-latest-image:
    runs-on: ubuntu-latest
    steps:
-      - name: Getting published release tag
-        run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-    
+      - name: Fetching latest release tag
+        run: |
+          LATESTRELEASE="$(curl -sL https://api.github.com/repos/buanet/ioBroker.docker/releases/latest | jq -r '.tag_name')"
+          echo "Latest release tag : $LATESTRELEASE"
+          echo "RELEASE_TAG=$LATESTRELEASE" >> $GITHUB_ENV
+
      - name: Checkout repo
        uses: actions/checkout@v2.4.0
        with:
          repository: 'buanet/ioBroker.docker'
          ref: ${{ env.RELEASE_TAG }}

-      - name: Get and write version and date
+      - name: Fetching and adding version tag and date
        id: version
        run: |
          VERSION="$(cat .VERSION)"
@@ -51,20 +55,20 @@ jobs:
        uses: docker/setup-buildx-action@v1.6.0

      - name: Login to DockerHub (buanet)
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v1.14.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASS }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.12.0
+        uses: docker/login-action@v1.14.0
        with:
          registry: ghcr.io
          username: ${{ secrets.PACKAGES_USER }}
          password: ${{ secrets.PACKAGES_PASS }}

      - name: Build Docker image (amd64)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node14/Dockerfile
@@ -75,7 +79,7 @@ jobs:
            ghcr.io/buanet/iobroker:${{ env.version }}-amd64

      - name: Build Docker image (arm32v7)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node14/Dockerfile
@@ -86,7 +90,7 @@ jobs:
            ghcr.io/buanet/iobroker:${{ env.version }}-arm32v7

      - name: Build Docker image (arm64v8)
-        uses: docker/build-push-action@v2.7.0
+        uses: docker/build-push-action@v2.9.0
        with:
          context: ./debian
          file: ./debian/node14/Dockerfile
@@ -112,7 +116,7 @@ jobs:
          ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_version.yaml

      - name: Delete untagged images from GitHub packages
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
        with:
          github-token: ${{ secrets.PACKAGES_PASS }}
          script: |
--- a/.github/workflows/check-js-controller-release.yml
+++ b/.github/workflows/check-js-controller-release.yml
@@ -0,0 +1,52 @@
+name: Check js-controller release
+
+on:
+  schedule:
+    - cron:  '42 23 * * *'
+  workflow_dispatch:
+
+jobs:
+  check-and-trigger:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2.4.0
+        with:
+          repository: 'buanet/ioBroker.docker'
+          token: ${{ secrets.ACTIONS_PAT }}
+
+      - name: Fetch js-controller release version
+        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)"
+
+      - name: Check for modified files
+        id: git-check
+        run: echo ::set-output name=modified::$([ -z "`git status --porcelain`" ] && echo "false" || echo "true")
+
+      - name: Commit latest release version
+        if: steps.git-check.outputs.modified == 'true'
+        run: |
+          git config --global user.name 'buanet'
+          git config --global user.email 'info@buanet.de'
+          git commit -am "new js-controller release"
+          git push
+
+      - name: Trigger build debian latest (buanet)
+        if: steps.git-check.outputs.modified == 'true'
+        uses: benc-uk/workflow-dispatch@v1.1
+        with:
+          workflow: Build debian latest (buanet)
+          repo: buanet/ioBroker.docker
+          token: ${{ secrets.ACTIONS_PAT }}
+
+      - name: Trigger build debian latest (iobroker)
+        if: steps.git-check.outputs.modified == 'true'
+        uses: benc-uk/workflow-dispatch@v1.1
+        with:
+          workflow: Build debian latest (iobroker)
+          repo: buanet/ioBroker.docker
+          token: ${{ secrets.ACTIONS_PAT }}
--- a/.github/workflows/testing-docker-image.yml
+++ b/.github/workflows/testing-docker-image.yml
@@ -0,0 +1,33 @@
+# Github action for testing the Docker image
+name: Testing Docker image
+
+on:
+  workflow_dispatch:
+
+jobs:
+  test-docker-image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Testing with docker run
+        run: |
+          echo "[LOG] Starting ioBroker Container..."
+          docker run -d -p 8081:8081 --name iobroker -v iobrokerdata:/opt/iobroker buanet/iobroker:latest
+          echo "[LOG] Done."
+          echo ' '
+          echo "[LOG] Waiting for Startup Script..."
+          sleep 30
+          echo "[LOG] Done."
+          echo ' '
+          echo "[LOG] Writing Logs..."
+          docker logs iobroker >& testrun.log
+          echo "[LOG] Done."
+          echo ' '
+          echo "[LOG] Checking Web UI..."
+          curl --insecure http://127.0.0.1:8081 2> /dev/null | grep '<title>Admin</title>' &> /dev/null || exit 1
+          echo "[LOG] Done."
+          echo ' '
+          echo "[LOG] Output testrun.log:"
+          cat testrun.log
+          echo ' '
+          echo "[LOG] Test sucesssful."
+          echo ' '
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,28 @@
 ## Changelog

-### v6.1.0-beta.1 (2021-12-23)
-* some more corrections in maintenance script ([#232 @agross](https://github.com/buanet/ioBroker.docker/pull/232)) 
-* added autoconfirm parameter to upgrade function in maintenance script ([#229 @thost96](https://github.com/buanet/ioBroker.docker/pull/229))
-* added alias "m" for maintenance script
+### v6.1.0 (2022-03-01)
+* v6.1.0-beta.2 (2022-02-11)
+  * fix -kbn option in maintenance script
+  * optimize shutdown/ prevent warnings on upgrade
+  * remove hostname check for multihost slave
+  * optimize startup script logging
+  * add breaks and optimize maintenance script (fixes [#233](https://github.com/buanet/ioBroker.docker/issues/233))
+* v6.1.0-beta.1 (2021-12-23)
+  * some more corrections in maintenance script ([#232 @agross](https://github.com/buanet/ioBroker.docker/pull/232)) 
+  * add auto confirm parameter to upgrade function in maintenance script ([#229 @thost96](https://github.com/buanet/ioBroker.docker/pull/229))
+  * add alias "m" for maintenance script

 ### v6.0.0 (2021-12-09)
-* moving docu/ restructuring readme
+* move docu/ restructuring readme
 * v6.0.0-beta1 (2021-10-07)
-  * upgrading node version to recommended node14 
-  * adding beta-node16 tag for beta testing node16
-  * updating documentation
+  * upgrade node version to recommended node14 
+  * add beta-node16 tag for beta testing node16
+  * update documentation
 * v5.3.0-beta1 (2021-10-07)
-  * adding check  (installed) PACKAGES on startup (fixes [#201](https://github.com/buanet/ioBroker.docker/issues/201))
-  * adding packages for discovery adapter
-  * adding packages for backitup adapter
-  * reorganizing Dockerfile
+  * add check  (installed) PACKAGES on startup (fixes [#201](https://github.com/buanet/ioBroker.docker/issues/201))
+  * add packages for discovery adapter
+  * add packages for backitup adapter
+  * reorganize Dockerfile

 ### v5.2.0 (2021-09-30)
 * v5.2.0-beta4 (2021-09-10)
--- a/README.md
+++ b/README.md
@@ -1,15 +1,20 @@
 # Official Docker Image for ioBroker

- <img src="https://github.com/buanet/ioBroker.docker/raw/main/src/img/iobroker_logo.png" width="600" title="ioBroker Logo">
+ <img src="https://github.com/buanet/ioBroker.docker/raw/main/docs/img/iobroker_logo.png" width="600" title="ioBroker Logo">

+[![Release](https://img.shields.io/github/v/release/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/releases)
+[![GitHub tag (latest SemVer pre-release)](https://img.shields.io/github/v/tag/buanet/ioBroker.docker?include_prereleases&label=pre-release)](https://github.com/buanet/ioBroker.docker/releases)
+[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/buanet/ioBroker.docker/Build%20debian%20latest%20\(buanet\))](https://github.com/buanet/ioBroker.docker/actions/workflows/build-debian-image-latest.yml)
+[![Github Issues](https://img.shields.io/github/issues/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/issues)
+[![GitHub Discussions](https://img.shields.io/github/discussions/buanet/ioBroker.docker)](https://github.com/buanet/ioBroker.docker/discussions)<br>
+[![Arch](https://img.shields.io/badge/arch-amd64%20%7C%20arm32v7%20%7C%20arm64v8-blue)](https://hub.docker.com/repository/docker/buanet/iobroker)
 [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/buanet/iobroker/latest?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker)
 [![Docker Pulls](https://img.shields.io/docker/pulls/buanet/iobroker?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker)
 [![Docker Stars](https://img.shields.io/docker/stars/buanet/iobroker?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker)<br>
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/buanet/ioBroker.docker/Build%20debian%20based%20image%20\(latest\))](https://github.com/buanet/ioBroker.docker/actions/workflows/build-debian-image-main.yml)
-[![Release](https://img.shields.io/github/v/release/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/releases)
-[![Github Issues](https://img.shields.io/github/issues/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/issues)<br>
-[![Source](https://img.shields.io/badge/source-github-blue?style=flat)](https://github.com/buanet/ioBroker.docker)
 [![License](https://img.shields.io/github/license/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/blob/master/LICENSE.md)
+[![Source](https://img.shields.io/badge/source-github-blue?style=flat)](https://github.com/buanet/ioBroker.docker)
+[![GitHub forks](https://img.shields.io/github/forks/buanet/ioBroker.docker)](https://github.com/buanet/ioBroker.docker/network)
+[![GitHub stars](https://img.shields.io/github/stars/buanet/ioBroker.docker)](https://github.com/buanet/ioBroker.docker/stargazers)
 [![Donate](https://img.shields.io/badge/donate-paypal-blue?style=flat)](https://paypal.me/buanet)

 The code provided in this repo is used to automatically generate the official Docker Image for ioBroker.
@@ -26,7 +31,7 @@ Looking for documentation? :arrow_right: [docs.buanet.de](https://docs.buanet.de

 ### How to run the image? 

-You can find some basic information about the image amd how to run it on the [Docker Hub page](https://hub.docker.com/r/buanet/iobroker) or [here](https://github.com/buanet/ioBroker.docker/blob/main/src/README_docker_hub_buanet.md).
+You can find some basic information about the image amd how to run it on the [Docker Hub page](https://hub.docker.com/r/buanet/iobroker) or [here](https://github.com/buanet/ioBroker.docker/blob/main/docs/README_docker_hub_buanet.md).

 ### Is there a more detailed documentation?

@@ -61,7 +66,7 @@ If you want to get the newest features and changes feel free to use/ test the be

 The easiest way to support this project is to leave me some likes/ stars on Github and Docker hub!<br>
 If you want to give something back to the community, feel free to take a look into the [open issues](https://github.com/buanet/ioBroker.docker/issues) or the [ioBroker forum thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) and help me answering questions, fixing bugs or adding new features!<br>
-If that doesn't work for you and you want to buy me a beer instead, you can do this here: <a href="https://www.paypal.me/buanet" target="_blank"><img src="https://github.com/buanet/ioBroker.docker/raw/main/src/img/pp_logo.png" height="15" width="15"></a><br>
+If that doesn't work for you and you want to buy me a beer instead, you can do this here: <a href="https://www.paypal.me/buanet" target="_blank"><img src="https://github.com/buanet/ioBroker.docker/raw/main/docs/img/pp_logo.png" height="15" width="15"></a><br>
 Thank you!

 ## :memo: Changelog
--- a/debian/scripts/iobroker_startup.sh
+++ b/debian/scripts/iobroker_startup.sh
@@ -39,6 +39,7 @@ echo "-----                        Debugging 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 -n "-----                    " && echo -n "$(printf "%-20s %-28s" image: ${VERSION})" && echo " -----"
@@ -140,7 +141,7 @@ then
  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 readme.md on Github (https://github.com/buanet/ioBroker.docker)."
+    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."
@@ -197,7 +198,7 @@ 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) ]
+if [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ] && [ "$multihost" != "slave" ]
 then
  echo "Hostname in ioBroker does not match the hostname of this container."
  echo "Updating hostname to " $(hostname)"..."
@@ -216,7 +217,7 @@ echo "$(printf -- '-%.0s' {1..80})"
 echo ' '

 echo "Some adapters have special requirements/ settings which can be activated by the use of environment variables."
-echo "For more information take a look at readme.md on Github!"
+echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
 echo ' '


@@ -282,161 +283,164 @@ fi


 # Checking ENV for multihost setup
-# Configuring objects db host
-if [ "$multihost" = "master" ] && [ "$objectsdbtype" = "" ] && [ "$objectsdbhost" = "" ] && [ "$objectsdbport" = "" ]
+if [ "$multihost" != "" ]
 then
-  echo "Multihost is set as \"master\" by ENV and no external objects db is set."
-  echo "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."
+  echo "Checking Multihost Setup..."
+  echo ' ' 
+  # Configuring objects db host
+  if [ "$multihost" = "master" ] && [ "$objectsdbtype" = "" ] && [ "$objectsdbhost" = "" ] && [ "$objectsdbport" = "" ]
+  then
+    echo "Multihost is set as \"master\" by ENV and no external objects db is set."
+    echo "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" ]
+  then
+    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 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" != "" ]
+  then
+    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
+    echo "Multihost is set as \"slave\" by ENV. But no external objects db is set."
+    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" != "" ]
+  then
+    echo "Multihost is set as \"slave\" by ENV and external objects db is set."
+  elif [ "$multihost" != "" ]
+  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
  echo ' '
-elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ]
-then
-  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 work! Please change or remove ENV \"IOB_OBJECTSDB_HOST\" and start over!"
-  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
-  exit 1
-elif [ "$multihost" = "master" ] &&  [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
-then
-  echo "Multihost is set as \"master\" by ENV and external objects db is set."
-  echo "Skipping this step..."
-  echo "Done."
-  echo ' '
-elif ([ "$multihost" = "slave" ] && [ "$objectsdbtype" = "" ]) || ([ "$multihost" = "slave" ] && [ "$objectsdbhost" = "" ]) || ([ "$multihost" = "slave" ] && [ "$objectsdbport" = "" ])
-then
-  echo "Multihost is set as \"slave\" by ENV. But no external objects db is set."
-  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 readme.md on Github (https://github.com/buanet/ioBroker.docker)."
-  exit 1
-elif [ "$multihost" = "slave" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
-then
-  echo "Multihost is set as \"slave\" by ENV and external objects db is set."
-  echo "Skipping this step..."
-  echo "Done."
-  echo ' '
-elif [ "$multihost" != "" ]
-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 readme.md on Github (https://github.com/buanet/ioBroker.docker)."
-  exit 1
-fi
-#Configuring states db host
-if [ "$multihost" = "master" ] && [ "$statesdbtype" = "" ] && [ "$statesdbhost" = "" ] && [ "$statesdbport" = "" ]
-then
-  echo "Multihost is set as \"master\" by ENV and no external states db is set."
-  echo "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."
-  echo ' '
-elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ]
-then
-  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 work! Please change or remove ENV \"IOB_STATESDB_HOST\" and start over!"
-  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
-  exit 1
-elif [ "$multihost" = "master" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
-then
-  echo "Multihost is set as \"master\" by ENV and external states db is set."
-  echo "Skipping this step..."
-  echo "Done."
-  echo ' '
-elif ([ "$multihost" = "slave" ] && [ "$statesdbtype" = "" ]) || ([ "$multihost" = "slave" ] && [ "$statesdbhost" = "" ]) || ([ "$multihost" = "slave" ] && [ "$statesdbport" = "" ])
-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 "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
-  exit 1
-elif [ "$multihost" = "slave" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
-then
-  echo "Multihost is set as \"slave\" by ENV and external states db is set."
-  echo "Skipping this step..."
-  echo "Done."
-  echo ' '
-elif [ "$multihost" != "" ]
-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 readme.md on Github (https://github.com/buanet/ioBroker.docker)."
-  exit 1
-fi

+  #Configuring states db host
+  if [ "$multihost" = "master" ] && [ "$statesdbtype" = "" ] && [ "$statesdbhost" = "" ] && [ "$statesdbport" = "" ]
+  then
+    echo "Multihost is set as \"master\" by ENV and no external states db is set."
+    echo "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" ]
+  then
+    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 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" != "" ]
+  then
+    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
+    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 "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
+    exit 1
+  elif [ "$multihost" = "slave" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
+  then
+    echo "Multihost is set as \"slave\" by ENV and external states db is set."
+  elif [ "$multihost" != "" ]
+  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
+  fi
+  echo ' '
+  echo "Done."
+  echo ' '
+fi

 # Checking ENVs for custom setup of objects db
 if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ]
 then
+  echo "Checking custom settings for objects db..."
+  echo ' '
  if [ "$objectsdbtype" != $(jq -r '.objects.type' /opt/iobroker/iobroker-data/iobroker.json) ]
  then
-    echo "ENV IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation."
+    echo "IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation."
    echo "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
      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
    echo "Done."
  else
-    echo "ENV IOB_OBJECTSDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here."
+    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) ]
  then
-    echo "ENV IOB_OBJECTSDB_HOST is set and value is different from detected ioBroker installation."
+    echo "IOB_OBJECTSDB_HOST is set and value is different from detected ioBroker installation."
    echo "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
      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
    echo "Done."
  else
-    echo "ENV IOB_OBJECTSDB_HOST is set and value meets detected ioBroker installation. Nothing to do here."
+    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) ]
  then
-    echo "ENV IOB_OBJECTSDB_PORT is set and value is different from detected ioBroker installation."
+    echo "IOB_OBJECTSDB_PORT is set and value is different from detected ioBroker installation."
    echo "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
      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
    echo "Done."
  else
-    echo "ENV IOB_OBJECTSDB_PORT is set and value meets detected ioBroker installation. Nothing to do here."
+    echo "IOB_OBJECTSDB_PORT is set and value meets detected ioBroker installation."
  fi
  echo ' '
+  echo "Done."
+  echo ' '
 fi


 # Checking ENVs for custom setup of states db#
 if [ "$statesdbtype" != "" ] || [ "$statesdbhost" != "" ] || [ "$statesdbport" != "" ]
 then
+  echo "Checking custom settings for states db..."
+  echo ' '
  if [ "$statesdbtype" != $(jq -r '.states.type' /opt/iobroker/iobroker-data/iobroker.json) ]
  then
-    echo "ENV IOB_STATESDB_TYPE is set and value is different from detected ioBroker installation."
+    echo "IOB_STATESDB_TYPE is set and value is different from detected ioBroker installation."
    echo "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
      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
    echo "Done."
  else
-    echo "ENV IOB_STATESDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here."
+    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) ]
  then
-    echo "ENV IOB_STATESDB_HOST is set and value is different from detected ioBroker installation."
+    echo "IOB_STATESDB_HOST is set and value is different from detected ioBroker installation."
    echo "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
      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
    echo "Done."
  else
-    echo "ENV IOB_STATESDB_HOST is set and value meets detected ioBroker installation. Nothing to do here."
+    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) ]
  then
-    echo "ENV IOB_STATESDB_PORT is set and value is different from detected ioBroker installation."
+    echo "IOB_STATESDB_PORT is set and value is different from detected ioBroker installation."
    echo "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
      chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
    echo "Done."
  else
-    echo "ENV IOB_STATESDB_PORT is set and value meets detected ioBroker installation. Nothing to do here."
+    echo "IOB_STATESDB_PORT is set and value meets detected ioBroker installation."
  fi
  echo ' '
+  echo "Done."
+  echo ' '
 fi


@@ -494,8 +498,7 @@ shut_down() {
  echo ' '
  echo "Recived termination signal (SIGTERM)."
  echo "Shutting down ioBroker..."
-  pid=$(ps -ef | awk '/[j]s.controller/{print $2}')
-  kill -SIGTERM "$pid"
+  pkill -SIGTERM -u iobroker -f iobroker.js-controller
  exit
 }

--- a/debian/scripts/maintenance.sh
+++ b/debian/scripts/maintenance.sh
@@ -50,13 +50,13 @@ check_status() {
 switch_on() {
  if [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ] && [ "$killbyname" == "yes" ] # maintenance mode OFF / killbyname = yes  / undocumented, only for use with backitup restore scripts
  then
-    echo 'This command will activate maintenance mode and stop all node processes.'
+    echo 'This command will activate maintenance mode and stop js-controller.'
    echo 'Activating maintenance mode...'
    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
    sleep 1
    echo 'Done.'
    echo 'Stopping ioBroker...'
-    pkill node
+    pkill -u iobroker -f iobroker.js-controller
    sleep 1
    echo 'Done.'
    exit 0
@@ -148,17 +148,20 @@ upgrade() {
  then
    echo 'This command was already confirmed by -y or --yes option.'
  fi
-
-  echo 'Activating maintenance mode...'
-  echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
-  sleep 1
-  echo 'Done.'
-  echo 'Stopping ioBroker...'
-  pkill -u iobroker
-  sleep 1
-  echo 'Done.'
+  if [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ]
+  then
+    echo 'Activating maintenance mode...'
+    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
+    sleep 1
+    echo 'Done.'  
+    echo 'Stopping ioBroker...'
+    pkill -u iobroker
+    sleep 5
+    echo 'Done.'
+  fi
  echo 'Upgrading js-controller...'
  iobroker update
+  sleep 1
  iobroker upgrade self
  sleep 1
  echo 'Done.'
--- a/docs/README_docker_hub_buanet.md
+++ b/docs/README_docker_hub_buanet.md
@@ -1,4 +1,4 @@
-<img src="https://github.com/buanet/ioBroker.docker/raw/main/src/img/iobroker_logo.png" width="600" title="ioBroker Logo">
+<img src="https://github.com/buanet/ioBroker.docker/raw/main/docs/img/iobroker_logo.png" width="600" title="ioBroker Logo">

 [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/buanet/iobroker/latest?style=flat)](https://hub.docker.com/r/buanet/iobroker)
 [![Docker Pulls](https://img.shields.io/docker/pulls/buanet/iobroker?style=flat)](https://hub.docker.com/r/buanet/iobroker)
--- a/docs/README_docker_hub_iobroker.md
+++ b/docs/README_docker_hub_iobroker.md
@@ -1,6 +1,6 @@
 ###### [iobroker/iobroker](https://hub.docker.com/r/iobroker/iobroker) is an alias for [buanet/iobroker](https://hub.docker.com/r/buanet/iobroker) 
 
-<img src="https://github.com/buanet/ioBroker.docker/raw/main/src/img/iobroker_logo.png" width="600" title="ioBroker Logo">
+<img src="https://github.com/buanet/ioBroker.docker/raw/main/docs/img/iobroker_logo.png" width="600" title="ioBroker Logo">

 [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/buanet/iobroker/latest?style=flat)](https://hub.docker.com/r/buanet/iobroker)
 [![Docker Pulls](https://img.shields.io/docker/pulls/buanet/iobroker?style=flat)](https://hub.docker.com/r/buanet/iobroker)
--- a/docs/img/iobroker_logo.png
+++ b/docs/img/iobroker_logo.png
--- a/docs/img/iobroker_logo_small.png
+++ b/docs/img/iobroker_logo_small.png
--- a/docs/img/pp_logo.png
+++ b/docs/img/pp_logo.png
Author	SHA1	Message	Date
buanet	aca230a7f4	prepare v6.1.0	2022-03-01 19:27:27 +01:00
André Germann	1bfcab7820	Merge pull request #244 from buanet/dependabot/github_actions/main/actions/github-script-6 Bump actions/github-script from 5 to 6	2022-03-01 15:58:23 +01:00
André Germann	cef8433132	Merge pull request #247 from buanet/dependabot/github_actions/main/docker/login-action-1.14.0 Bump docker/login-action from 1.12.0 to 1.14.0	2022-03-01 15:56:58 +01:00
dependabot[bot]	1242eb382f	Bump docker/login-action from 1.12.0 to 1.14.0 Bumps [docker/login-action](https://github.com/docker/login-action) from 1.12.0 to 1.14.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v1.12.0...v1.14.0) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-28 09:23:50 +00:00
buanet	9eb70621ea	new js-controller release	2022-02-25 23:45:46 +00:00
dependabot[bot]	7ed3224f50	Bump actions/github-script from 5 to 6 Bumps [actions/github-script](https://github.com/actions/github-script) from 5 to 6. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-14 09:21:51 +00:00
André Germann	a706d63e78	Update build-debian-image-beta-node16.yml	2022-02-11 21:03:20 +01:00
André Germann	23fea30955	Update build-debian-image-beta.yml	2022-02-11 21:02:48 +01:00
buanet	1ca34b5f73	Merge branch 'main' of https://github.com/buanet/ioBroker.docker	2022-02-11 15:02:59 +01:00
buanet	6c819aac1c	prepare new beta	2022-02-11 15:02:53 +01:00
buanet	57c3fe2371	new js-controller release	2022-02-11 07:56:23 +00:00
André Germann	641be7cebe	get stable js-controller version	2022-02-11 08:32:03 +01:00
André Germann	f00aff57a1	add logging	2022-02-11 08:01:42 +01:00
buanet	a5b0ab5b7a	new js-controller release	2022-02-10 23:45:34 +00:00
buanet	f312524d71	new js-controller release	2022-02-09 23:45:55 +00:00
buanet	60b4b10965	new js-controller release	2022-02-08 23:45:42 +00:00
buanet	2effdf5fea	new js-controller release	2022-02-06 23:45:46 +00:00
André Germann	543343359e	Update testing-docker-image.yml	2022-02-06 22:09:23 +01:00
André Germann	98bd35cc52	Update testing-docker-image.yml	2022-02-06 22:00:17 +01:00
André Germann	bf5288071b	Update testing-docker-image.yml	2022-02-06 21:57:05 +01:00
André Germann	118892975a	Update testing-docker-image.yml	2022-02-06 21:55:46 +01:00
André Germann	833ec7515e	Update testing-docker-image.yml	2022-02-06 21:51:26 +01:00
André Germann	87137450db	Update testing-docker-image.yml	2022-02-06 21:48:52 +01:00
André Germann	1a92ab16dd	Update testing-docker-image.yml	2022-02-06 21:42:56 +01:00
André Germann	898c58ce7e	Create testing-docker-image.yml	2022-02-06 21:27:04 +01:00
buanet	9fd6c97559	new js-controller release	2022-02-05 23:57:27 +00:00
buanet	30cfacd55f	update readme	2022-02-04 18:02:11 +01:00
buanet	634d5ffb63	ci renaming	2022-02-04 17:36:28 +01:00
André Germann	e41bc8af6c	Merge pull request #239 from buanet/dependabot/github_actions/main/docker/build-push-action-2.9.0 Bump docker/build-push-action from 2.8.0 to 2.9.0	2022-02-04 16:52:26 +01:00
buanet	57c697587f	startup script enhancements	2022-02-04 16:51:41 +01:00
buanet	c2707f3795	maintenance script fixes	2022-02-04 13:16:33 +01:00
dependabot[bot]	727d79fa2f	Bump docker/build-push-action from 2.8.0 to 2.9.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2.8.0 to 2.9.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v2.8.0...v2.9.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-02 09:35:30 +00:00
buanet	15e87e08a0	fixing latest release detection	2022-01-25 17:00:18 +01:00
André Germann	5401fdf86c	release tag check	2022-01-25 16:55:37 +01:00
André Germann	f888101d01	Merge pull request #238 from buanet/dependabot/github_actions/main/docker/build-push-action-2.8.0 Bump docker/build-push-action from 2.7.0 to 2.8.0	2022-01-25 08:48:31 +01:00
buanet	e286d168e1	renaming	2022-01-25 07:22:52 +01:00
buanet	2e5f8c9e22	new js-controller release	2022-01-24 23:02:12 +00:00
buanet	2b4509d468	ci testing	2022-01-25 00:01:16 +01:00
dependabot[bot]	b5235be806	Bump docker/build-push-action from 2.7.0 to 2.8.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2.7.0 to 2.8.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v2.7.0...v2.8.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-01-19 09:29:10 +00:00