diff --git a/.VERSION b/.VERSION
index 6b7ace3..7c01dfe 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v5.1.0
+v5.2.0-beta4
\ No newline at end of file
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..da0ed1b
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+ # Maintain dependencies for GitHub Actions
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ target-branch: "dev"
diff --git a/.github/workflows/build-debian-image-beta-node14.yml b/.github/workflows/build-debian-image-beta-node14.yml
new file mode 100644
index 0000000..f0b1e8b
--- /dev/null
+++ b/.github/workflows/build-debian-image-beta-node14.yml
@@ -0,0 +1,130 @@
+# Github action to build Docker image from beta branch (tag: beta)
+name: Build debian based image (beta-node14)
+
+on:
+ pull_request:
+ branches:
+ - beta
+ types:
+ - closed
+ schedule:
+ - cron: '42 3 * * 1'
+ workflow_dispatch:
+
+jobs:
+ bulid-beta-node14-image:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repo (beta)
+ uses: actions/checkout@v2.3.4
+ with:
+ repository: 'buanet/ioBroker.docker'
+ ref: 'beta'
+
+ - 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/node14/Dockerfile > ./debian/node14/Dockerfile.tmp
+ mv -f ./debian/node14/Dockerfile.tmp ./debian/node14/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@v1.2.0
+
+ - name: Set up Docker Buildx
+ id: buildx
+ uses: docker/setup-buildx-action@v1.5.1
+
+ - name: Login to DockerHub
+ uses: docker/login-action@v1.10.0
+ with:
+ username: ${{ secrets.DOCKER_USER }}
+ password: ${{ secrets.DOCKER_PASS }}
+
+ - name: Login to GitHub Container Registry
+ uses: docker/login-action@v1.10.0
+ with:
+ registry: ghcr.io
+ username: ${{ secrets.PACKAGES_USER }}
+ password: ${{ secrets.PACKAGES_PASS }}
+
+ - name: Build Docker image (node14-amd64)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node14/Dockerfile
+ push: true
+ platforms: linux/amd64
+ tags: |
+ buanet/iobroker:${{ env.version }}-node14-amd64,
+ ghcr.io/buanet/iobroker:${{ env.version }}-node14-amd64
+
+ - name: Build Docker image (node14-arm32v7)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node14/Dockerfile
+ push: true
+ platforms: linux/arm/v7
+ tags: |
+ buanet/iobroker:${{ env.version }}-node14-arm32v7,
+ ghcr.io/buanet/iobroker:${{ env.version }}-node14-arm32v7
+
+ - name: Build Docker image (node14-arm64v8)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node14/Dockerfile
+ push: true
+ platforms: linux/arm64/v8
+ tags: |
+ buanet/iobroker:${{ env.version }}-node14-arm64v8,
+ ghcr.io/buanet/iobroker:${{ env.version }}-node14-arm64v8
+
+ - name: Create and push manifests
+ run: |
+ sed -e "s/\${VERSION}/${{ env.version }}-node14/g" -e "s/\${DOCKERTAG}/beta-node14/g" ./manifest.yml > manifest_beta-node14.yaml
+ ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_beta-node14.yaml
+ sed -e "s/\${VERSION}/${{ env.version }}-node14/g" -e "s/\${DOCKERTAG}/beta-node14/g" ./manifest_ghcr.yml > manifest_ghcr_beta-node14.yaml
+ ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_beta-node14.yaml
+ sed -e "s/\${VERSION}/${{ env.version }}-node14/g" -e "s/\${DOCKERTAG}/${{ env.version }}-node14/g" ./manifest.yml > manifest_version-node14.yaml
+ ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_version-node14.yaml
+ sed -e "s/\${VERSION}/${{ env.version }}-node14/g" -e "s/\${DOCKERTAG}/${{ env.version }}-node14/g" ./manifest_ghcr.yml > manifest_ghcr_version-node14.yaml
+ ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_version-node14.yaml
+
+ - name: Delete untagged images from GitHub packages
+ uses: actions/github-script@v3
+ 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
diff --git a/.github/workflows/build-debian-image-beta.yml b/.github/workflows/build-debian-image-beta.yml
new file mode 100644
index 0000000..b4c583c
--- /dev/null
+++ b/.github/workflows/build-debian-image-beta.yml
@@ -0,0 +1,130 @@
+# Github action to build Docker image from beta branch (tag: beta)
+name: Build debian based image (beta)
+
+on:
+ workflow_dispatch:
+ pull_request:
+ branches:
+ - beta
+ types:
+ - closed
+ schedule:
+ - cron: '42 3 * * 1'
+
+jobs:
+ bulid-beta-image:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repo (beta)
+ uses: actions/checkout@v2.3.4
+ with:
+ repository: 'buanet/ioBroker.docker'
+ ref: 'beta'
+
+ - 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/node12/Dockerfile > ./debian/node12/Dockerfile.tmp
+ mv -f ./debian/node12/Dockerfile.tmp ./debian/node12/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@v1.2.0
+
+ - name: Set up Docker Buildx
+ id: buildx
+ uses: docker/setup-buildx-action@v1.5.1
+
+ - name: Login to DockerHub
+ uses: docker/login-action@v1.10.0
+ with:
+ username: ${{ secrets.DOCKER_USER }}
+ password: ${{ secrets.DOCKER_PASS }}
+
+ - name: Login to GitHub Container Registry
+ uses: docker/login-action@v1.10.0
+ with:
+ registry: ghcr.io
+ username: ${{ secrets.PACKAGES_USER }}
+ password: ${{ secrets.PACKAGES_PASS }}
+
+ - name: Build Docker image (amd64)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node12/Dockerfile
+ push: true
+ platforms: linux/amd64
+ tags: |
+ buanet/iobroker:${{ env.version }}-amd64,
+ ghcr.io/buanet/iobroker:${{ env.version }}-amd64
+
+ - name: Build Docker image (arm32v7)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node12/Dockerfile
+ push: true
+ platforms: linux/arm/v7
+ tags: |
+ buanet/iobroker:${{ env.version }}-arm32v7,
+ ghcr.io/buanet/iobroker:${{ env.version }}-arm32v7
+
+ - name: Build Docker image (arm64v8)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node12/Dockerfile
+ push: true
+ platforms: linux/arm64/v8
+ tags: |
+ buanet/iobroker:${{ env.version }}-arm64v8,
+ ghcr.io/buanet/iobroker:${{ env.version }}-arm64v8
+
+ - name: Create and push manifests
+ run: |
+ sed -e "s/\${VERSION}/${{ env.version }}/g" -e "s/\${DOCKERTAG}/beta/g" ./manifest.yml > manifest_beta.yaml
+ ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_beta.yaml
+ sed -e "s/\${VERSION}/${{ env.version }}/g" -e "s/\${DOCKERTAG}/beta/g" ./manifest_ghcr.yml > manifest_ghcr_beta.yaml
+ ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_beta.yaml
+ sed -e "s/\${VERSION}/${{ env.version }}/g" -e "s/\${DOCKERTAG}/${{ env.version }}/g" ./manifest.yml > manifest_version.yaml
+ ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_version.yaml
+ sed -e "s/\${VERSION}/${{ env.version }}/g" -e "s/\${DOCKERTAG}/${{ env.version }}/g" ./manifest_ghcr.yml > manifest_ghcr_version.yaml
+ ./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@v3
+ 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
diff --git a/.github/workflows/build-debian-image-dev-node14.yml b/.github/workflows/build-debian-image-dev-node14.yml
new file mode 100644
index 0000000..0d6c0ac
--- /dev/null
+++ b/.github/workflows/build-debian-image-dev-node14.yml
@@ -0,0 +1,122 @@
+# Github action to build Docker image from dev branch (tag: dev)
+name: Build debian based image (dev-node14)
+
+on:
+ workflow_dispatch:
+ push:
+ branches:
+ - dev
+
+jobs:
+ bulid-dev-node14-image:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repo (dev)
+ uses: actions/checkout@v2.3.4
+ with:
+ repository: 'buanet/ioBroker.docker'
+ ref: 'dev'
+
+ - 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/node14/Dockerfile > ./debian/node14/Dockerfile.tmp
+ mv -f ./debian/node14/Dockerfile.tmp ./debian/node14/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@v1.2.0
+
+ - name: Set up Docker Buildx
+ id: buildx
+ uses: docker/setup-buildx-action@v1.5.1
+
+ - name: Login to DockerHub
+ uses: docker/login-action@v1.10.0
+ with:
+ username: ${{ secrets.DOCKER_USER }}
+ password: ${{ secrets.DOCKER_PASS }}
+
+ - name: Login to GitHub Container Registry
+ uses: docker/login-action@v1.10.0
+ with:
+ registry: ghcr.io
+ username: ${{ secrets.PACKAGES_USER }}
+ password: ${{ secrets.PACKAGES_PASS }}
+
+ - name: Build Docker image (node14-amd64)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node14/Dockerfile
+ push: true
+ platforms: linux/amd64
+ tags: |
+ buanet/iobroker:dev-node14-amd64,
+ ghcr.io/buanet/iobroker:dev-node14-amd64
+
+ - name: Build Docker image (node14-arm32v7)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node14/Dockerfile
+ push: true
+ platforms: linux/arm/v7
+ tags: |
+ buanet/iobroker:dev-node14-arm32v7,
+ ghcr.io/buanet/iobroker:dev-node14-arm32v7
+
+ - name: Build Docker image (node14-arm64v8)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node14/Dockerfile
+ push: true
+ platforms: linux/arm64/v8
+ tags: |
+ buanet/iobroker:dev-node14-arm64v8,
+ ghcr.io/buanet/iobroker:dev-node14-arm64v8
+
+ - name: Create and push manifests
+ run: |
+ sed -e "s/\${VERSION}/dev-node14/g" -e "s/\${DOCKERTAG}/dev-node14/g" ./manifest.yml > manifest_dev-node14.yaml
+ ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_dev-node14.yaml
+ sed -e "s/\${VERSION}/dev-node14/g" -e "s/\${DOCKERTAG}/dev-node14/g" ./manifest_ghcr.yml > manifest_ghcr_dev-node14.yaml
+ ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_dev-node14.yaml
+
+ - name: Delete untagged images from GitHub packages
+ uses: actions/github-script@v3
+ 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
diff --git a/.github/workflows/build-debian-image-dev.yml b/.github/workflows/build-debian-image-dev.yml
new file mode 100644
index 0000000..929bbaa
--- /dev/null
+++ b/.github/workflows/build-debian-image-dev.yml
@@ -0,0 +1,122 @@
+# Github action to build Docker image from dev branch (tag: dev)
+name: Build debian based image (dev)
+
+on:
+ workflow_dispatch:
+ push:
+ branches:
+ - dev
+
+jobs:
+ bulid-dev-image:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repo (dev)
+ uses: actions/checkout@v2.3.4
+ with:
+ repository: 'buanet/ioBroker.docker'
+ ref: 'dev'
+
+ - 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/node12/Dockerfile > ./debian/node12/Dockerfile.tmp
+ mv -f ./debian/node12/Dockerfile.tmp ./debian/node12/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@v1.2.0
+
+ - name: Set up Docker Buildx
+ id: buildx
+ uses: docker/setup-buildx-action@v1.5.1
+
+ - name: Login to DockerHub
+ uses: docker/login-action@v1.10.0
+ with:
+ username: ${{ secrets.DOCKER_USER }}
+ password: ${{ secrets.DOCKER_PASS }}
+
+ - name: Login to GitHub Container Registry
+ uses: docker/login-action@v1.10.0
+ with:
+ registry: ghcr.io
+ username: ${{ secrets.PACKAGES_USER }}
+ password: ${{ secrets.PACKAGES_PASS }}
+
+ - name: Build Docker image (amd64)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node12/Dockerfile
+ push: true
+ platforms: linux/amd64
+ tags: |
+ buanet/iobroker:dev-amd64,
+ ghcr.io/buanet/iobroker:dev-amd64
+
+ - name: Build Docker image (arm32v7)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node12/Dockerfile
+ push: true
+ platforms: linux/arm/v7
+ tags: |
+ buanet/iobroker:dev-arm32v7,
+ ghcr.io/buanet/iobroker:dev-arm32v7
+
+ - name: Build Docker image (arm64v8)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node12/Dockerfile
+ push: true
+ platforms: linux/arm64/v8
+ tags: |
+ buanet/iobroker:dev-arm64v8,
+ ghcr.io/buanet/iobroker:dev-arm64v8
+
+ - name: Create and push manifests
+ run: |
+ sed -e "s/\${VERSION}/dev/g" -e "s/\${DOCKERTAG}/dev/g" ./manifest.yml > manifest_dev.yaml
+ ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_dev.yaml
+ sed -e "s/\${VERSION}/dev/g" -e "s/\${DOCKERTAG}/dev/g" ./manifest_ghcr.yml > manifest_ghcr_dev.yaml
+ ./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@v3
+ 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
diff --git a/.github/workflows/build-debian-image-main.yml b/.github/workflows/build-debian-image-main.yml
new file mode 100644
index 0000000..783059a
--- /dev/null
+++ b/.github/workflows/build-debian-image-main.yml
@@ -0,0 +1,132 @@
+# Github action to build Docker image from main branch (tag: latest)
+name: Build debian based image (latest)
+
+on:
+ workflow_dispatch:
+ release:
+ types:
+ - published
+ schedule:
+ - cron: '42 3 * * 5'
+
+jobs:
+ bulid-latest-image:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repo (main)
+ uses: actions/checkout@v2.3.4
+ 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/" -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/node12/Dockerfile > ./debian/node12/Dockerfile.tmp
+ mv -f ./debian/node12/Dockerfile.tmp ./debian/node12/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@v1.2.0
+
+ - name: Set up Docker Buildx
+ id: buildx
+ uses: docker/setup-buildx-action@v1.5.1
+
+ - name: Login to DockerHub (buanet)
+ uses: docker/login-action@v1.10.0
+ with:
+ username: ${{ secrets.DOCKER_USER }}
+ password: ${{ secrets.DOCKER_PASS }}
+
+ - name: Login to GitHub Container Registry
+ uses: docker/login-action@v1.10.0
+ with:
+ registry: ghcr.io
+ username: ${{ secrets.PACKAGES_USER }}
+ password: ${{ secrets.PACKAGES_PASS }}
+
+ - name: Build Docker image (amd64)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node12/Dockerfile
+ push: true
+ platforms: linux/amd64
+ tags: |
+ buanet/iobroker:${{ env.version }}-amd64,
+ ghcr.io/buanet/iobroker:${{ env.version }}-amd64
+
+ - name: Build Docker image (arm32v7)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node12/Dockerfile
+ push: true
+ platforms: linux/arm/v7
+ tags: |
+ buanet/iobroker:${{ env.version }}-arm32v7,
+ ghcr.io/buanet/iobroker:${{ env.version }}-arm32v7
+
+ - name: Build Docker image (arm64v8)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node12/Dockerfile
+ push: true
+ platforms: linux/arm64/v8
+ tags: |
+ buanet/iobroker:${{ env.version }}-arm64v8,
+ ghcr.io/buanet/iobroker:${{ env.version }}-arm64v8
+
+ - name: Create and push manifests (buanet)
+ run: |
+ sed -e "s/\${VERSION}/${{ env.version }}/g" -e "s/\${DOCKERTAG}/latest/g" ./manifest.yml > manifest_latest.yaml
+ ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_latest.yaml
+ sed -e "s/\${VERSION}/${{ env.version }}/g" -e "s/\${DOCKERTAG}/latest/g" ./manifest_ghcr.yml > manifest_ghcr_latest.yaml
+ ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_latest.yaml
+ sed -e "s/\${VERSION}/${{ env.version }}/g" -e "s/\${DOCKERTAG}/${{ env.majorversion }}/g" ./manifest.yml > manifest_majorversion.yaml
+ ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_majorversion.yaml
+ sed -e "s/\${VERSION}/${{ env.version }}/g" -e "s/\${DOCKERTAG}/${{ env.majorversion }}/g" ./manifest_ghcr.yml > manifest_ghcr_majorversion.yaml
+ ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_majorversion.yaml
+ sed -e "s/\${VERSION}/${{ env.version }}/g" -e "s/\${DOCKERTAG}/${{ env.version }}/g" ./manifest.yml > manifest_version.yaml
+ ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_version.yaml
+ sed -e "s/\${VERSION}/${{ env.version }}/g" -e "s/\${DOCKERTAG}/${{ env.version }}/g" ./manifest_ghcr.yml > manifest_ghcr_version.yaml
+ ./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@v3
+ 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
diff --git a/.github/workflows/build-debian-image-main_iob.yml b/.github/workflows/build-debian-image-main_iob.yml
new file mode 100644
index 0000000..ed4edba
--- /dev/null
+++ b/.github/workflows/build-debian-image-main_iob.yml
@@ -0,0 +1,96 @@
+# Github action to build Docker image from main branch for iobroker/iobroker (tag: latest)
+name: Build debian based image (latest)
+
+on:
+ workflow_dispatch:
+ release:
+ types:
+ - published
+ schedule:
+ - cron: '42 3 * * 5'
+
+jobs:
+ bulid-latest-image:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repo (main)
+ uses: actions/checkout@v2.3.4
+ 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/" -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/node12/Dockerfile > ./debian/node12/Dockerfile.tmp
+ mv -f ./debian/node12/Dockerfile.tmp ./debian/node12/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@v1.2.0
+
+ - name: Set up Docker Buildx
+ id: buildx
+ uses: docker/setup-buildx-action@v1.5.1
+
+ - name: Login to DockerHub (iobroker)
+ uses: docker/login-action@v1.10.0
+ with:
+ username: ${{ secrets.DOCKER_USER_IOB }}
+ password: ${{ secrets.DOCKER_PASS_IOB }}
+
+ - name: Build Docker image (amd64)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node12/Dockerfile
+ push: true
+ platforms: linux/amd64
+ tags: |
+ iobroker/iobroker:${{ env.version }}-amd64,
+
+ - name: Build Docker image (arm32v7)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node12/Dockerfile
+ push: true
+ platforms: linux/arm/v7
+ tags: |
+ iobroker/iobroker:${{ env.version }}-arm32v7,
+
+ - name: Build Docker image (arm64v8)
+ uses: docker/build-push-action@v2.6.1
+ with:
+ context: ./debian
+ file: ./debian/node12/Dockerfile
+ push: true
+ platforms: linux/arm64/v8
+ tags: |
+ iobroker/iobroker:${{ env.version }}-arm64v8,
+
+ - name: Create and push manifests (iobroker)
+ run: |
+ sed -e "s/\${VERSION}/${{ env.version }}/g" -e "s/\${DOCKERTAG}/latest/g" ./manifest_iob.yml > manifest_latest_iob.yaml
+ ./manifest-tool --username ${{ secrets.DOCKER_USER_IOB }} --password ${{ secrets.DOCKER_PASS_IOB }} push from-spec manifest_latest_iob.yaml
+ sed -e "s/\${VERSION}/${{ env.version }}/g" -e "s/\${DOCKERTAG}/${{ env.majorversion }}/g" ./manifest_iob.yml > manifest_majorversion_iob.yaml
+ ./manifest-tool --username ${{ secrets.DOCKER_USER_IOB }} --password ${{ secrets.DOCKER_PASS_IOB }} push from-spec manifest_majorversion_iob.yaml
+ sed -e "s/\${VERSION}/${{ env.version }}/g" -e "s/\${DOCKERTAG}/${{ env.version }}/g" ./manifest_iob.yml > manifest_version_iob.yaml
+ ./manifest-tool --username ${{ secrets.DOCKER_USER_IOB }} --password ${{ secrets.DOCKER_PASS_IOB }} push from-spec manifest_version_iob.yaml
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 151b37d..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,112 +0,0 @@
-sudo: required
-
-branches:
- only:
- - master
- - beta
-
-services:
- - docker
-
-language: bash
-
-env:
- global:
- - secure: "iqK7JBsQiYceKOvRkmSa6okzXn3BygEPZjffby4agaVCwIt2SYLAcBOisOoKDpyAX+DUWlHz3gITImVa+uIna6Ue7k4C2AGJVDr87G6iq57Tn6yjrfhPs/TW9/CWvKg/G4uvKEnycMiLDXdcctSMwRr3ZwzJEdeEdmNZVsd2LP/5U0I/2K2Io22tNciSKhqlSaIfhK4f6Jk7xffnQFjwy+P9qPN18oI1fDyeHx6ZWyN3YhQQ4eGyxHjxZjlhCxSvu5R4DMf1jFIoLRAr6G5jrQacn0pG8PtBVLoYT4RsPy+fwUtXmnWWjeXK0IrU1njZf/DUteI9xnaDcHzZYj+d7MeSUc6BuWOyx9lO3ZwBWDNycYsKaF5so4RpdzoY/gfJMlK3uWDbADb46dWzPD5gb3pEROKau3fBDHS5eaR5e1Bxzz6FGoYWYfsQHqpg9g7v4BRFq+Jh0+v47fdyMxgK/Nm4+r7+ht77Usu29+X6X8F4iwrBJ/ix5xIf7iMoH/ZGvq6BEKi/1t9zdXMugcWOqwlYx9k6J9bQhBfw8YucLmgl3ynzrPaLlPEpY9cnb7hcOUDZoHI7KK2zF/y3yfNr2BqlRbm39HFWfnwuJPO5VLYGs5QubeVj9u1M+5Qo4erPuQBBc4mHP4eF2PmRA+wiVWki0z+U2skFQppkCfrbH8c="
- - secure: "iqoZUcWgZueNQrNldF/ugwyU1LR5E+doTfjY0exQqAKjntG5n2QqYZ/+dX1gqvkfy1kuMINTBWfqSALbhfTTK7EfUjqmcnaks4CMVZQkhH/FyCOYHqSBSSN7j4XeHt1sXn1FRiSpyrZOUoOuyqoBRe3JoWhdQZAGxNzX3sJllwnKa6M0D6D2l9tUyTWO/jxhgTIoYBSrXvb68ZsCU9jlNBJbylfvEFwuSlwvfa+Mz9vAeCTuza9XDnvcxgwVq3r+YGxfmAhK9fOAvN+lPN+KA0LcIzBaW0sh24voqjfh/pLpsl03zeGNdWzS9r2qYPCP0N3asb5P6CVEbbAGYO1T5PvU78ILXGi4+/x/32O6/I9oXpMVQCFHNn0Gn/8BPRHY4ZOYI9ItnhV9Ncp7hhAWAAqf3KC5GM89l9R5KxFY3bhN/p8nuGresUDU5d57YkaV8rOhPpr0dbAyKFtuzG0+bT1N2ekXyTyMHeAGKiGwfD9bAS4qx6asFO5uw6UriBHNzJ59Cy3GT+W1CctaEuvqJlc6Iqz2KaBozEqnNFcpE2Grny4bzr5fp+b1qCO9TE2LhHU/LR5FTLjQ2wf9/raTM6yboq+guKeXxpySa2w8ABDq0OUAw4mrKqJQJohzBkl3oYTpWUG2JGEyMAJxjkmH0/3GwZESPNLaaYVjQByTDDY="
- - VERSION="$(cat .VERSION)"
- - MAJORVERSION="$(cat .VERSION | cut -c 1-2 | sed -r 's#^(.{0})#\1latest-#')"
-
-before_install:
- - wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool
- - chmod +x manifest-tool
- - docker run --rm --privileged multiarch/qemu-user-static:register
- - echo "$HUB_PASS" | docker login -u "$HUB_USER" --password-stdin
-
-jobs:
- include:
- - stage: Build images
- env:
- - ARCH=amd64
- - JOB_NAME="Build images"
- script:
- - sed -i "s/\$VERSION/${VERSION}/g" $ARCH/scripts/iobroker_startup.sh
- - docker build -t "buanet/iobroker:$VERSION-$ARCH" ./amd64
-
- - stage: Build images
- env:
- - ARCH=aarch64
- - JOB_NAME="Build images"
- script:
- - docker run --rm --privileged multiarch/qemu-user-static:register --reset
- - sed -i "s/\$VERSION/${VERSION}/g" $ARCH/scripts/iobroker_startup.sh
- - docker build -t "buanet/iobroker:$VERSION-$ARCH" ./aarch64
-
- - stage: Build images
- env:
- - ARCH=armv7hf
- - JOB_NAME="Build images"
- script:
- - docker run --rm --privileged multiarch/qemu-user-static:register --reset
- - sed -i "s/\$VERSION/${VERSION}/g" $ARCH/scripts/iobroker_startup.sh
- - docker build -t "buanet/iobroker:$VERSION-$ARCH" ./armv7hf
-
- - stage: Manifest
- env:
- - JOB_NAME="Manifest"
- script:
- - echo Placeholder
-
-after_success:
-# tag and push built images
- - >
- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Build images" ] ; then
- docker push buanet/iobroker:$VERSION-$ARCH
- fi
-
- if [ "$TRAVIS_BRANCH" == "beta" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Build images" ] ; then
- docker push buanet/iobroker:$VERSION-$ARCH
- fi
-
-# update repository manifest for multiarch and push to hub
- - >
- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Manifest" ]; then
- cat manifest.yml | sed "s/\$VERSION/${VERSION}/g" > manifest.yaml
-
- #manifest for image: buanet/iobroker:version
- cat manifest.yaml | sed "s/\$DOCKERTAG/${VERSION}/g" > manifestversion.yaml
-
- #manifest for image: buanet/iobroker:latest
- cat manifest.yaml | sed "s/\$DOCKERTAG/latest/g" > manifestlatest.yaml
-
- #manifest for image: buanet/iobroker:latest-majorversion
- cat manifest.yaml | sed "s/\$DOCKERTAG/${MAJORVERSION}/g" > manifestmajorversion.yaml
-
- #push to hub
- mv manifestversion.yaml iobroker.yaml
- ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml
-
- mv manifestlatest.yaml iobroker.yaml
- ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml
-
- mv manifestmajorversion.yaml iobroker.yaml
- ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml
- fi
-
- if [ "$TRAVIS_BRANCH" == "beta" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Manifest" ]; then
-
- cat manifest.yml | sed "s/\$VERSION/${VERSION}/g" > manifest.yaml
-
- #manifest for image: buanet/iobroker:version
- cat manifest.yaml | sed "s/\$DOCKERTAG/${VERSION}/g" > manifestversion.yaml
-
- #manifest for image: buanet/iobroker:beta
- cat manifest.yaml | sed "s/\$DOCKERTAG/beta/g" > manifestbeta.yaml
-
- #push to hub
- mv manifestversion.yaml iobroker.yaml
- ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml
-
- mv manifestbeta.yaml iobroker.yaml
- ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml
- fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff1640d..0112ef6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,130 +1,157 @@
## Changelog
+### v5.2.0-beta4 (2021-09-10)
+* adding iobroker user rights for "gosu"
+* adding more labels in OCI standard format
+* fixing workdir bug
+* adding backitup compatibility
+* v5.2.0-beta3 (2021-09-04)
+ * reducing layers in dockerfile
+ * making hostname check mandatory for startup
+ * optimize startup log
+* v5.2.0-beta2 (2021-08-28)
+ * redesign maintenance script
+ * switching amd64 base image to debian bullseye slim
+ * optimizing log output
+ * adding labels in OCI standard format
+ * adding packages update on first start
+ * adding file for docker detection by ioBroker adapters
+ * adding best practice for states db migation in readme
+ * removing couchdb option for states db (no longer supported)
+* v5.2.0-beta1 (2021-05-04)
+ * added upgrade parameter to maintenance script
+ * added expose for default admin ui port (#172)
+ * added shortform for maintenance script
+* v5.2.0-beta (2021-04-02)
+ * some renaming to optimize automated build
+ * changes in versioning
+ * delete travis for automated build
+
### v5.1.0 (2020-11-05)
-* v5.0.2beta (2020-07-28)
+* v5.0.2-beta (2020-07-28)
* added docker tag for majorversion latest
* extend readme.md doku
* added maintenance script
* added container healthcheck
* fixed configuration procedure and logging for objects and states db setup
-* v5.0.1beta (2020-07-01)
+* v5.0.1-beta (2020-07-01)
* fixing backup detection in startup script
* fixing permission issue on iobroker restored
* extended Logging
* optimize multihost support
### v5.0.0 (2020-06-29)
-* v4.2.4beta (2020-06-23)
+* v4.2.4-beta (2020-06-23)
* added graceful shutdown
* small fix for GID/UID handling
* adding new ENV "IOB_MULTIHOST" for multihost support
* small syntax fixes in iobroker_startup.sh
-* v4.2.3beta (2020-06-05)
+* v4.2.3-beta (2020-06-05)
* ~~updating js-controller to not stable version 3.1.5 to fix renaming issue~~ (is stable now)
-* v4.2.2beta (2020-06-03)
+* v4.2.2-beta (2020-06-03)
* ~~workaround for renaming issues on startup~~ (fixed in js-controller)
-* v4.2.1beta (2020-05-10)
+* v4.2.1-beta (2020-05-10)
* using node 12 instead of 10
* updated documentation in readme.md
### v4.2.0 (2020-04-14)
-* v4.1.4beta (2020-04-07)
+* v4.1.4-beta (2020-04-07)
* switching base image to buster
* optimizing installation of packages defined by ENV "PACKAGES"
-* v4.1.3beta (2020-02-08)
+* v4.1.3-beta (2020-02-08)
* renamed ENV for adminport (new "IOB_ADMINPORT)")
* added new ENVs for "iobroker setup custom" (replacing "REDIS")
* enhancements in startup script logging
-* v4.1.2beta (2020-02-02)
+* v4.1.2-beta (2020-02-02)
* added feature for running user defined scripts on startup
* small fix for permissions issues on some systems
-* v4.1.1beta (2020-01-17)
+* v4.1.1-beta (2020-01-17)
* updated openzwave to version 1.6.1007
### v4.1.0 (2020-01-17)
* improved readme.md
-* v4.0.3beta (2020-01-06)
+* v4.0.3-beta (2020-01-06)
* added support to restore backup on startup
* small fixes according to "docker best practices"
-* v4.0.2beta (2019-12-10)
+* v4.0.2-beta (2019-12-10)
* ~~added env for activating redis~~
* enhancements in startup script and docker file
-* v4.0.1beta (2019-11-25)
+* v4.0.1-beta (2019-11-25)
* added env for iobroker admin port
* added env for usb-devices (setting permissions)
* updateing prerequisites for iobroker installation
* some small code fixes
### v4.0.0 (2019-10-25)
-* v3.1.4beta (2019-10-23)
+* v3.1.4-beta (2019-10-23)
* added env for zwave support
-* v3.1.3beta (2019-10-17)
+* v3.1.3-beta (2019-10-17)
* enhanced logging of startup-script
* multi arch support (amd64, aarch64, armv7hf)
-* v3.1.2beta (2019-09-03)
+* v3.1.2-beta (2019-09-03)
* using node 10 instead of node 8
-* v3.1.1beta (2019-09-02)
+* v3.1.1-beta (2019-09-02)
* adding env for setting uid/ gid for iobroker-user
### v3.1.0 (2019-08-21)
-* v3.0.3beta (2019-08-21)
+* v3.0.3-beta (2019-08-21)
* switching base image from "debian:latest" to "debian:stretch"
-* v3.0.2beta (2019-06-13)
+* v3.0.2-beta (2019-06-13)
* using gosu instead of sudo
* changing output of ioBroker logging
-* v3.0.1beta (2019-05-18)
+* v3.0.1-beta (2019-05-18)
* ~~switching back to iobroker-daemon for startup~~
### v3.0.0 (2019-05-09)
-* v2.0.6beta (2019-04-14)
+* v2.0.6-beta (2019-04-14)
* added some additional logging
* fixing some issues for language env
* added permission fixing on first start
-* v2.0.5beta (2019-02-09)
+* v2.0.5-beta (2019-02-09)
* added ENV to docker file
* added EXPOSE for admin
* final testing
-* v2.0.4beta (2019-01-28)
+* v2.0.4-beta (2019-01-28)
* added support for env variables "avahi" and "packages"
* moving avahi-daemon installation into avahi startup script
* added script for installing optional packages
* optimizing logging output
-* v2.0.3beta (2019-01-24)
+* v2.0.3-beta (2019-01-24)
* added support for running ioBroker under iobroker user
* optimizing logging output
* optimizing scripts
-* v2.0.2beta (2019-01-23)
+* v2.0.2-beta (2019-01-23)
* optimizing and rearranged docker file
* changes for new ioBroker install script
* added restoring for empty mounted /opt/iobroker folder
* some more small fixes
-* v2.0.1beta (2019-01-07)
+* v2.0.1-beta (2019-01-07)
* some changes for supporting other docker-environments than synology ds
### v2.0.0 (2018-12-05)
-* v1.2.2beta (2018-12-05)
+* v1.2.2-beta (2018-12-05)
* using node8 instead of node6
* changes for new iobroker setup
-* v1.2.1beta (2018-09-12)
+* v1.2.1-beta (2018-09-12)
* added support for firetv-adapter
### v1.2.0 (2018-08-21)
-* v1.1.3beta (2018-08-21)
+* v1.1.3-beta (2018-08-21)
* ~~added ffmpeg-package for yahka to support webcams~~
-* v1.1.2beta (2018-04-04)
+* v1.1.2-beta (2018-04-04)
* added ENV for timezone issue
-* v1.1.1beta (2018-03-29)
+* v1.1.1-beta (2018-03-29)
* added wget package
* updated readme.md
### v1.1.0 (2017-12-10)
-* v1.0.2beta (2017-12-10)
+* v1.0.2-beta (2017-12-10)
* changed startup call to fix restart issue
* fixed avahi startup issue
* fixed hostname issue
* added z-wave support
* added logging to /opt/scripts/docker_iobroker_log.txt
-* v1.0.1beta (2017-08-25)
+* v1.0.1-beta (2017-08-25)
* fixed locales issue
### v1.0.0 (2017-08-22)
diff --git a/README.md b/README.md
index 54ae54a..d12fd31 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
# Official Docker Image for ioBroker
-[](https://github.com/buanet/ioBroker.docker)
-[](https://github.com/buanet/ioBroker.docker/releases)
-[](https://github.com/buanet/ioBroker.docker/issues)
-[](https://hub.docker.com/repository/docker/buanet/iobroker)
-[](https://hub.docker.com/repository/docker/buanet/iobroker)
-[](https://hub.docker.com/repository/docker/buanet/iobroker)
-[](https://github.com/buanet/ioBroker.docker/blob/master/LICENSE.md)
-[](https://paypal.me/buanet)
+[](https://github.com/buanet/ioBroker.docker)
+[](https://github.com/buanet/ioBroker.docker/releases)
+[](https://github.com/buanet/ioBroker.docker/issues)
+[](https://hub.docker.com/repository/docker/buanet/iobroker)
+[](https://hub.docker.com/repository/docker/buanet/iobroker)
+[](https://hub.docker.com/repository/docker/buanet/iobroker)
+[](https://github.com/buanet/ioBroker.docker/blob/master/LICENSE.md)
+[](https://paypal.me/buanet)
This image is a ready to use Docker image for ioBroker IoT platform (http://www.iobroker.net).
@@ -85,7 +85,7 @@ You do not have to declare every single variable when setting up your container.
|IOB_MULTIHOST|[not set]|Sets ioBroker instance as "master" or "slave" for multihost support (needs additional config for objectsdb and statesdb!)|
|IOB_OBJECTSDB_HOST|127.0.0.1|Sets host for ioBroker objects db|
|IOB_OBJECTSDB_PORT|9001|Sets port for ioBroker objects db|
-|IOB_OBJECTSDB_TYPE|file|Sets type of ioBroker objects db, cloud be "file" or "redis"
(at the moment redis as objects db is [not supported by ioBroker](https://github.com/ioBroker/ioBroker#databases))|
+|IOB_OBJECTSDB_TYPE|file|Sets type of ioBroker objects db, cloud be "file" or "redis"
(at the moment redis as objects db is [not officially supported by ioBroker](https://github.com/ioBroker/ioBroker#databases))|
|IOB_STATESDB_HOST|127.0.0.1|Sets host for ioBroker states db|
|IOB_STATESDB_PORT|9000|Sets port for ioBroker states db|
|IOB_STATESDB_TYPE|file|Sets type of ioBroker states db, could be "file" or "redis"|
@@ -169,8 +169,16 @@ If you want to upgrade your ioBroker container to a new major version (e.g. from
After this steps the startup script inside the container will automatically detect and restore your backup to a new ioBroker instance. When iobroker is started after the restore it will install your adapters to the new ioBroker instance by itself. This might take some time but will give you the best and cleanest results...
+### Switching states db from file to redis
+
+If you want to switch states db from file to redis on a n existing installation you might want to keep all your actual states. As simply setting the needed ENVs won't migrate your existing states into the redis db it is best practice to first run "iobroker setup custom" inside your container before adding the ENVs. This will give you the choice to migrate your states.
+
## Miscellaneous
+### Detecting this Docker image by ioBroker (feature for adapter developers)
+
+For adapter developers it is now possible to easily detect if ioBroker is running inside the official docker container. Please simply check if the file `/opt/scripts/.docker_config/.thisisdocker` exists. The content of the file will tell the image version.
+
### 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 readme.md file for beta versions [here](https://github.com/buanet/ioBroker.docker/blob/beta/README.md). Please make sure to read the changelog before testing beta versions.
diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
deleted file mode 100644
index fbe6c1c..0000000
--- a/aarch64/Dockerfile
+++ /dev/null
@@ -1,103 +0,0 @@
-FROM balenalib/aarch64-debian:buster
-
-LABEL maintainer="Andre Germann" \
- url="https://buanet.de"
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Install prerequisites (as listed in iobroker installer.sh)
-RUN apt-get update && apt-get install -y \
- acl \
- apt-utils \
- build-essential \
- curl \
- git \
- gnupg2 \
- gosu \
- jq \
- libavahi-compat-libdnssd-dev \
- libcap2-bin \
- libpam0g-dev \
- libudev-dev \
- locales \
- pkg-config \
- procps \
- python \
- python-dev \
- sudo \
- udev \
- unzip \
- wget \
- && rm -rf /var/lib/apt/lists/*
-
-# Install node
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash \
- && apt-get update && apt-get install -y nodejs \
- && rm -rf /var/lib/apt/lists/*
-
-# Generating locales
-RUN sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
- && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
- && locale-gen
-
-# Create scripts directorys and copy scripts
-RUN mkdir -p /opt/scripts/ \
- && mkdir -p /opt/userscripts/ \
- && chmod 777 /opt/scripts/ \
- && chmod 777 /opt/userscripts/
-WORKDIR /opt/scripts/
-COPY scripts/iobroker_startup.sh iobroker_startup.sh
-COPY scripts/setup_avahi.sh setup_avahi.sh
-COPY scripts/setup_packages.sh setup_packages.sh
-COPY scripts/setup_zwave.sh setup_zwave.sh
-COPY scripts/healthcheck.sh healthcheck.sh
-COPY scripts/maintenance.sh maintenance.sh
-RUN chmod +x iobroker_startup.sh \
- && chmod +x setup_avahi.sh \
- && chmod +x setup_packages.sh \
- && chmod +x setup_zwave.sh \
- && chmod +x healthcheck.sh \
- && chmod +x maintenance.sh
-WORKDIR /opt/userscripts/
-COPY scripts/userscript_firststart_example.sh userscript_firststart_example.sh
-COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
-
-# Install ioBroker
-WORKDIR /
-RUN apt-get update \
- && curl -sL https://iobroker.net/install.sh | bash - \
- && mkdir -p /opt/scripts/.docker_config/ \
- && echo $(hostname) > /opt/scripts/.docker_config/.install_host \
- && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
- && echo $(hostname) > /opt/.firstrun \
- && rm -rf /var/lib/apt/lists/*
-
-# Install node-gyp
-WORKDIR /opt/iobroker/
-RUN npm install -g node-gyp
-
-# Backup initial ioBroker and userscript folder
-RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
- && tar -cf /opt/initial_userscripts.tar /opt/userscripts
-
-# Setting up iobroker-user (shell and home directory)
-RUN chsh -s /bin/bash iobroker \
- && usermod --home /opt/iobroker iobroker \
- && usermod -u 1000 iobroker \
- && groupmod -g 1000 iobroker
-
-# Setting up ENVs
-ENV DEBIAN_FRONTEND="teletype" \
- LANG="de_DE.UTF-8" \
- LANGUAGE="de_DE:de" \
- LC_ALL="de_DE.UTF-8" \
- SETGID=1000 \
- SETUID=1000 \
- TZ="Europe/Berlin"
-
-# Healthcheck
-HEALTHCHECK --interval=15s --timeout=5s --retries=5 \
- CMD ["/bin/bash", "-c", "/opt/scripts/healthcheck.sh"]
-
-# Run startup-script
-ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh
deleted file mode 100644
index e9fa617..0000000
--- a/aarch64/scripts/iobroker_startup.sh
+++ /dev/null
@@ -1,506 +0,0 @@
-#!/bin/bash
-
-# Setting healthcheck status to "starting"
-echo "starting" > /opt/scripts/.docker_config/.healthcheck
-
-# Reading ENV
-adminport=$IOB_ADMINPORT
-avahi=$AVAHI
-multihost=$IOB_MULTIHOST
-objectsdbhost=$IOB_OBJECTSDB_HOST
-objectsdbport=$IOB_OBJECTSDB_PORT
-objectsdbtype=$IOB_OBJECTSDB_TYPE
-packages=$PACKAGES
-setgid=$SETGID
-setuid=$SETUID
-statesdbhost=$IOB_STATESDB_HOST
-statesdbport=$IOB_STATESDB_PORT
-statesdbtype=$IOB_STATESDB_TYPE
-usbdevices=$USBDEVICES
-zwave=$ZWAVE
-
-# Getting date and time for logging
-dati=`date '+%Y-%m-%d %H:%M:%S'`
-
-# Logging header
-echo ' '
-echo "$(printf -- '-%.0s' {1..60})"
-echo -n "$(printf -- '-%.0s' {1..15})" && echo -n " "$dati" " && echo "$(printf -- '-%.0s' {1..15})"
-echo "$(printf -- '-%.0s' {1..60})"
-echo ' '
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Welcome to your ioBroker-container! -----"
-echo "----- Startupscript is now running. -----"
-echo "----- Please be patient! -----"
-echo "$(printf -- '-%.0s' {1..60})"
-echo ' '
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Debugging information -----"
-echo "----- -----"
-echo "----- System -----"
-echo -n "----- " && echo -n "$(printf "%-10s %-23s" arch: $(uname -m))" && echo " -----"
-echo "----- -----"
-echo "----- Versions -----"
-echo -n "----- " && echo -n "$(printf "%-10s %-23s" image: $VERSION)" && echo " -----"
-echo -n "----- " && echo -n "$(printf "%-10s %-23s" node: $(node -v))" && echo " -----"
-echo -n "----- " && echo -n "$(printf "%-10s %-23s" npm: $(npm -v))" && echo " -----"
-echo "----- -----"
-echo "----- ENV -----"
-if [ "$adminport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_ADMINPORT: $adminport)" && echo " -----"; fi
-if [ "$avahi" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" AVAHI: $avahi)" && echo " -----"; fi
-if [ "$multihost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_MULTIHOST: $multihost)" && echo " -----"; fi
-if [ "$objectsdbhost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi
-if [ "$objectsdbport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi
-if [ "$objectsdbtype" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi
-if [ "$packages" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" PACKAGES: $packages)" && echo " -----"; fi
-if [ "$setgid" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETGID: $setgid)" && echo " -----"; fi
-if [ "$setuid" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETUID: $setuid)" && echo " -----"; fi
-if [ "$statesdbhost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_HOST: $statesdbhost)" && echo " -----"; fi
-if [ "$statesdbport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_PORT: $statesdbport)" && echo " -----"; fi
-if [ "$statesdbtype" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_TYPE: $statesdbtype)" && echo " -----"; fi
-if [ "$usbdevices" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $usbdevices)" && echo " -----"; fi
-if [ "$zwave" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" ZWAVE: $zwave)" && echo " -----"; fi
-echo "$(printf -- '-%.0s' {1..60})"
-echo ' '
-
-#####
-# STEP 1 - Preparing container
-#####
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Step 1 of 5: Preparing container -----"
-echo "$(printf -- '-%.0s' {1..60})"
-echo ' '
-
-# Installing additional packages and setting uid/gid
-if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ] || [ -f /opt/.firstrun ]
-then
- if [ "$packages" != "" ]
- then
- echo "Installing additional packages is set by ENV."
- echo "The following packages will be installed:" $packages"..."
- echo $packages > /opt/scripts/.packages
- bash /opt/scripts/setup_packages.sh
- echo "Done."
- echo ' '
- fi
- if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
- then
- echo "Different UID and/ or GID is set by ENV."
- echo "Changing UID to "$setuid" and GID to "$setgid"..."
- usermod -u $setuid iobroker
- groupmod -g $setgid iobroker
- echo "Done."
- echo ' '
- fi
- if [ -f /opt/.firstrun ]
- then
- echo "Registering maintenance script as command."
- echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
- echo "Done."
- echo ' '
- fi
-else
- echo "Nothing to do here."
- echo ' '
-fi
-
-# Change directory for next steps
-cd /opt/iobroker
-
-
-#####
-# Detecting ioBroker-Installation
-#####
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Step 2 of 5: Detecting ioBroker installation -----"
-echo "$(printf -- '-%.0s' {1..60})"
-echo ' '
-
-if [ `find /opt/iobroker -type f | wc -l` -lt 1 ]
-then
- echo "There is no data detected in /opt/iobroker. Restoring initial ioBroker installation..."
- tar -xf /opt/initial_iobroker.tar -C /
- echo "Done."
-elif [ -f /opt/iobroker/iobroker ]
-then
- echo "Existing installation of ioBroker detected in /opt/iobroker."
- rm -f /opt/scripts/.docker_config/.install_host
-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
- 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 readme.md on Github (https://github.com/buanet/ioBroker.docker)."
- exit 1
- else
- echo "IoBroker backup file detected in /opt/iobroker. Preparing restore..."
- mv /opt/iobroker/*.tar.gz /opt/
- tar -xf /opt/initial_iobroker.tar -C /
- mkdir /opt/iobroker/backups
- mv /opt/*.tar.gz /opt/iobroker/backups/
- chown -R $setuid:$setgid /opt/iobroker # fixes permission error during restore
- echo "Done."
- echo "Restoring ioBroker..."
- iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
- echo "Done."
- echo ' '
- echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
- echo "!!!!! IMPORTANT NOTE !!!!!"
- echo "!!!!! The sartup 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! !!!!!"
- echo "!!!!! You can view installation process by taking a look at ioBroker log. !!!!!"
- echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
- fi
-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/ volume and start over."
- exit 1
-fi
-echo ' '
-
-
-#####
-# Checking ioBroker-Installation
-#####
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Step 3 of 5: Checking ioBroker installation -----"
-echo "$(printf -- '-%.0s' {1..60})"
-echo ' '
-
-# (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts"
-echo "(Re)Setting folder 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 "Fixing \"sudo-bug\" by replacing sudo in iobroker 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
-echo "Done."
-echo ' '
-
-# Checking for first run of a new installation and renaming ioBroker
-if [ -f /opt/scripts/.docker_config/.install_host ]
-then
- echo "Looks like this is a new and empty installation of ioBroker."
- echo "Hostname needs to be updated to " $(hostname)"..."
- bash iobroker host $(cat /opt/scripts/.docker_config/.install_host)
- rm -f /opt/scripts/.docker_config/.install_host
- echo "Done."
- echo ' '
-elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
-then
- echo "Hostname in ioBroker does not match the hostname of this container."
- echo "Updating hostname to " $(hostname)"..."
- bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
- echo "Done."
- echo ' '
-fi
-
-
-#####
-# Setting up prerequisites for some ioBroker-adapters
-#####
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Step 4 of 5: Applying special settings -----"
-echo "$(printf -- '-%.0s' {1..60})"
-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 ' '
-
-
-# Checking ENV for Adminport
-if [ "$adminport" != "" ]
-then
- if [ "$adminport" != $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ]
- then
- echo "Adminport set by ENV does not match port configured in ioBroker installation."
- echo "Setting Adminport to \""$adminport"\"..."
- bash iobroker set admin.0 --port $adminport
- echo "Done."
- echo ' '
- fi
-fi
-
-
-# Checking ENV for AVAHI
-if [ "$avahi" != "" ]
-then
- if [ "$avahi" = "true" ]
- then
- echo "Avahi-daemon is activated by ENV."
- chmod 755 /opt/scripts/setup_avahi.sh
- bash /opt/scripts/setup_avahi.sh
- echo "Done."
- echo ' '
- fi
-fi
-
-
-# Checking ENV for Z-WAVE
-if [ "$zwave" != "" ]
-then
- if [ "$zwave" = "true" ]
- then
- echo "Z-Wave is activated by ENV."
- chmod 755 /opt/scripts/setup_zwave.sh
- bash /opt/scripts/setup_zwave.sh
- echo "Done."
- echo ' '
- fi
-fi
-
-
-# checking ENV for USBDEVICES
-if [ "$usbdevices" != "" ]
-then
- if [ "$usbdevices" != "none" ]
- then
- echo "Usb-device-support is activated by ENV."
- IFS=';' read -ra devicearray <<< "$usbdevices"
- for i in "${devicearray[@]}"
- do
- echo "Setting permissions for" $i"..."
- chown root:dialout $i
- chmod g+rw $i
- done
- echo "Done."
- echo ' '
- fi
-fi
-
-
-# Checking ENV for multihost setup
-# 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."
- 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
-
-
-# Checking ENVs for custom setup of objects db
-if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ]
-then
- 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 "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."
- 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 "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."
- 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 "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."
- fi
- echo ' '
-fi
-
-
-# Checking ENVs for custom setup of states db#
-if [ "$statesdbtype" != "" ] || [ "$statesdbhost" != "" ] || [ "$statesdbport" != "" ]
-then
- 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 "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."
- 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 "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."
- 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 "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."
- fi
- echo ' '
-fi
-
-
-# Checking for Userscripts in /opt/userscripts
-if [ `find /opt/userscripts -type f | wc -l` -lt 1 ]
-then
- echo "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 ]
-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
- bash /opt/userscripts/userscript_firststart.sh
- echo "Done."
- echo ' '
- fi
- if [ -f /opt/userscripts/userscript_everystart.sh ]
- then
- echo "Userscript for every start detected. Running userscript_everystart.sh..."
- chmod 755 /opt/userscripts/userscript_everystart.sh
- bash /opt/userscripts/userscript_everystart.sh
- echo "Done."
- echo ' '
- fi
-fi
-
-# Removing first run marker when exists
-if [ -f /opt/.firstrun ]
-then
-rm -f /opt/.firstrun
-fi
-
-#####
-# Starting ioBroker
-#####
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Step 5 of 5: ioBroker startup -----"
-echo "$(printf -- '-%.0s' {1..60})"
-echo ' '
-echo "Starting ioBroker..."
-echo ' '
-
-# Setting healthcheck status to "running"
-echo "running" > /opt/scripts/.docker_config/.healthcheck
-
-# Function for graceful shutdown by SIGTERM signal
-shut_down() {
- echo ' '
- echo "Recived termination signal (SIGTERM)."
- echo "Shutting down ioBroker..."
- pid=$(ps -ef | awk '/[j]s.controller/{print $2}')
- kill -SIGTERM "$pid"
- exit
-}
-
-# Trap to get signal for graceful shutdown
-trap 'shut_down' SIGTERM
-
-# IoBroker start
-gosu iobroker node node_modules/iobroker.js-controller/controller.js & wait
-
-# Fallback process for keeping container running when ioBroker is stopped for maintenance (e.g. js-controller update)
-tail -f /dev/null
diff --git a/aarch64/scripts/maintenance.sh b/aarch64/scripts/maintenance.sh
deleted file mode 100644
index 4f77980..0000000
--- a/aarch64/scripts/maintenance.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-if [ "$1" == "status" ]
-then
- if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ]
- then
- echo 'Maintenance mode is ON.'
- exit 0
- elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ]
- then
- echo 'Maintenance mode is OFF.'
- exit 0
- fi
-elif [ "$1" == "on" ]
-then
- echo 'You are going to stop ioBroker and activating maintenance mode for this container.'
- read -p 'Do you want to continue [yes/no]? ' A
- if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
- then
- 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.'
- exit 0
- else
- exit 0
- fi
-elif [ "$1" == "off" ]
-then
- echo 'You are going to deactivate maintenance mode for this container.'
- echo 'Depending of the restart policy of this container, this will stop/ restart your container immediately.'
- read -p 'Do you want to continue [yes/no]? ' A
- if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
- then
- echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
- echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
- pkill -u root
- exit 0
- else
- exit 0
- fi
-else
- echo 'Invalid command. Please try again.'
-fi
-
-exit 0
diff --git a/aarch64/scripts/setup_packages.sh b/aarch64/scripts/setup_packages.sh
deleted file mode 100644
index 449900f..0000000
--- a/aarch64/scripts/setup_packages.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-apt-get -qq update
-
-packages=$(cat /opt/scripts/.packages)
-for i in $packages; do
- sudo apt-get -qq -y install $i
-done
-
-rm -rf /var/lib/apt/lists/*
-rm -f /opt/scripts/.packages
-
-exit 0
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
deleted file mode 100644
index c32b42b..0000000
--- a/amd64/Dockerfile
+++ /dev/null
@@ -1,103 +0,0 @@
-FROM amd64/debian:buster
-
-LABEL maintainer="Andre Germann" \
- url="https://buanet.de"
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Install prerequisites (as listed in iobroker installer.sh)
-RUN apt-get update && apt-get install -y \
- acl \
- apt-utils \
- build-essential \
- curl \
- git \
- gnupg2 \
- gosu \
- jq \
- libavahi-compat-libdnssd-dev \
- libcap2-bin \
- libpam0g-dev \
- libudev-dev \
- locales \
- pkg-config \
- procps \
- python \
- python-dev \
- sudo \
- udev \
- unzip \
- wget \
- && rm -rf /var/lib/apt/lists/*
-
-# Install node
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash \
- && apt-get update && apt-get install -y nodejs \
- && rm -rf /var/lib/apt/lists/*
-
-# Generating locales
-RUN sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
- && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
- && locale-gen
-
-# Create scripts directorys and copy scripts
-RUN mkdir -p /opt/scripts/ \
- && mkdir -p /opt/userscripts/ \
- && chmod 777 /opt/scripts/ \
- && chmod 777 /opt/userscripts/
-WORKDIR /opt/scripts/
-COPY scripts/iobroker_startup.sh iobroker_startup.sh
-COPY scripts/setup_avahi.sh setup_avahi.sh
-COPY scripts/setup_packages.sh setup_packages.sh
-COPY scripts/setup_zwave.sh setup_zwave.sh
-COPY scripts/healthcheck.sh healthcheck.sh
-COPY scripts/maintenance.sh maintenance.sh
-RUN chmod +x iobroker_startup.sh \
- && chmod +x setup_avahi.sh \
- && chmod +x setup_packages.sh \
- && chmod +x setup_zwave.sh \
- && chmod +x healthcheck.sh \
- && chmod +x maintenance.sh
-WORKDIR /opt/userscripts/
-COPY scripts/userscript_firststart_example.sh userscript_firststart_example.sh
-COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
-
-# Install ioBroker
-WORKDIR /
-RUN apt-get update \
- && curl -sL https://iobroker.net/install.sh | bash - \
- && mkdir -p /opt/scripts/.docker_config/ \
- && echo $(hostname) > /opt/scripts/.docker_config/.install_host \
- && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
- && echo $(hostname) > /opt/.firstrun \
- && rm -rf /var/lib/apt/lists/*
-
-# Install node-gyp
-WORKDIR /opt/iobroker/
-RUN npm install -g node-gyp
-
-# Backup initial ioBroker and userscript folder
-RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
- && tar -cf /opt/initial_userscripts.tar /opt/userscripts
-
-# Setting up iobroker-user (shell and home directory)
-RUN chsh -s /bin/bash iobroker \
- && usermod --home /opt/iobroker iobroker \
- && usermod -u 1000 iobroker \
- && groupmod -g 1000 iobroker
-
-# Setting up ENVs
-ENV DEBIAN_FRONTEND="teletype" \
- LANG="de_DE.UTF-8" \
- LANGUAGE="de_DE:de" \
- LC_ALL="de_DE.UTF-8" \
- SETGID=1000 \
- SETUID=1000 \
- TZ="Europe/Berlin"
-
-# Healthcheck
-HEALTHCHECK --interval=15s --timeout=5s --retries=5 \
- CMD ["/bin/bash", "-c", "/opt/scripts/healthcheck.sh"]
-
-# Run startup-script
-ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/amd64/scripts/healthcheck.sh b/amd64/scripts/healthcheck.sh
deleted file mode 100644
index 072f9c0..0000000
--- a/amd64/scripts/healthcheck.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Script checks health of running container
-
-if [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "starting" ]
-then
- echo 'Health status: OK - Startup script is still running.'
- exit 0
-elif [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "maintenance" ]
-then
- echo 'Health status: OK - Container is running in maintenance mode.'
- exit 0
-elif [ "$(ps -fe|grep "[i]obroker.js-controller"|awk '{print $2}')" != "" ]
-then
- echo 'Health status: OK - Main process (js-controller) is running.'
- exit 0
-fi
-
-echo 'Health status: !!! NOT OK !!! - Something went wrong. Please see container logs for more details and/or try restarting the container.'
-exit 1
diff --git a/amd64/scripts/maintenance.sh b/amd64/scripts/maintenance.sh
deleted file mode 100644
index 4f77980..0000000
--- a/amd64/scripts/maintenance.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-if [ "$1" == "status" ]
-then
- if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ]
- then
- echo 'Maintenance mode is ON.'
- exit 0
- elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ]
- then
- echo 'Maintenance mode is OFF.'
- exit 0
- fi
-elif [ "$1" == "on" ]
-then
- echo 'You are going to stop ioBroker and activating maintenance mode for this container.'
- read -p 'Do you want to continue [yes/no]? ' A
- if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
- then
- 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.'
- exit 0
- else
- exit 0
- fi
-elif [ "$1" == "off" ]
-then
- echo 'You are going to deactivate maintenance mode for this container.'
- echo 'Depending of the restart policy of this container, this will stop/ restart your container immediately.'
- read -p 'Do you want to continue [yes/no]? ' A
- if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
- then
- echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
- echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
- pkill -u root
- exit 0
- else
- exit 0
- fi
-else
- echo 'Invalid command. Please try again.'
-fi
-
-exit 0
diff --git a/amd64/scripts/setup_avahi.sh b/amd64/scripts/setup_avahi.sh
deleted file mode 100644
index 4fd1ab1..0000000
--- a/amd64/scripts/setup_avahi.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-echo "Checking avahi-daemon installation state..."
-
-if [ -e /usr/sbin/avahi-daemon ] && [ -e /var/run/dbus ]
-then
- echo "Avahi is already installed..."
-else
- echo "Avahi-daemon is NOT installed. Going to install it now..."
- apt-get update > /opt/scripts/avahi_startup.log 2>&1
- apt-get install -y libavahi-compat-libdnssd-dev avahi-daemon >> /opt/scripts/avahi_startup.log 2>&1
- rm -rf /var/lib/apt/lists/* >> /opt/scripts/avahi_startup.log 2>&1
- echo "Configuring avahi-daemon..."
- sed -i '/^rlimit-nproc/s/^\(.*\)/#\1/g' /etc/avahi/avahi-daemon.conf
- echo "Configuring dbus..."
- mkdir /var/run/dbus/
-fi
-
-if [ -f /var/run/dbus/pid ];
-then
- rm -f /var/run/dbus/pid
-fi
-
-if [ -f /var/run/avahi-daemon//pid ];
-then
- rm -f /var/run/avahi-daemon//pid
-fi
-
-echo "Starting dbus..."
-dbus-daemon --system
-
-echo "Starting avahi-daemon..."
-/etc/init.d/avahi-daemon start
-
-exit 0
diff --git a/amd64/scripts/setup_packages.sh b/amd64/scripts/setup_packages.sh
deleted file mode 100644
index 449900f..0000000
--- a/amd64/scripts/setup_packages.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-apt-get -qq update
-
-packages=$(cat /opt/scripts/.packages)
-for i in $packages; do
- sudo apt-get -qq -y install $i
-done
-
-rm -rf /var/lib/apt/lists/*
-rm -f /opt/scripts/.packages
-
-exit 0
diff --git a/amd64/scripts/setup_zwave.sh b/amd64/scripts/setup_zwave.sh
deleted file mode 100644
index 11d8024..0000000
--- a/amd64/scripts/setup_zwave.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-echo "Checking openzwave installation state..."
-
-if [ -e /usr/local/lib64 ]
-then
- echo "Openzwave is already installed..."
-else
- echo "Openzwave is NOT installed. Going to install it now..."
- cd /opt
- curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.1007.tar.gz
- tar -xf openzwave-1.6.1007.tar.gz && rm openzwave-1.6.1007.tar.gz
- cd openzwave-1.6.1007 && make > /dev/null 2>&1 && make install > /dev/null 2>&1
- ldconfig /usr/local/lib64
- cd /opt/iobroker
- # echo "Openzwave is now installed..."
-fi
-
-exit 0
diff --git a/amd64/scripts/userscript_everystart_example.sh b/amd64/scripts/userscript_everystart_example.sh
deleted file mode 100644
index 9023677..0000000
--- a/amd64/scripts/userscript_everystart_example.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# This is an example script file.
-# To run the Script on every start of the container you have to rename it to userscript_everystart.sh.
-
-# You can add your advanced script code here!
-
-echo ' '
-echo "I'm your startscript userscript_everystart.sh. I will run on EVERY container startup."
-echo ' '
-
-
-exit 0
diff --git a/amd64/scripts/userscript_firststart_example.sh b/amd64/scripts/userscript_firststart_example.sh
deleted file mode 100644
index 4fef50d..0000000
--- a/amd64/scripts/userscript_firststart_example.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# This is an example script file.
-# To run the Script on the first start of a new container you have to rename it to userscript_firststart.sh.
-
-# You can add your advanced script code here!
-
-echo ' '
-echo "I'm your startscript userscript_firststart.sh. I will run only on the FIRST startup of the container."
-echo ' '
-
-exit 0
diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
deleted file mode 100644
index 3f8a35d..0000000
--- a/armv7hf/Dockerfile
+++ /dev/null
@@ -1,103 +0,0 @@
-FROM balenalib/armv7hf-debian:buster
-
-LABEL maintainer="Andre Germann" \
- url="https://buanet.de"
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Install prerequisites (as listed in iobroker installer.sh)
-RUN apt-get update && apt-get install -y \
- acl \
- apt-utils \
- build-essential \
- curl \
- git \
- gnupg2 \
- gosu \
- jq \
- libavahi-compat-libdnssd-dev \
- libcap2-bin \
- libpam0g-dev \
- libudev-dev \
- locales \
- pkg-config \
- procps \
- python \
- python-dev \
- sudo \
- udev \
- unzip \
- wget \
- && rm -rf /var/lib/apt/lists/*
-
-# Install node
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash \
- && apt-get update && apt-get install -y nodejs \
- && rm -rf /var/lib/apt/lists/*
-
-# Generating locales
-RUN sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
- && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
- && locale-gen
-
-# Create scripts directorys and copy scripts
-RUN mkdir -p /opt/scripts/ \
- && mkdir -p /opt/userscripts/ \
- && chmod 777 /opt/scripts/ \
- && chmod 777 /opt/userscripts/
-WORKDIR /opt/scripts/
-COPY scripts/iobroker_startup.sh iobroker_startup.sh
-COPY scripts/setup_avahi.sh setup_avahi.sh
-COPY scripts/setup_packages.sh setup_packages.sh
-COPY scripts/setup_zwave.sh setup_zwave.sh
-COPY scripts/healthcheck.sh healthcheck.sh
-COPY scripts/maintenance.sh maintenance.sh
-RUN chmod +x iobroker_startup.sh \
- && chmod +x setup_avahi.sh \
- && chmod +x setup_packages.sh \
- && chmod +x setup_zwave.sh \
- && chmod +x healthcheck.sh \
- && chmod +x maintenance.sh
-WORKDIR /opt/userscripts/
-COPY scripts/userscript_firststart_example.sh userscript_firststart_example.sh
-COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
-
-# Install ioBroker
-WORKDIR /
-RUN apt-get update \
- && curl -sL https://iobroker.net/install.sh | bash - \
- && mkdir -p /opt/scripts/.docker_config/ \
- && echo $(hostname) > /opt/scripts/.docker_config/.install_host \
- && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
- && echo $(hostname) > /opt/.firstrun \
- && rm -rf /var/lib/apt/lists/*
-
-# Install node-gyp
-WORKDIR /opt/iobroker/
-RUN npm install -g node-gyp
-
-# Backup initial ioBroker and userscript folder
-RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
- && tar -cf /opt/initial_userscripts.tar /opt/userscripts
-
-# Setting up iobroker-user (shell and home directory)
-RUN chsh -s /bin/bash iobroker \
- && usermod --home /opt/iobroker iobroker \
- && usermod -u 1000 iobroker \
- && groupmod -g 1000 iobroker
-
-# Setting up ENVs
-ENV DEBIAN_FRONTEND="teletype" \
- LANG="de_DE.UTF-8" \
- LANGUAGE="de_DE:de" \
- LC_ALL="de_DE.UTF-8" \
- SETGID=1000 \
- SETUID=1000 \
- TZ="Europe/Berlin"
-
-# Healthcheck
-HEALTHCHECK --interval=15s --timeout=5s --retries=5 \
- CMD ["/bin/bash", "-c", "/opt/scripts/healthcheck.sh"]
-
-# Run startup-script
-ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/armv7hf/scripts/healthcheck.sh b/armv7hf/scripts/healthcheck.sh
deleted file mode 100644
index 072f9c0..0000000
--- a/armv7hf/scripts/healthcheck.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Script checks health of running container
-
-if [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "starting" ]
-then
- echo 'Health status: OK - Startup script is still running.'
- exit 0
-elif [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "maintenance" ]
-then
- echo 'Health status: OK - Container is running in maintenance mode.'
- exit 0
-elif [ "$(ps -fe|grep "[i]obroker.js-controller"|awk '{print $2}')" != "" ]
-then
- echo 'Health status: OK - Main process (js-controller) is running.'
- exit 0
-fi
-
-echo 'Health status: !!! NOT OK !!! - Something went wrong. Please see container logs for more details and/or try restarting the container.'
-exit 1
diff --git a/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh
deleted file mode 100644
index e9fa617..0000000
--- a/armv7hf/scripts/iobroker_startup.sh
+++ /dev/null
@@ -1,506 +0,0 @@
-#!/bin/bash
-
-# Setting healthcheck status to "starting"
-echo "starting" > /opt/scripts/.docker_config/.healthcheck
-
-# Reading ENV
-adminport=$IOB_ADMINPORT
-avahi=$AVAHI
-multihost=$IOB_MULTIHOST
-objectsdbhost=$IOB_OBJECTSDB_HOST
-objectsdbport=$IOB_OBJECTSDB_PORT
-objectsdbtype=$IOB_OBJECTSDB_TYPE
-packages=$PACKAGES
-setgid=$SETGID
-setuid=$SETUID
-statesdbhost=$IOB_STATESDB_HOST
-statesdbport=$IOB_STATESDB_PORT
-statesdbtype=$IOB_STATESDB_TYPE
-usbdevices=$USBDEVICES
-zwave=$ZWAVE
-
-# Getting date and time for logging
-dati=`date '+%Y-%m-%d %H:%M:%S'`
-
-# Logging header
-echo ' '
-echo "$(printf -- '-%.0s' {1..60})"
-echo -n "$(printf -- '-%.0s' {1..15})" && echo -n " "$dati" " && echo "$(printf -- '-%.0s' {1..15})"
-echo "$(printf -- '-%.0s' {1..60})"
-echo ' '
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Welcome to your ioBroker-container! -----"
-echo "----- Startupscript is now running. -----"
-echo "----- Please be patient! -----"
-echo "$(printf -- '-%.0s' {1..60})"
-echo ' '
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Debugging information -----"
-echo "----- -----"
-echo "----- System -----"
-echo -n "----- " && echo -n "$(printf "%-10s %-23s" arch: $(uname -m))" && echo " -----"
-echo "----- -----"
-echo "----- Versions -----"
-echo -n "----- " && echo -n "$(printf "%-10s %-23s" image: $VERSION)" && echo " -----"
-echo -n "----- " && echo -n "$(printf "%-10s %-23s" node: $(node -v))" && echo " -----"
-echo -n "----- " && echo -n "$(printf "%-10s %-23s" npm: $(npm -v))" && echo " -----"
-echo "----- -----"
-echo "----- ENV -----"
-if [ "$adminport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_ADMINPORT: $adminport)" && echo " -----"; fi
-if [ "$avahi" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" AVAHI: $avahi)" && echo " -----"; fi
-if [ "$multihost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_MULTIHOST: $multihost)" && echo " -----"; fi
-if [ "$objectsdbhost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi
-if [ "$objectsdbport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi
-if [ "$objectsdbtype" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi
-if [ "$packages" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" PACKAGES: $packages)" && echo " -----"; fi
-if [ "$setgid" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETGID: $setgid)" && echo " -----"; fi
-if [ "$setuid" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETUID: $setuid)" && echo " -----"; fi
-if [ "$statesdbhost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_HOST: $statesdbhost)" && echo " -----"; fi
-if [ "$statesdbport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_PORT: $statesdbport)" && echo " -----"; fi
-if [ "$statesdbtype" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_TYPE: $statesdbtype)" && echo " -----"; fi
-if [ "$usbdevices" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $usbdevices)" && echo " -----"; fi
-if [ "$zwave" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" ZWAVE: $zwave)" && echo " -----"; fi
-echo "$(printf -- '-%.0s' {1..60})"
-echo ' '
-
-#####
-# STEP 1 - Preparing container
-#####
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Step 1 of 5: Preparing container -----"
-echo "$(printf -- '-%.0s' {1..60})"
-echo ' '
-
-# Installing additional packages and setting uid/gid
-if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ] || [ -f /opt/.firstrun ]
-then
- if [ "$packages" != "" ]
- then
- echo "Installing additional packages is set by ENV."
- echo "The following packages will be installed:" $packages"..."
- echo $packages > /opt/scripts/.packages
- bash /opt/scripts/setup_packages.sh
- echo "Done."
- echo ' '
- fi
- if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ]
- then
- echo "Different UID and/ or GID is set by ENV."
- echo "Changing UID to "$setuid" and GID to "$setgid"..."
- usermod -u $setuid iobroker
- groupmod -g $setgid iobroker
- echo "Done."
- echo ' '
- fi
- if [ -f /opt/.firstrun ]
- then
- echo "Registering maintenance script as command."
- echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
- echo "Done."
- echo ' '
- fi
-else
- echo "Nothing to do here."
- echo ' '
-fi
-
-# Change directory for next steps
-cd /opt/iobroker
-
-
-#####
-# Detecting ioBroker-Installation
-#####
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Step 2 of 5: Detecting ioBroker installation -----"
-echo "$(printf -- '-%.0s' {1..60})"
-echo ' '
-
-if [ `find /opt/iobroker -type f | wc -l` -lt 1 ]
-then
- echo "There is no data detected in /opt/iobroker. Restoring initial ioBroker installation..."
- tar -xf /opt/initial_iobroker.tar -C /
- echo "Done."
-elif [ -f /opt/iobroker/iobroker ]
-then
- echo "Existing installation of ioBroker detected in /opt/iobroker."
- rm -f /opt/scripts/.docker_config/.install_host
-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
- 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 readme.md on Github (https://github.com/buanet/ioBroker.docker)."
- exit 1
- else
- echo "IoBroker backup file detected in /opt/iobroker. Preparing restore..."
- mv /opt/iobroker/*.tar.gz /opt/
- tar -xf /opt/initial_iobroker.tar -C /
- mkdir /opt/iobroker/backups
- mv /opt/*.tar.gz /opt/iobroker/backups/
- chown -R $setuid:$setgid /opt/iobroker # fixes permission error during restore
- echo "Done."
- echo "Restoring ioBroker..."
- iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
- echo "Done."
- echo ' '
- echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
- echo "!!!!! IMPORTANT NOTE !!!!!"
- echo "!!!!! The sartup 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! !!!!!"
- echo "!!!!! You can view installation process by taking a look at ioBroker log. !!!!!"
- echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
- fi
-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/ volume and start over."
- exit 1
-fi
-echo ' '
-
-
-#####
-# Checking ioBroker-Installation
-#####
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Step 3 of 5: Checking ioBroker installation -----"
-echo "$(printf -- '-%.0s' {1..60})"
-echo ' '
-
-# (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts"
-echo "(Re)Setting folder 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 "Fixing \"sudo-bug\" by replacing sudo in iobroker 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
-echo "Done."
-echo ' '
-
-# Checking for first run of a new installation and renaming ioBroker
-if [ -f /opt/scripts/.docker_config/.install_host ]
-then
- echo "Looks like this is a new and empty installation of ioBroker."
- echo "Hostname needs to be updated to " $(hostname)"..."
- bash iobroker host $(cat /opt/scripts/.docker_config/.install_host)
- rm -f /opt/scripts/.docker_config/.install_host
- echo "Done."
- echo ' '
-elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
-then
- echo "Hostname in ioBroker does not match the hostname of this container."
- echo "Updating hostname to " $(hostname)"..."
- bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
- echo "Done."
- echo ' '
-fi
-
-
-#####
-# Setting up prerequisites for some ioBroker-adapters
-#####
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Step 4 of 5: Applying special settings -----"
-echo "$(printf -- '-%.0s' {1..60})"
-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 ' '
-
-
-# Checking ENV for Adminport
-if [ "$adminport" != "" ]
-then
- if [ "$adminport" != $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="port": )[^,]*') ]
- then
- echo "Adminport set by ENV does not match port configured in ioBroker installation."
- echo "Setting Adminport to \""$adminport"\"..."
- bash iobroker set admin.0 --port $adminport
- echo "Done."
- echo ' '
- fi
-fi
-
-
-# Checking ENV for AVAHI
-if [ "$avahi" != "" ]
-then
- if [ "$avahi" = "true" ]
- then
- echo "Avahi-daemon is activated by ENV."
- chmod 755 /opt/scripts/setup_avahi.sh
- bash /opt/scripts/setup_avahi.sh
- echo "Done."
- echo ' '
- fi
-fi
-
-
-# Checking ENV for Z-WAVE
-if [ "$zwave" != "" ]
-then
- if [ "$zwave" = "true" ]
- then
- echo "Z-Wave is activated by ENV."
- chmod 755 /opt/scripts/setup_zwave.sh
- bash /opt/scripts/setup_zwave.sh
- echo "Done."
- echo ' '
- fi
-fi
-
-
-# checking ENV for USBDEVICES
-if [ "$usbdevices" != "" ]
-then
- if [ "$usbdevices" != "none" ]
- then
- echo "Usb-device-support is activated by ENV."
- IFS=';' read -ra devicearray <<< "$usbdevices"
- for i in "${devicearray[@]}"
- do
- echo "Setting permissions for" $i"..."
- chown root:dialout $i
- chmod g+rw $i
- done
- echo "Done."
- echo ' '
- fi
-fi
-
-
-# Checking ENV for multihost setup
-# 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."
- 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
-
-
-# Checking ENVs for custom setup of objects db
-if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ]
-then
- 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 "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."
- 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 "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."
- 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 "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."
- fi
- echo ' '
-fi
-
-
-# Checking ENVs for custom setup of states db#
-if [ "$statesdbtype" != "" ] || [ "$statesdbhost" != "" ] || [ "$statesdbport" != "" ]
-then
- 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 "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."
- 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 "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."
- 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 "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."
- fi
- echo ' '
-fi
-
-
-# Checking for Userscripts in /opt/userscripts
-if [ `find /opt/userscripts -type f | wc -l` -lt 1 ]
-then
- echo "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 ]
-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
- bash /opt/userscripts/userscript_firststart.sh
- echo "Done."
- echo ' '
- fi
- if [ -f /opt/userscripts/userscript_everystart.sh ]
- then
- echo "Userscript for every start detected. Running userscript_everystart.sh..."
- chmod 755 /opt/userscripts/userscript_everystart.sh
- bash /opt/userscripts/userscript_everystart.sh
- echo "Done."
- echo ' '
- fi
-fi
-
-# Removing first run marker when exists
-if [ -f /opt/.firstrun ]
-then
-rm -f /opt/.firstrun
-fi
-
-#####
-# Starting ioBroker
-#####
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Step 5 of 5: ioBroker startup -----"
-echo "$(printf -- '-%.0s' {1..60})"
-echo ' '
-echo "Starting ioBroker..."
-echo ' '
-
-# Setting healthcheck status to "running"
-echo "running" > /opt/scripts/.docker_config/.healthcheck
-
-# Function for graceful shutdown by SIGTERM signal
-shut_down() {
- echo ' '
- echo "Recived termination signal (SIGTERM)."
- echo "Shutting down ioBroker..."
- pid=$(ps -ef | awk '/[j]s.controller/{print $2}')
- kill -SIGTERM "$pid"
- exit
-}
-
-# Trap to get signal for graceful shutdown
-trap 'shut_down' SIGTERM
-
-# IoBroker start
-gosu iobroker node node_modules/iobroker.js-controller/controller.js & wait
-
-# Fallback process for keeping container running when ioBroker is stopped for maintenance (e.g. js-controller update)
-tail -f /dev/null
diff --git a/armv7hf/scripts/maintenance.sh b/armv7hf/scripts/maintenance.sh
deleted file mode 100644
index 4f77980..0000000
--- a/armv7hf/scripts/maintenance.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-if [ "$1" == "status" ]
-then
- if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ]
- then
- echo 'Maintenance mode is ON.'
- exit 0
- elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ]
- then
- echo 'Maintenance mode is OFF.'
- exit 0
- fi
-elif [ "$1" == "on" ]
-then
- echo 'You are going to stop ioBroker and activating maintenance mode for this container.'
- read -p 'Do you want to continue [yes/no]? ' A
- if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
- then
- 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.'
- exit 0
- else
- exit 0
- fi
-elif [ "$1" == "off" ]
-then
- echo 'You are going to deactivate maintenance mode for this container.'
- echo 'Depending of the restart policy of this container, this will stop/ restart your container immediately.'
- read -p 'Do you want to continue [yes/no]? ' A
- if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
- then
- echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
- echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
- pkill -u root
- exit 0
- else
- exit 0
- fi
-else
- echo 'Invalid command. Please try again.'
-fi
-
-exit 0
diff --git a/armv7hf/scripts/setup_avahi.sh b/armv7hf/scripts/setup_avahi.sh
deleted file mode 100644
index 4fd1ab1..0000000
--- a/armv7hf/scripts/setup_avahi.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-echo "Checking avahi-daemon installation state..."
-
-if [ -e /usr/sbin/avahi-daemon ] && [ -e /var/run/dbus ]
-then
- echo "Avahi is already installed..."
-else
- echo "Avahi-daemon is NOT installed. Going to install it now..."
- apt-get update > /opt/scripts/avahi_startup.log 2>&1
- apt-get install -y libavahi-compat-libdnssd-dev avahi-daemon >> /opt/scripts/avahi_startup.log 2>&1
- rm -rf /var/lib/apt/lists/* >> /opt/scripts/avahi_startup.log 2>&1
- echo "Configuring avahi-daemon..."
- sed -i '/^rlimit-nproc/s/^\(.*\)/#\1/g' /etc/avahi/avahi-daemon.conf
- echo "Configuring dbus..."
- mkdir /var/run/dbus/
-fi
-
-if [ -f /var/run/dbus/pid ];
-then
- rm -f /var/run/dbus/pid
-fi
-
-if [ -f /var/run/avahi-daemon//pid ];
-then
- rm -f /var/run/avahi-daemon//pid
-fi
-
-echo "Starting dbus..."
-dbus-daemon --system
-
-echo "Starting avahi-daemon..."
-/etc/init.d/avahi-daemon start
-
-exit 0
diff --git a/armv7hf/scripts/setup_packages.sh b/armv7hf/scripts/setup_packages.sh
deleted file mode 100644
index 449900f..0000000
--- a/armv7hf/scripts/setup_packages.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-apt-get -qq update
-
-packages=$(cat /opt/scripts/.packages)
-for i in $packages; do
- sudo apt-get -qq -y install $i
-done
-
-rm -rf /var/lib/apt/lists/*
-rm -f /opt/scripts/.packages
-
-exit 0
diff --git a/armv7hf/scripts/setup_zwave.sh b/armv7hf/scripts/setup_zwave.sh
deleted file mode 100644
index 11d8024..0000000
--- a/armv7hf/scripts/setup_zwave.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-echo "Checking openzwave installation state..."
-
-if [ -e /usr/local/lib64 ]
-then
- echo "Openzwave is already installed..."
-else
- echo "Openzwave is NOT installed. Going to install it now..."
- cd /opt
- curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.1007.tar.gz
- tar -xf openzwave-1.6.1007.tar.gz && rm openzwave-1.6.1007.tar.gz
- cd openzwave-1.6.1007 && make > /dev/null 2>&1 && make install > /dev/null 2>&1
- ldconfig /usr/local/lib64
- cd /opt/iobroker
- # echo "Openzwave is now installed..."
-fi
-
-exit 0
diff --git a/armv7hf/scripts/userscript_everystart_example.sh b/armv7hf/scripts/userscript_everystart_example.sh
deleted file mode 100644
index 9023677..0000000
--- a/armv7hf/scripts/userscript_everystart_example.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# This is an example script file.
-# To run the Script on every start of the container you have to rename it to userscript_everystart.sh.
-
-# You can add your advanced script code here!
-
-echo ' '
-echo "I'm your startscript userscript_everystart.sh. I will run on EVERY container startup."
-echo ' '
-
-
-exit 0
diff --git a/armv7hf/scripts/userscript_firststart_example.sh b/armv7hf/scripts/userscript_firststart_example.sh
deleted file mode 100644
index 4fef50d..0000000
--- a/armv7hf/scripts/userscript_firststart_example.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# This is an example script file.
-# To run the Script on the first start of a new container you have to rename it to userscript_firststart.sh.
-
-# You can add your advanced script code here!
-
-echo ' '
-echo "I'm your startscript userscript_firststart.sh. I will run only on the FIRST startup of the container."
-echo ' '
-
-exit 0
diff --git a/debian/node12/Dockerfile b/debian/node12/Dockerfile
new file mode 100644
index 0000000..ddceb6e
--- /dev/null
+++ b/debian/node12/Dockerfile
@@ -0,0 +1,89 @@
+FROM debian:bullseye-slim
+
+LABEL org.opencontainers.image.title="Official ioBroker Docker Image" \
+ org.opencontainers.image.description="Officical Docker image for ioBroker smarthome software (https://www.iobroker.net)" \
+ org.opencontainers.image.documentation="https://github.com/buanet/ioBroker.docker#readme" \
+ org.opencontainers.image.authors="André Germann " \
+ org.opencontainers.image.url="https://github.com/buanet/ioBroker.docker" \
+ org.opencontainers.image.source="https://github.com/buanet/ioBroker.docker" \
+ org.opencontainers.image.base.name="docker.io/library/debian:bullseye-slim" \
+ org.opencontainers.image.version="${VERSION}" \
+ org.opencontainers.image.created="${DATI}"
+
+ENV DEBIAN_FRONTEND noninteractive
+
+# Install prerequisites (including node) and generating locales
+RUN apt-get update && apt-get install -y \
+ curl \
+ gosu \
+ jq \
+ locales \
+ procps \
+ sudo \
+ udev \
+ wget \
+ # Generating locales
+ && sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
+ && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
+ && locale-gen \
+ # Install node
+ && curl -sL https://deb.nodesource.com/setup_12.x | bash \
+ && apt-get update && apt-get install -y nodejs \
+ && rm -rf /var/lib/apt/lists/*
+
+# Create scripts directorys and copy scripts
+RUN mkdir -p /opt/scripts/ \
+ && mkdir -p /opt/userscripts/ \
+ && chmod 777 /opt/scripts/ \
+ && chmod 777 /opt/userscripts/
+WORKDIR /opt/scripts/
+COPY scripts/* ./
+RUN chmod +x *.sh
+WORKDIR /opt/userscripts/
+COPY userscripts/* ./
+RUN chmod +x *.sh
+
+# Install ioBroker
+WORKDIR /
+RUN apt-get update \
+ && curl -sL https://iobroker.net/install.sh | bash - \
+ && mkdir -p /opt/scripts/.docker_config/ \
+ && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
+ && echo "${VERSION}" > /opt/scripts/.docker_config/.thisisdocker \
+ && echo $(hostname) > /opt/.firstrun \
+ # Deleting UUID from build
+ && iobroker unsetup -y \
+ # Backup initial ioBroker and userscript folder
+ && tar -cf /opt/initial_iobroker.tar /opt/iobroker \
+ && tar -cf /opt/initial_userscripts.tar /opt/userscripts \
+ && rm -rf /var/lib/apt/lists/*
+
+# Setting up iobroker-user (shell, home dir and rights)
+RUN chsh -s /bin/bash iobroker \
+ && usermod --home /opt/iobroker iobroker \
+ && usermod -u 1000 iobroker \
+ && groupmod -g 1000 iobroker \
+ && chown root:iobroker /usr/sbin/gosu \
+ && chmod +s /usr/sbin/gosu
+
+# Setting up default ENVs
+ENV DEBIAN_FRONTEND="teletype" \
+ LANG="de_DE.UTF-8" \
+ LANGUAGE="de_DE:de" \
+ LC_ALL="de_DE.UTF-8" \
+ SETGID=1000 \
+ SETUID=1000 \
+ TZ="Europe/Berlin"
+
+# Expose default admin ui port
+EXPOSE 8081
+
+# Change work dir
+WORKDIR /opt/iobroker/
+
+# Healthcheck
+HEALTHCHECK --interval=15s --timeout=5s --retries=5 \
+ CMD ["/bin/bash", "-c", "/opt/scripts/healthcheck.sh"]
+
+# Run startup-script
+ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/debian/node14/Dockerfile b/debian/node14/Dockerfile
new file mode 100644
index 0000000..f565b39
--- /dev/null
+++ b/debian/node14/Dockerfile
@@ -0,0 +1,89 @@
+FROM debian:bullseye-slim
+
+LABEL org.opencontainers.image.title="Official ioBroker Docker Image" \
+ org.opencontainers.image.description="Officical Docker image for ioBroker smarthome software (https://www.iobroker.net)" \
+ org.opencontainers.image.documentation="https://github.com/buanet/ioBroker.docker#readme" \
+ org.opencontainers.image.authors="André Germann " \
+ org.opencontainers.image.url="https://github.com/buanet/ioBroker.docker" \
+ org.opencontainers.image.source="https://github.com/buanet/ioBroker.docker" \
+ org.opencontainers.image.base.name="docker.io/library/debian:bullseye-slim" \
+ org.opencontainers.image.version="${VERSION}" \
+ org.opencontainers.image.created="${DATI}"
+
+ENV DEBIAN_FRONTEND noninteractive
+
+# Install prerequisites (including node) and generating locales
+RUN apt-get update && apt-get install -y \
+ curl \
+ gosu \
+ jq \
+ locales \
+ procps \
+ sudo \
+ udev \
+ wget \
+ # Generating locales
+ && sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \
+ && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
+ && locale-gen \
+ # Install node
+ && curl -sL https://deb.nodesource.com/setup_14.x | bash \
+ && apt-get update && apt-get install -y nodejs \
+ && rm -rf /var/lib/apt/lists/*
+
+# Create scripts directorys and copy scripts
+RUN mkdir -p /opt/scripts/ \
+ && mkdir -p /opt/userscripts/ \
+ && chmod 777 /opt/scripts/ \
+ && chmod 777 /opt/userscripts/
+WORKDIR /opt/scripts/
+COPY scripts/* ./
+RUN chmod +x *.sh
+WORKDIR /opt/userscripts/
+COPY userscripts/* ./
+RUN chmod +x *.sh
+
+# Install ioBroker
+WORKDIR /
+RUN apt-get update \
+ && curl -sL https://iobroker.net/install.sh | bash - \
+ && mkdir -p /opt/scripts/.docker_config/ \
+ && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
+ && echo "${VERSION}" > /opt/scripts/.docker_config/.thisisdocker \
+ && echo $(hostname) > /opt/.firstrun \
+ # Deleting UUID from build
+ && iobroker unsetup -y \
+ # Backup initial ioBroker and userscript folder
+ && tar -cf /opt/initial_iobroker.tar /opt/iobroker \
+ && tar -cf /opt/initial_userscripts.tar /opt/userscripts \
+ && rm -rf /var/lib/apt/lists/*
+
+# Setting up iobroker-user (shell, home dir and rights)
+RUN chsh -s /bin/bash iobroker \
+ && usermod --home /opt/iobroker iobroker \
+ && usermod -u 1000 iobroker \
+ && groupmod -g 1000 iobroker \
+ && chown root:iobroker /usr/sbin/gosu \
+ && chmod +s /usr/sbin/gosu
+
+# Setting up default ENVs
+ENV DEBIAN_FRONTEND="teletype" \
+ LANG="de_DE.UTF-8" \
+ LANGUAGE="de_DE:de" \
+ LC_ALL="de_DE.UTF-8" \
+ SETGID=1000 \
+ SETUID=1000 \
+ TZ="Europe/Berlin"
+
+# Expose default admin ui port
+EXPOSE 8081
+
+# Change work dir
+WORKDIR /opt/iobroker/
+
+# Healthcheck
+HEALTHCHECK --interval=15s --timeout=5s --retries=5 \
+ CMD ["/bin/bash", "-c", "/opt/scripts/healthcheck.sh"]
+
+# Run startup-script
+ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"]
diff --git a/aarch64/scripts/healthcheck.sh b/debian/scripts/healthcheck.sh
similarity index 100%
rename from aarch64/scripts/healthcheck.sh
rename to debian/scripts/healthcheck.sh
diff --git a/amd64/scripts/iobroker_startup.sh b/debian/scripts/iobroker_startup.sh
similarity index 76%
rename from amd64/scripts/iobroker_startup.sh
rename to debian/scripts/iobroker_startup.sh
index e9fa617..643eeb8 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/debian/scripts/iobroker_startup.sh
@@ -24,62 +24,77 @@ dati=`date '+%Y-%m-%d %H:%M:%S'`
# Logging header
echo ' '
-echo "$(printf -- '-%.0s' {1..60})"
-echo -n "$(printf -- '-%.0s' {1..15})" && echo -n " "$dati" " && echo "$(printf -- '-%.0s' {1..15})"
-echo "$(printf -- '-%.0s' {1..60})"
+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 "$(printf -- '-%.0s' {1..60})"
-echo "----- Welcome to your ioBroker-container! -----"
-echo "----- Startupscript is now running. -----"
-echo "----- Please be patient! -----"
-echo "$(printf -- '-%.0s' {1..60})"
+echo "$(printf -- '-%.0s' {1..80})"
+echo "----- Welcome to your ioBroker-container! -----"
+echo "----- Startupscript is now running. -----"
+echo "----- Please be patient! -----"
+echo "$(printf -- '-%.0s' {1..80})"
echo ' '
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Debugging information -----"
-echo "----- -----"
-echo "----- System -----"
-echo -n "----- " && echo -n "$(printf "%-10s %-23s" arch: $(uname -m))" && echo " -----"
-echo "----- -----"
-echo "----- Versions -----"
-echo -n "----- " && echo -n "$(printf "%-10s %-23s" image: $VERSION)" && echo " -----"
-echo -n "----- " && echo -n "$(printf "%-10s %-23s" node: $(node -v))" && echo " -----"
-echo -n "----- " && echo -n "$(printf "%-10s %-23s" npm: $(npm -v))" && echo " -----"
-echo "----- -----"
-echo "----- ENV -----"
-if [ "$adminport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_ADMINPORT: $adminport)" && echo " -----"; fi
-if [ "$avahi" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" AVAHI: $avahi)" && echo " -----"; fi
-if [ "$multihost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_MULTIHOST: $multihost)" && echo " -----"; fi
-if [ "$objectsdbhost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi
-if [ "$objectsdbport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi
-if [ "$objectsdbtype" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi
-if [ "$packages" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" PACKAGES: $packages)" && echo " -----"; fi
-if [ "$setgid" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETGID: $setgid)" && echo " -----"; fi
-if [ "$setuid" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" SETUID: $setuid)" && echo " -----"; fi
-if [ "$statesdbhost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_HOST: $statesdbhost)" && echo " -----"; fi
-if [ "$statesdbport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_PORT: $statesdbport)" && echo " -----"; fi
-if [ "$statesdbtype" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" IOB_STATESDB_TYPE: $statesdbtype)" && echo " -----"; fi
-if [ "$usbdevices" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" USBDEVICES: $usbdevices)" && echo " -----"; fi
-if [ "$zwave" != "" ]; then echo -n "----- " && echo -n "$(printf "%-10s %-23s" ZWAVE: $zwave)" && echo " -----"; fi
-echo "$(printf -- '-%.0s' {1..60})"
+echo "$(printf -- '-%.0s' {1..80})"
+echo "----- Debugging information -----"
+echo "----- -----"
+echo "----- System -----"
+echo -n "----- " && echo -n "$(printf "%-20s %-28s" arch: $(uname -m))" && echo " -----"
+echo "----- -----"
+echo "----- Docker-Image -----"
+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 -----"
+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 [ "$objectsdbhost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-20s %-28s" IOB_OBJECTSDB_HOST: $objectsdbhost)" && echo " -----"; fi
+if [ "$objectsdbport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-20s %-28s" IOB_OBJECTSDB_PORT: $objectsdbport)" && echo " -----"; fi
+if [ "$objectsdbtype" != "" ]; then echo -n "----- " && echo -n "$(printf "%-20s %-28s" IOB_OBJECTSDB_TYPE: $objectsdbtype)" && echo " -----"; fi
+if [ "$packages" != "" ]; then echo -n "----- " && echo -n "$(printf "%-20s %-28s" PACKAGES: $packages)" && echo " -----"; fi
+if [ "$setgid" != "" ]; then echo -n "----- " && echo -n "$(printf "%-20s %-28s" SETGID: $setgid)" && echo " -----"; fi
+if [ "$setuid" != "" ]; then echo -n "----- " && echo -n "$(printf "%-20s %-28s" SETUID: $setuid)" && echo " -----"; fi
+if [ "$statesdbhost" != "" ]; then echo -n "----- " && echo -n "$(printf "%-20s %-28s" IOB_STATESDB_HOST: $statesdbhost)" && echo " -----"; fi
+if [ "$statesdbport" != "" ]; then echo -n "----- " && echo -n "$(printf "%-20s %-28s" IOB_STATESDB_PORT: $statesdbport)" && echo " -----"; fi
+if [ "$statesdbtype" != "" ]; then echo -n "----- " && echo -n "$(printf "%-20s %-28s" IOB_STATESDB_TYPE: $statesdbtype)" && 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 ' '
#####
# STEP 1 - Preparing container
#####
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Step 1 of 5: Preparing container -----"
-echo "$(printf -- '-%.0s' {1..60})"
+echo "$(printf -- '-%.0s' {1..80})"
+echo "----- Step 1 of 5: Preparing container -----"
+echo "$(printf -- '-%.0s' {1..80})"
echo ' '
-# Installing additional packages and setting uid/gid
+# Installing/updating additional packages, registering maintenance script and setting uid/gid
if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ] || [ -f /opt/.firstrun ]
then
+ if [ -f /opt/.firstrun ]
+ then
+ echo "Updating Linux packages on first run..."
+ bash /opt/scripts/setup_packages.sh -update
+ echo "Done."
+ echo ' '
+ echo "Registering maintenance script as command..."
+ echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
+ echo "alias maint=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
+ echo "Done."
+ echo ' '
+ fi
if [ "$packages" != "" ]
then
echo "Installing additional packages is set by ENV."
echo "The following packages will be installed:" $packages"..."
echo $packages > /opt/scripts/.packages
- bash /opt/scripts/setup_packages.sh
+ bash /opt/scripts/setup_packages.sh -install
echo "Done."
echo ' '
fi
@@ -92,13 +107,6 @@ then
echo "Done."
echo ' '
fi
- if [ -f /opt/.firstrun ]
- then
- echo "Registering maintenance script as command."
- echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
- echo "Done."
- echo ' '
- fi
else
echo "Nothing to do here."
echo ' '
@@ -109,22 +117,22 @@ cd /opt/iobroker
#####
-# Detecting ioBroker-Installation
+# STEP 2 - Detecting ioBroker-Installation
#####
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Step 2 of 5: Detecting ioBroker installation -----"
-echo "$(printf -- '-%.0s' {1..60})"
+echo "$(printf -- '-%.0s' {1..80})"
+echo "----- Step 2 of 5: Detecting ioBroker installation -----"
+echo "$(printf -- '-%.0s' {1..80})"
echo ' '
if [ `find /opt/iobroker -type f | wc -l` -lt 1 ]
then
- echo "There is no data detected in /opt/iobroker. Restoring initial ioBroker installation..."
+ echo "There is no data detected in /opt/iobroker."
+ echo "Restoring initial ioBroker installation..."
tar -xf /opt/initial_iobroker.tar -C /
echo "Done."
elif [ -f /opt/iobroker/iobroker ]
then
echo "Existing installation of ioBroker detected in /opt/iobroker."
- rm -f /opt/scripts/.docker_config/.install_host
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
if [ "$multihost" = "slave" ]
@@ -134,15 +142,17 @@ then
echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
exit 1
else
- echo "IoBroker backup file detected in /opt/iobroker. Preparing restore..."
+ echo "IoBroker backup file detected in /opt/iobroker."
+ echo "Preparing restore..."
mv /opt/iobroker/*.tar.gz /opt/
tar -xf /opt/initial_iobroker.tar -C /
mkdir /opt/iobroker/backups
mv /opt/*.tar.gz /opt/iobroker/backups/
- chown -R $setuid:$setgid /opt/iobroker # fixes permission error during restore
+ # fixing permission errors during restore
+ chown -R $setuid:$setgid /opt/iobroker
echo "Done."
echo "Restoring ioBroker..."
- iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
+ bash iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
echo "Done."
echo ' '
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@@ -156,18 +166,18 @@ then
fi
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/ volume and start over."
+ echo "Please check/ recreate mounted folder or volume and start over."
exit 1
fi
echo ' '
#####
-# Checking ioBroker-Installation
+# STEP 3 - Checking ioBroker-Installation
#####
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Step 3 of 5: Checking ioBroker installation -----"
-echo "$(printf -- '-%.0s' {1..60})"
+echo "$(printf -- '-%.0s' {1..80})"
+echo "----- Step 3 of 5: Checking ioBroker installation -----"
+echo "$(printf -- '-%.0s' {1..80})"
echo ' '
# (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts"
@@ -185,16 +195,8 @@ echo "Fixing \"sudo-bug\" by replacing sudo in iobroker with gosu..."
echo "Done."
echo ' '
-# Checking for first run of a new installation and renaming ioBroker
-if [ -f /opt/scripts/.docker_config/.install_host ]
-then
- echo "Looks like this is a new and empty installation of ioBroker."
- echo "Hostname needs to be updated to " $(hostname)"..."
- bash iobroker host $(cat /opt/scripts/.docker_config/.install_host)
- rm -f /opt/scripts/.docker_config/.install_host
- echo "Done."
- echo ' '
-elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
+# checking hostname in ioBroker to match container hostname
+if [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
then
echo "Hostname in ioBroker does not match the hostname of this container."
echo "Updating hostname to " $(hostname)"..."
@@ -205,11 +207,11 @@ fi
#####
-# Setting up prerequisites for some ioBroker-adapters
+# STEP 4 - Setting up prerequisites for some ioBroker-adapters
#####
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Step 4 of 5: Applying special settings -----"
-echo "$(printf -- '-%.0s' {1..60})"
+echo "$(printf -- '-%.0s' {1..80})"
+echo "----- Step 4 of 5: Applying special settings -----"
+echo "$(printf -- '-%.0s' {1..80})"
echo ' '
echo "Some adapters have special requirements/ settings which can be activated by the use of environment variables."
@@ -474,11 +476,11 @@ rm -f /opt/.firstrun
fi
#####
-# Starting ioBroker
+# STEP 5 - Starting ioBroker
#####
-echo "$(printf -- '-%.0s' {1..60})"
-echo "----- Step 5 of 5: ioBroker startup -----"
-echo "$(printf -- '-%.0s' {1..60})"
+echo "$(printf -- '-%.0s' {1..80})"
+echo "----- Step 5 of 5: ioBroker startup -----"
+echo "$(printf -- '-%.0s' {1..80})"
echo ' '
echo "Starting ioBroker..."
echo ' '
diff --git a/debian/scripts/maintenance.sh b/debian/scripts/maintenance.sh
new file mode 100644
index 0000000..a02a60a
--- /dev/null
+++ b/debian/scripts/maintenance.sh
@@ -0,0 +1,221 @@
+#!/bin/bash
+
+############################
+##### default settings #####
+############################
+
+autoconfirm=no # could be set to true by commandline option
+killbyname=no # could be set to true by commandline option / undocumented, only for use with backitup restore scripts
+
+####################################
+##### declaration of functions #####
+####################################
+
+# display help text
+display_help() {
+ echo "This script is build to manage your ioBroker container!"
+ echo ''
+ echo "Usage: maintenance [ COMMAND ] [ OPTION ]"
+ echo " maint [ COMMAND ] [ OPTION ]"
+ echo ''
+ echo "COMMANDS"
+ echo "------------------"
+ echo " status > gives the current state of maintenance mode"
+ echo " on > switches mantenance mode ON"
+ echo " off > switches mantenance mode OFF and shuts down/ restarts container"
+ echo " upgrade > will put container to maintenance mode and upgrade iobroker"
+ echo " help > shows this help"
+ echo ''
+ echo "OPTIONS"
+ echo "------------------"
+ echo " -y|--yes > confirms the used command without asking"
+ echo " -h|--help > shows this help"
+ echo ''
+ exit 0
+}
+
+# checking maintenance mode status
+check_status() {
+ if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ]
+ then
+ echo 'Maintenance mode is turned ON.'
+ elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ]
+ then
+ echo 'Maintenance mode is turned OFF.'
+ fi
+}
+
+# turn maintenance mode ON
+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 'Activating maintenance mode...'
+ echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
+ sleep 1
+ echo 'Done.'
+ echo 'Stopping ioBroker...'
+ pkill node
+ sleep 1
+ echo 'Done.'
+ exit 0
+ elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ] && [ "$autoconfirm" == "no" ] # maintenance mode OFF / autoconfirm = no
+ then
+ echo 'You are now going to stop ioBroker and activating maintenance mode for this container.'
+ read -p 'Do you want to continue [yes/no]? ' A
+ if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
+ then
+ 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.'
+ exit 0
+ else
+ exit 0
+ fi
+ elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ] && [ "$autoconfirm" == "yes" ] # maintenance mode OFF / autoconfirm = yes
+ then
+ echo 'You are now going to stop ioBroker and activating maintenance mode for this container.'
+ echo 'This command was already confirmed by -y or --yes option.'
+ 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.'
+ exit 0
+ else
+ echo 'Maintenance mode is already turned ON.'
+ fi
+}
+
+# turn maintenance mode OFF
+switch_off() {
+ if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ] && [ "$autoconfirm" == "no" ] # maintenance mode ON / autoconfirm = no
+ then
+ echo 'You are now going to deactivate maintenance mode for this container.'
+ echo 'Depending on the restart policy, your container will be stopped/ restarted immediately.'
+ read -p 'Do you want to continue [yes/no]? ' A
+ if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
+ then
+ echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
+ echo "stopping" > /opt/scripts/.docker_config/.healthcheck
+ pkill -u root
+ echo 'Done.'
+ exit 0
+ else
+ exit 0
+ fi
+ elif [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ] && [ "$autoconfirm" == "yes" ] # maintenance mode ON / autoconfirm = yes
+ then
+ echo 'You are now going to deactivate maintenance mode for this container.'
+ echo 'Depending on the restart policy, your container will be stopped/ restarted immediately.'
+ echo 'This command was already confirmed by -y or --yes option.'
+ echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
+ echo "stopping" > /opt/scripts/.docker_config/.healthcheck
+ pkill -u root
+ echo 'Done.'
+ exit 0
+ else
+ echo 'Maintenance mode is already turned OFF.'
+ fi
+}
+
+# upgrade js-controller
+upgrade() {
+ echo 'You are now going to upgrade your js-controller.'
+ echo 'As this will change data in /opt/iobroker, make sure you have a backup!'
+ echo 'During the upgrade process the container will automatically switch into maintenance mode and stop ioBroker.'
+ echo 'Depending of the restart policy, you container will be stoped/ restarted automatically after the upgrade.'
+ read -p 'Do you want to continue [yes/no]? ' A
+ if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
+ then
+ 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.'
+ echo 'Upgrading js-controller...'
+ iobroker update
+ iobroker upgrade self
+ sleep 1
+ echo 'Done.'
+ echo 'Container will be stopped/ restarted in 5 seconds...'
+ sleep 5
+ echo "stopping" > /opt/scripts/.docker_config/.healthcheck
+ pkill -u root
+ exit 0
+ else
+ exit 0
+ fi
+}
+
+########################################
+##### parsing commands and options #####
+########################################
+
+# reading all arguments and putting them in reverse
+reverse=
+for i in "$@"; do
+ reverse="$i $reverse"
+done
+
+# checking the arguments
+for i in $reverse; do
+ case $i in
+ help|-h|--help)
+ display_help # calling function to display help text
+ break
+ ;;
+ status)
+ check_status # calling function to check maintenance mode status
+ break
+ ;;
+ on)
+ switch_on # calling function to switch maintenance mode on
+ break
+ ;;
+ off)
+ switch_off # calling function to switch maintenance mode off
+ break
+ ;;
+ upgrade)
+ upgrade # calling function to upgrade js-controller
+ break
+ ;;
+ -y|--yes)
+ autoconfirm=yes # setting autoconfrm option to "yes"
+ shift
+ ;;
+ -kbn|--killbyname)
+ killbyname=yes # setting killbyname option to "yes"
+ shift
+ ;;
+ -a=*|--argument=*) # dummy exaple for parsing option with value
+ ARGUMENT="${i#*=}"
+ shift
+ ;;
+ --) # End of all options.
+ shift
+ break
+ ;;
+ -?*|?*)
+ echo 'WARN: Unknown parameter. Please try again or see help (-h|--help).'
+ break
+ ;;
+ *) # Default case: No more options, so break out of the loop.
+ break
+ ;;
+ esac
+done
+
+exit 0
\ No newline at end of file
diff --git a/aarch64/scripts/setup_avahi.sh b/debian/scripts/setup_avahi.sh
similarity index 100%
rename from aarch64/scripts/setup_avahi.sh
rename to debian/scripts/setup_avahi.sh
diff --git a/debian/scripts/setup_packages.sh b/debian/scripts/setup_packages.sh
new file mode 100644
index 0000000..d959a5b
--- /dev/null
+++ b/debian/scripts/setup_packages.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+if [ $1 == "-install" ]
+then
+ apt-get -qq update
+ packages=$(cat /opt/scripts/.packages)
+ for i in $packages; do
+ sudo apt-get -qq -y install $i
+ done
+elif [ $1 == "-update" ]
+then
+ apt-get -qq update
+ apt-get -qq -y upgrade
+else
+ echo "No paramerter found!"
+ exit 1
+fi
+
+rm -rf /var/lib/apt/lists/*
+rm -f /opt/scripts/.packages
+
+exit 0
diff --git a/aarch64/scripts/setup_zwave.sh b/debian/scripts/setup_zwave.sh
similarity index 100%
rename from aarch64/scripts/setup_zwave.sh
rename to debian/scripts/setup_zwave.sh
diff --git a/aarch64/scripts/userscript_everystart_example.sh b/debian/userscripts/userscript_everystart_example.sh
similarity index 100%
rename from aarch64/scripts/userscript_everystart_example.sh
rename to debian/userscripts/userscript_everystart_example.sh
diff --git a/aarch64/scripts/userscript_firststart_example.sh b/debian/userscripts/userscript_firststart_example.sh
similarity index 100%
rename from aarch64/scripts/userscript_firststart_example.sh
rename to debian/userscripts/userscript_firststart_example.sh
diff --git a/manifest.yml b/manifest.yml
index c8d851a..5c2a799 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -1,18 +1,18 @@
-image: buanet/iobroker:$DOCKERTAG
+image: buanet/iobroker:${DOCKERTAG}
manifests:
-
- image: buanet/iobroker:$VERSION-amd64
+ image: buanet/iobroker:${VERSION}-amd64
platform:
architecture: amd64
os: linux
-
- image: buanet/iobroker:$VERSION-aarch64
+ image: buanet/iobroker:${VERSION}-arm64v8
platform:
architecture: arm64
variant: v8
os: linux
-
- image: buanet/iobroker:$VERSION-armv7hf
+ image: buanet/iobroker:${VERSION}-arm32v7
platform:
architecture: arm
variant: v7
diff --git a/manifest_ghcr.yml b/manifest_ghcr.yml
new file mode 100644
index 0000000..3e3f8f9
--- /dev/null
+++ b/manifest_ghcr.yml
@@ -0,0 +1,19 @@
+image: ghcr.io/buanet/iobroker:${DOCKERTAG}
+manifests:
+ -
+ image: ghcr.io/buanet/iobroker:${VERSION}-amd64
+ platform:
+ architecture: amd64
+ os: linux
+ -
+ image: ghcr.io/buanet/iobroker:${VERSION}-arm64v8
+ platform:
+ architecture: arm64
+ variant: v8
+ os: linux
+ -
+ image: ghcr.io/buanet/iobroker:${VERSION}-arm32v7
+ platform:
+ architecture: arm
+ variant: v7
+ os: linux
diff --git a/manifest_iob.yml b/manifest_iob.yml
new file mode 100644
index 0000000..80ddb53
--- /dev/null
+++ b/manifest_iob.yml
@@ -0,0 +1,19 @@
+image: iobroker/iobroker:${DOCKERTAG}
+manifests:
+ -
+ image: iobroker/iobroker:${VERSION}-amd64
+ platform:
+ architecture: amd64
+ os: linux
+ -
+ image: iobroker/iobroker:${VERSION}-arm64v8
+ platform:
+ architecture: arm64
+ variant: v8
+ os: linux
+ -
+ image: iobroker/iobroker:${VERSION}-arm32v7
+ platform:
+ architecture: arm
+ variant: v7
+ os: linux
diff --git a/opt/maintenance-scripts/backup_iobroker_folder.sh b/opt/maintenance-scripts/backup_iobroker_folder.sh
deleted file mode 100644
index aae1bb0..0000000
--- a/opt/maintenance-scripts/backup_iobroker_folder.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-
-# Backupscript fuer ein Backup von ioBroker unter Docker auf einer Synology Disk Station (Sicherung des ioBroker-Verzeichnises).
-# Vorhaltezeit der letzten Backups: 90 Tage, ältere Backups werden automatisch geloescht.
-#
-# By Andre Germann
-# Version 1.1 (22.09.2017)
-#
-# ACHTUNG: Dieses Script muss vorher auf die Synology Disk Station kopiert und dann auch dort ausgefuehrt werden!
-# Fuer die geplante, regelmaessige Ausfuehrung bietet sich der Aufgabenplaner der Disk Station an.
-#
-# ACHTUNG: Dieses Script stoppt vor der Sicherung des Verzeichnises den ioBroker Container!
-# Zur Sicherheit wird empfohlen ioBroker vor dem Backup innerhalb des Containers zu stoppen.
-# Dieses kann zum Beispiel ueber den vorherigen Aufruf des Scripts iobroker_stop.sh aus ioBroker heraus erledigt werden.
-
-
-# Deklaration der Variablen. Pfade und Bezeichnungen muessen ggf. entsprechend angepasst werden.
-
-iobrokerPATH='/volume1/docker/iobroker_mount' # Pfad des gemounteten ioBroker-Verzeichnises (zu sicherndes Verzeichnis) auf der Synology Disk Station
-backupPATH='/volume1/docker/iobroker_backup/archiv' # Pfad zum Speichern des Backups
-iobrokerCONTAINERNAME='iobroker' # Name des ioBroker-Containers in Docker
-
-
-# Start Script - Ab hier muss nichts mehr geaendert werden!
-
-echo "#####################################################"
-echo "############## Backupscript gestartet. ##############"
-echo "#####################################################"
-
-
-### Backup ioBroker-Verzeichnis
-
-
-# ioBroker-Container stoppen
-
-echo ""
-echo "Der ioBroker-Container ($iobrokerCONTAINERNAME) in Docker wird gestoppt..."
-
-docker stop $iobrokerCONTAINERNAME > /dev/null
-
-echo "Container in Docker gestoppt."
-echo ""
-echo "######################################################"
-sleep 5
-
-
-# Backupdatei erstellen
-
-echo ""
-echo "Der Ordner $iobrokerPATH wird gesichert..."
-
-tar -C "$iobrokerPATH" -czf "$backupPATH/backup-$(date +%Y-%m-%d_%H-%M).tar.gz" .
-
-echo "Sicherung des Ordners erstellt."
-echo ""
-echo "######################################################"
-sleep 5
-
-
-# Alte Backups loeschen (Loescht per "rm" alle "*.tar.gz"-Dateien im Ordner, die aelter als 90 Tage sind)
-
-echo ""
-echo "Entfernen alter Backups aus dem Verzeichnis $backupPATH..."
-
-find -P "$backupPATH/" -maxdepth 1 -type f \( -name '*.tar.gz' \) -ctime +90 -exec rm {} \;
-
-echo "Alte Backups wurden entfernt."
-echo ""
-echo "######################################################"
-sleep 5
-
-
-# ioBroker-Container starten
-
-echo ""
-echo "Der ioBroker-Container ($iobrokerCONTAINERNAME) in Docker wird gestartet..."
-
-docker start $iobrokerCONTAINERNAME > /dev/null
-
-echo "Container in Docker gestartet."
-echo ""
-echo "################### Script Ende ######################"
-
-exit 0
diff --git a/src/README_docker_hub_buanet.md b/src/README_docker_hub_buanet.md
new file mode 100644
index 0000000..f62f20e
--- /dev/null
+++ b/src/README_docker_hub_buanet.md
@@ -0,0 +1,122 @@
+ 
+
+[](https://hub.docker.com/repository/docker/buanet/iobroker)
+[](https://hub.docker.com/repository/docker/buanet/iobroker)
+[](https://hub.docker.com/repository/docker/buanet/iobroker)
+[)](https://github.com/buanet/docker.watchdog/actions/workflows/docker_build_main_image.yml)
+[](https://github.com/buanet/ioBroker.docker/releases)
+[](https://github.com/buanet/ioBroker.docker/issues)
+[](https://github.com/buanet/ioBroker.docker)
+[](https://github.com/buanet/ioBroker.docker/blob/master/LICENSE.md)
+[](https://paypal.me/buanet)
+
+**Note:** New major versions (e.g. v4, v5, v6) of the image always come with a new major verson of node (preinstalled). To avoid issues when upgrading into a new major version the best practice recommendation is to migrate using backup and restore procedure. For more details please see "Best Practices" section on official [readme.md](https://github.com/buanet/ioBroker.docker#best-practices).
+
+# Quick reference
+
+* Maintained by: [buanet](https://github.com/buanet) and [ioBroker](https://github.com/ioBroker)
+* Where to get support: [ioBroker Forum](https://forum.iobroker.net/), [ioBroker Discord Channel](https://discord.gg/HwUCwsH)
+* Where to report issues: [Github Repository Issues](https://github.com/buanet/ioBroker.docker/issues)
+* Supported architectures: amd64, arm32v7, arm64v8
+* Changelog: [Github Repository Changelog](https://github.com/buanet/ioBroker.docker/blob/main/CHANGELOG.md)
+* Source code: [Github Repository](https://github.com/buanet/ioBroker.docker)
+* All other questions should be answered here: [Github Repository Readme](https://github.com/buanet/ioBroker.docker#readme) or [iobroker.net](https://www.iobroker.net/)
+
+# Supported tags
+
+* `v5.2.0`, `v5.2.0-amd64`, `v5.2.0-arm32v7`, `v5.2.0-arm64v8`, `latest-v5`, `latest`
+* `v5.2.0-node14`, `v5.2.0-node14-amd64`, `v5.2.0-node14-arm32v7`, `v5.2.0-node14-arm64v8`, `latest-v5-node14`, `latest-node14`
+* `v5.1.0`, `v5.2.0-amd64`, `v5.2.0-armv7hf`, `v5.2.0-aarch64`
+
+# What is ioBroker?
+
+IoBroker is a open source IoT platform written in JavaScript that easily connects smarthome componets from different manufactures. With the help of plugins (called: "adapters") ioBroker is able to communicate with a big variety of IoT hardware and services using different protocols and APIs.
+All data is stored in a central database that all adapters can access. With this it is very easy to build up logical connections, automation scripts and beautiful visualisations.
+For further details please check out [iobroker.net](https://www.iobroker.net).
+
+# How to use this image?
+
+## Running from command-line
+
+For taking a first look at iobroker on docker it would be enough to simply run the following basic docker run command:
+
+```
+docker run -p 8081:8081 --name iobroker -h iobroker iobroker/iobroker
+```
+
+## Running with docker-compose
+
+When using docker-compose define the iobroker service like this:
+
+```
+version: '2'
+
+services:
+ iobroker:
+ container_name: iobroker
+ image: iobroker/iobroker
+ hostname: iobroker
+ restart: always
+ ports:
+ - "8081:8081"
+```
+
+## Persistent data
+
+To make your ioBroker configuration persistent it is recommended to mount a volume or path to `/opt/iobroker`.
+
+On command-line add
+```
+-v iobrokerdata:/opt/iobroker
+```
+On docker-compose add
+```
+ volumes:
+ - iobrokerdata:/opt/iobroker
+```
+
+## Configuration via environment variables
+
+You could use environment variables to auto configure your ioBroker container on startup.
+
+### Configure ioBroker application:
+
+* `IOB_ADMINPORT`(optional, default: 8081) Sets ioBroker adminport on startup
+* `IOB_MULTIHOST`(optional) Sets ioBroker "master" or "slave" for multihost support (needs additional config for objectsdb and statesdb!)
+* `IOB_OBJECTSDB_HOST` (optional, default: 127.0.0.1) Sets host for ioBroker objects db
+* `IOB_OBJECTSDB_PORT` (optional, default: 9001) Sets port for ioBroker objects db
+* `IOB_OBJECTSDB_TYPE` (optional, default: file) Sets type of ioBroker objects db, cloud be "file" or "redis" ([not officially supported](https://github.com/ioBroker/ioBroker#databases)).
+* `IOB_STATESDB_HOST` (optional, default: 127.0.0.1) Sets host for ioBroker states db
+* `IOB_STATESDB_PORT` (optional, default: 9000) Sets port for ioBroker states db
+* `IOB_STATESDB_TYPE` (optional, default: file) Sets type of ioBroker states db, could be "file" or "redis"
+
+### Activate special features:
+
+* `AVAHI` (optional, default: false) Installs and activates avahi-daemon for supporting yahka-adapter, can be "true" or "false"
+* `ZWAVE` (optional, default: false) Installs openzwave to support zwave-adapter, can be "true" or "false"
+
+### Configure environment:
+
+* `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
+* `PACKAGES` (optional) Installs additional linux packages to your container, packages should be seperated by whitespace like this: "package1 package2 package3".
+* `SETGID` (optional, 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` (optional, 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
+* `TZ` (optional, default: Europe/Berlin) Specifys the timeszone
+* `USBDEVICES` (optional) Sets relevant permissions on mounted devices like "/dev/ttyACM0". For more than one device separate with ";".
+
+## Notes about Docker networks
+
+The examples above are dealing with the Docker default bridge network. In general there are [some reasons](https://docs.docker.com/network/bridge/#differences-between-user-defined-bridges-and-the-default-bridge) why it might be the better choice to use a user-defined bridge network.
+
+Using a Docker bridge network works fine for taking a first look and with most of the ioBroker adapters (if you dont forget to redirect the ports your adapers use).
+But some ioBroker adapters are using techniques like [Multicast](https://en.wikipedia.org/wiki/Multicast) or [Broadcast](https://en.wikipedia.org/wiki/Broadcasting_(networking)) for automatic detection of IoT devices
+In this case it may be useful to switch to [host](https://docs.docker.com/network/host/) or [MACVLAN](https://docs.docker.com/network/macvlan/) network.
+
+For more information about networking with Docker please refer to the [official Docker docs](https://docs.docker.com/network/).
+
+# Support the Project
+
+If you like what you see please leave us stars and likes on our repos and join our growing community.
+See you soon. :)
diff --git a/src/README_docker_hub_iobroker.md b/src/README_docker_hub_iobroker.md
new file mode 100644
index 0000000..70b7b78
--- /dev/null
+++ b/src/README_docker_hub_iobroker.md
@@ -0,0 +1,121 @@
+
+
+[](https://hub.docker.com/repository/docker/buanet/iobroker)
+[](https://hub.docker.com/repository/docker/buanet/iobroker)
+[](https://hub.docker.com/repository/docker/buanet/iobroker)
+[)](https://github.com/buanet/docker.watchdog/actions/workflows/docker_build_main_image.yml)
+[](https://github.com/buanet/ioBroker.docker/releases)
+[](https://github.com/buanet/ioBroker.docker/issues)
+[](https://github.com/buanet/ioBroker.docker)
+[](https://github.com/buanet/ioBroker.docker/blob/master/LICENSE.md)
+
+**Note:** New major versions (e.g. v4, v5, v6) of the image always come with a new major verson of node (preinstalled). To avoid issues when upgrading into a new major version the best practice recommendation is to migrate using backup and restore procedure. For more details please see "Best Practices" section on official [readme.md](https://github.com/buanet/ioBroker.docker#best-practices).
+
+# Quick reference
+
+* Maintained by: [buanet](https://github.com/buanet) and [ioBroker](https://github.com/ioBroker)
+* Where to get support: [ioBroker Forum](https://forum.iobroker.net/), [ioBroker Discord Channel](https://discord.gg/HwUCwsH)
+* Where to report issues: [Github Repository Issues](https://github.com/buanet/ioBroker.docker/issues)
+* Supported architectures: amd64, arm32v7, arm64v8
+* Changelog: [Github Repository Changelog](https://github.com/buanet/ioBroker.docker/blob/main/CHANGELOG.md)
+* Source code: [Github Repository](https://github.com/buanet/ioBroker.docker)
+* All other questions should be answered here: [Github Repository Readme](https://github.com/buanet/ioBroker.docker#readme) or [iobroker.net](https://www.iobroker.net/)
+
+# Supported tags
+
+* `v5.2.0`, `v5.2.0-amd64`, `v5.2.0-arm32v7`, `v5.2.0-arm64v8`, `latest-v5`, `latest`
+* `v5.2.0-node14`, `v5.2.0-node14-amd64`, `v5.2.0-node14-arm32v7`, `v5.2.0-node14-arm64v8`, `latest-v5-node14`, `latest-node14`
+* `v5.1.0`, `v5.2.0-amd64`, `v5.2.0-armv7hf`, `v5.2.0-aarch64`
+
+# What is ioBroker?
+
+IoBroker is a open source IoT platform written in JavaScript that easily connects smarthome componets from different manufactures. With the help of plugins (called: "adapters") ioBroker is able to communicate with a big variety of IoT hardware and services using different protocols and APIs.
+All data is stored in a central database that all adapters can access. With this it is very easy to build up logical connections, automation scripts and beautiful visualisations.
+For further details please check out [iobroker.net](https://www.iobroker.net).
+
+# How to use this image?
+
+## Running from command-line
+
+For taking a first look at iobroker on docker it would be enough to simply run the following basic docker run command:
+
+```
+docker run -p 8081:8081 --name iobroker -h iobroker iobroker/iobroker
+```
+
+## Running with docker-compose
+
+When using docker-compose define the iobroker service like this:
+
+```
+version: '2'
+
+services:
+ iobroker:
+ container_name: iobroker
+ image: iobroker/iobroker
+ hostname: iobroker
+ restart: always
+ ports:
+ - "8081:8081"
+```
+
+## Persistent data
+
+To make your ioBroker configuration persistent it is recommended to mount a volume or path to `/opt/iobroker`.
+
+On command-line add
+```
+-v iobrokerdata:/opt/iobroker
+```
+On docker-compose add
+```
+ volumes:
+ - iobrokerdata:/opt/iobroker
+```
+
+## Configuration via environment variables
+
+You could use environment variables to auto configure your ioBroker container on startup.
+
+### Configure ioBroker application:
+
+* `IOB_ADMINPORT`(optional, default: 8081) Sets ioBroker adminport on startup
+* `IOB_MULTIHOST`(optional) Sets ioBroker "master" or "slave" for multihost support (needs additional config for objectsdb and statesdb!)
+* `IOB_OBJECTSDB_HOST` (optional, default: 127.0.0.1) Sets host for ioBroker objects db
+* `IOB_OBJECTSDB_PORT` (optional, default: 9001) Sets port for ioBroker objects db
+* `IOB_OBJECTSDB_TYPE` (optional, default: file) Sets type of ioBroker objects db, cloud be "file" or "redis" ([not officially supported](https://github.com/ioBroker/ioBroker#databases)).
+* `IOB_STATESDB_HOST` (optional, default: 127.0.0.1) Sets host for ioBroker states db
+* `IOB_STATESDB_PORT` (optional, default: 9000) Sets port for ioBroker states db
+* `IOB_STATESDB_TYPE` (optional, default: file) Sets type of ioBroker states db, could be "file" or "redis"
+
+### Activate special features:
+
+* `AVAHI` (optional, default: false) Installs and activates avahi-daemon for supporting yahka-adapter, can be "true" or "false"
+* `AVAHI` (optional, default: false) Installs and activates avahi-daemon for supporting yahka-adapter, can be "true" or "false"
+
+### Configure environment:
+
+* `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
+* `PACKAGES` (optional) Installs additional linux packages to your container, packages should be seperated by whitespace like this: "package1 package2 package3".
+* `SETGID` (optional, 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` (optional, 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
+* `TZ` (optional, default: Europe/Berlin) Specifys the timeszone
+* `USBDEVICES` (optional) Sets relevant permissions on mounted devices like "/dev/ttyACM0". For more than one device separate with ";".
+
+## Notes about Docker networks
+
+The examples above are dealing with the Docker default bridge network. In general there are [some reasons](https://docs.docker.com/network/bridge/#differences-between-user-defined-bridges-and-the-default-bridge) why it might be the better choice to use a user-defined bridge network.
+
+Using a Docker bridge network works fine for taking a first look and with most of the ioBroker adapters (if you dont forget to redirect the ports your adapers use).
+But some ioBroker adapters are using techniques like [Multicast](https://en.wikipedia.org/wiki/Multicast) or [Broadcast](https://en.wikipedia.org/wiki/Broadcasting_(networking)) for automatic detection of IoT devices
+In this case it may be useful to switch to [host](https://docs.docker.com/network/host/) or [MACVLAN](https://docs.docker.com/network/macvlan/) network.
+
+For more information about networking with Docker please refer to the [official Docker docs](https://docs.docker.com/network/).
+
+# Support the Project
+
+If you like what you see please leave us stars and likes on our repos and join our growing community.
+See you soon. :)