Compare commits

...

66 Commits

Author SHA1 Message Date
buanet
aca230a7f4 prepare v6.1.0 2022-03-01 19:27:27 +01:00
André Germann
1bfcab7820 Merge pull request #244 from buanet/dependabot/github_actions/main/actions/github-script-6
Bump actions/github-script from 5 to 6
2022-03-01 15:58:23 +01:00
André Germann
cef8433132 Merge pull request #247 from buanet/dependabot/github_actions/main/docker/login-action-1.14.0
Bump docker/login-action from 1.12.0 to 1.14.0
2022-03-01 15:56:58 +01:00
dependabot[bot]
1242eb382f Bump docker/login-action from 1.12.0 to 1.14.0
Bumps [docker/login-action](https://github.com/docker/login-action) from 1.12.0 to 1.14.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v1.12.0...v1.14.0)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-28 09:23:50 +00:00
buanet
9eb70621ea new js-controller release 2022-02-25 23:45:46 +00:00
dependabot[bot]
7ed3224f50 Bump actions/github-script from 5 to 6
Bumps [actions/github-script](https://github.com/actions/github-script) from 5 to 6.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-14 09:21:51 +00:00
André Germann
a706d63e78 Update build-debian-image-beta-node16.yml 2022-02-11 21:03:20 +01:00
André Germann
23fea30955 Update build-debian-image-beta.yml 2022-02-11 21:02:48 +01:00
buanet
1ca34b5f73 Merge branch 'main' of https://github.com/buanet/ioBroker.docker 2022-02-11 15:02:59 +01:00
buanet
6c819aac1c prepare new beta 2022-02-11 15:02:53 +01:00
buanet
57c3fe2371 new js-controller release 2022-02-11 07:56:23 +00:00
André Germann
641be7cebe get stable js-controller version 2022-02-11 08:32:03 +01:00
André Germann
f00aff57a1 add logging 2022-02-11 08:01:42 +01:00
buanet
a5b0ab5b7a new js-controller release 2022-02-10 23:45:34 +00:00
buanet
f312524d71 new js-controller release 2022-02-09 23:45:55 +00:00
buanet
60b4b10965 new js-controller release 2022-02-08 23:45:42 +00:00
buanet
2effdf5fea new js-controller release 2022-02-06 23:45:46 +00:00
André Germann
543343359e Update testing-docker-image.yml 2022-02-06 22:09:23 +01:00
André Germann
98bd35cc52 Update testing-docker-image.yml 2022-02-06 22:00:17 +01:00
André Germann
bf5288071b Update testing-docker-image.yml 2022-02-06 21:57:05 +01:00
André Germann
118892975a Update testing-docker-image.yml 2022-02-06 21:55:46 +01:00
André Germann
833ec7515e Update testing-docker-image.yml 2022-02-06 21:51:26 +01:00
André Germann
87137450db Update testing-docker-image.yml 2022-02-06 21:48:52 +01:00
André Germann
1a92ab16dd Update testing-docker-image.yml 2022-02-06 21:42:56 +01:00
André Germann
898c58ce7e Create testing-docker-image.yml 2022-02-06 21:27:04 +01:00
buanet
9fd6c97559 new js-controller release 2022-02-05 23:57:27 +00:00
buanet
30cfacd55f update readme 2022-02-04 18:02:11 +01:00
buanet
634d5ffb63 ci renaming 2022-02-04 17:36:28 +01:00
André Germann
e41bc8af6c Merge pull request #239 from buanet/dependabot/github_actions/main/docker/build-push-action-2.9.0
Bump docker/build-push-action from 2.8.0 to 2.9.0
2022-02-04 16:52:26 +01:00
buanet
57c697587f startup script enhancements 2022-02-04 16:51:41 +01:00
buanet
c2707f3795 maintenance script fixes 2022-02-04 13:16:33 +01:00
dependabot[bot]
727d79fa2f Bump docker/build-push-action from 2.8.0 to 2.9.0
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2.8.0 to 2.9.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v2.8.0...v2.9.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-02 09:35:30 +00:00
buanet
15e87e08a0 fixing latest release detection 2022-01-25 17:00:18 +01:00
André Germann
5401fdf86c release tag check 2022-01-25 16:55:37 +01:00
André Germann
f888101d01 Merge pull request #238 from buanet/dependabot/github_actions/main/docker/build-push-action-2.8.0
Bump docker/build-push-action from 2.7.0 to 2.8.0
2022-01-25 08:48:31 +01:00
buanet
e286d168e1 renaming 2022-01-25 07:22:52 +01:00
buanet
2e5f8c9e22 new js-controller release 2022-01-24 23:02:12 +00:00
buanet
2b4509d468 ci testing 2022-01-25 00:01:16 +01:00
dependabot[bot]
b5235be806 Bump docker/build-push-action from 2.7.0 to 2.8.0
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v2.7.0...v2.8.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-19 09:29:10 +00:00
André Germann
d73948e8d4 Update CHANGELOG.md 2021-12-23 22:22:06 +01:00
buanet
1337535351 changes to ci 2021-12-23 20:55:08 +01:00
buanet
8843ee2f68 Merge branch 'beta' 2021-12-23 20:49:09 +01:00
André Germann
432364f63d Merge pull request #235 from buanet/dependabot/github_actions/main/docker/login-action-1.12.0
Bump docker/login-action from 1.10.0 to 1.12.0
2021-12-23 19:55:38 +01:00
buanet
139a3beedd changes to ci 2021-12-23 19:53:52 +01:00
dependabot[bot]
da3a998e04 Bump docker/login-action from 1.10.0 to 1.12.0
Bumps [docker/login-action](https://github.com/docker/login-action) from 1.10.0 to 1.12.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v1.10.0...v1.12.0)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-23 18:53:52 +00:00
André Germann
182c78d72c Merge pull request #234 from buanet/dev
Dev
2021-12-23 19:52:39 +01:00
André Germann
b6bb7ed5ea Merge branch 'beta' into dev 2021-12-23 19:51:29 +01:00
André Germann
a9d4f38bdb Update and rename build-debian-image-main.yml to build-debian-image-latest.yml 2021-12-23 18:55:00 +01:00
André Germann
06d6421c4b Merge pull request #232 from agross/patch-1
Fix typos in maintenance script
2021-12-23 18:06:10 +01:00
Alexander Groß
296ff3c612 Deduplicate upgrade code paths with or without --yes option 2021-12-23 17:40:15 +01:00
Alexander Groß
6ccf196ae2 Whitespace fixes 2021-12-23 17:40:15 +01:00
André Germann
e20f66ada6 Update CHANGELOG.md 2021-12-23 17:40:15 +01:00
André Germann
e72353b3fa Merge pull request #230 from buanet/dependabot/github_actions/dev/docker/login-action-1.12.0
Bump docker/login-action from 1.10.0 to 1.12.0
2021-12-23 17:22:45 +01:00
dependabot[bot]
c70f27151e Bump docker/login-action from 1.10.0 to 1.12.0
Bumps [docker/login-action](https://github.com/docker/login-action) from 1.10.0 to 1.12.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v1.10.0...v1.12.0)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-21 09:20:16 +00:00
André Germann
465a412bc2 fix typo 2021-12-20 23:21:56 +01:00
André Germann
93bcf7c8f7 Merge pull request #222 from Cattpot/patch-1
Update README_docker_hub_buanet.md
2021-12-20 23:20:02 +01:00
André Germann
c22873c7bf Update CHANGELOG.md 2021-12-20 23:15:50 +01:00
André Germann
814298a795 Merge pull request #229 from thost96/patch-1
added autoconfirm for upgrade
2021-12-20 22:50:25 +01:00
buanet
10624f62f8 fix typo 2021-12-20 22:46:10 +01:00
Thorsten Reichelt
d4a31e2629 added autoconfirm for upgrade
Added autoconfirm for upgrade to fix issue https://github.com/buanet/ioBroker.docker/issues/228
2021-12-20 19:02:54 +01:00
Cattpot
ebb3e831e7 Update README_docker_hub_buanet.md
fix typo
2021-12-14 18:33:38 +01:00
André Germann
f3861e8fb5 Update .VERSION 2021-12-14 17:59:03 +01:00
buanet
e7b859f22d testing 2021-12-14 17:44:12 +01:00
André Germann
f4d40df862 Merge pull request #219 from buanet/main
update beta
2021-12-09 23:00:19 +01:00
buanet
c4a34b4432 Merge branch 'dev' into beta 2021-11-23 22:31:12 +01:00
André Germann
5211ef7275 Merge pull request #203 from buanet/dev
v5.3.0-beta1
2021-10-07 16:56:38 +02:00
20 changed files with 369 additions and 249 deletions

View File

@@ -1 +1 @@
v6.0.0
v6.1.0

View File

@@ -5,4 +5,4 @@ updates:
directory: "/"
schedule:
interval: "daily"
target-branch: "dev"
target-branch: "main"

View File

@@ -0,0 +1 @@
4.0.15

View File

@@ -1,25 +1,23 @@
# Github action to build Docker image from beta branch (tag: beta)
name: Build debian based image (beta-node16)
name: Build debian beta-node16
on:
pull_request:
branches:
- beta
types:
- closed
schedule:
- cron: '42 3 * * 1'
release:
types: [prereleased]
workflow_dispatch:
jobs:
bulid-beta-node16-image:
build-beta-node16-image:
runs-on: ubuntu-latest
steps:
- name: Checkout repo (beta)
- name: Getting published prerelease tag
run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v2.4.0
with:
repository: 'buanet/ioBroker.docker'
ref: 'beta'
ref: ${{ env.RELEASE_TAG }}
- name: Get and write version and date
id: version
@@ -53,20 +51,20 @@ jobs:
uses: docker/setup-buildx-action@v1.6.0
- name: Login to DockerHub
uses: docker/login-action@v1.10.0
uses: docker/login-action@v1.14.0
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v1.10.0
uses: docker/login-action@v1.14.0
with:
registry: ghcr.io
username: ${{ secrets.PACKAGES_USER }}
password: ${{ secrets.PACKAGES_PASS }}
- name: Build Docker image (node16-amd64)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node16/Dockerfile
@@ -77,7 +75,7 @@ jobs:
ghcr.io/buanet/iobroker:${{ env.version }}-node16-amd64
- name: Build Docker image (node16-arm32v7)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node16/Dockerfile
@@ -88,7 +86,7 @@ jobs:
ghcr.io/buanet/iobroker:${{ env.version }}-node16-arm32v7
- name: Build Docker image (node16-arm64v8)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node16/Dockerfile
@@ -110,7 +108,7 @@ jobs:
./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_version-node16.yaml
- name: Delete untagged images from GitHub packages
uses: actions/github-script@v5
uses: actions/github-script@v6
with:
github-token: ${{ secrets.PACKAGES_PASS }}
script: |

View File

@@ -1,25 +1,23 @@
# Github action to build Docker image from beta branch (tag: beta)
name: Build debian based image (beta)
name: Build debian beta
on:
release:
types: [prereleased]
workflow_dispatch:
pull_request:
branches:
- beta
types:
- closed
schedule:
- cron: '42 3 * * 1'
jobs:
bulid-beta-image:
build-beta-image:
runs-on: ubuntu-latest
steps:
- name: Checkout repo (beta)
- name: Getting published prerelease tag
run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v2.4.0
with:
repository: 'buanet/ioBroker.docker'
ref: 'beta'
ref: ${{ env.RELEASE_TAG }}
- name: Get and write version and date
id: version
@@ -53,20 +51,20 @@ jobs:
uses: docker/setup-buildx-action@v1.6.0
- name: Login to DockerHub
uses: docker/login-action@v1.10.0
uses: docker/login-action@v1.14.0
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v1.10.0
uses: docker/login-action@v1.14.0
with:
registry: ghcr.io
username: ${{ secrets.PACKAGES_USER }}
password: ${{ secrets.PACKAGES_PASS }}
- name: Build Docker image (amd64)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node14/Dockerfile
@@ -77,7 +75,7 @@ jobs:
ghcr.io/buanet/iobroker:${{ env.version }}-amd64
- name: Build Docker image (arm32v7)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node14/Dockerfile
@@ -88,7 +86,7 @@ jobs:
ghcr.io/buanet/iobroker:${{ env.version }}-arm32v7
- name: Build Docker image (arm64v8)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node14/Dockerfile
@@ -110,7 +108,7 @@ jobs:
./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_version.yaml
- name: Delete untagged images from GitHub packages
uses: actions/github-script@v5
uses: actions/github-script@v6
with:
github-token: ${{ secrets.PACKAGES_PASS }}
script: |

View File

@@ -1,21 +1,18 @@
# Github action to build Docker image from dev branch (tag: dev)
name: Build debian based image (dev-node16)
name: Build debian dev-node16
on:
workflow_dispatch:
push:
branches:
- dev
jobs:
bulid-dev-node16-image:
build-dev-node16-image:
runs-on: ubuntu-latest
steps:
- name: Checkout repo (dev)
uses: actions/checkout@v2.4.0
with:
repository: 'buanet/ioBroker.docker'
ref: 'dev'
ref: 'main'
- name: Get and write version and date
id: version
@@ -49,20 +46,20 @@ jobs:
uses: docker/setup-buildx-action@v1.6.0
- name: Login to DockerHub
uses: docker/login-action@v1.10.0
uses: docker/login-action@v1.14.0
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v1.10.0
uses: docker/login-action@v1.14.0
with:
registry: ghcr.io
username: ${{ secrets.PACKAGES_USER }}
password: ${{ secrets.PACKAGES_PASS }}
- name: Build Docker image (node16-amd64)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node16/Dockerfile
@@ -73,7 +70,7 @@ jobs:
ghcr.io/buanet/iobroker:dev-node16-amd64
- name: Build Docker image (node16-arm32v7)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node16/Dockerfile
@@ -84,7 +81,7 @@ jobs:
ghcr.io/buanet/iobroker:dev-node16-arm32v7
- name: Build Docker image (node16-arm64v8)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node16/Dockerfile
@@ -102,7 +99,7 @@ jobs:
./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_dev-node16.yaml
- name: Delete untagged images from GitHub packages
uses: actions/github-script@v5
uses: actions/github-script@v6
with:
github-token: ${{ secrets.PACKAGES_PASS }}
script: |

View File

@@ -1,21 +1,18 @@
# Github action to build Docker image from dev branch (tag: dev)
name: Build debian based image (dev)
name: Build debian dev
on:
workflow_dispatch:
push:
branches:
- dev
jobs:
bulid-dev-image:
build-dev-image:
runs-on: ubuntu-latest
steps:
- name: Checkout repo (dev)
uses: actions/checkout@v2.4.0
with:
repository: 'buanet/ioBroker.docker'
ref: 'dev'
ref: 'main'
- name: Get and write version and date
id: version
@@ -49,20 +46,20 @@ jobs:
uses: docker/setup-buildx-action@v1.6.0
- name: Login to DockerHub
uses: docker/login-action@v1.10.0
uses: docker/login-action@v1.14.0
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v1.10.0
uses: docker/login-action@v1.14.0
with:
registry: ghcr.io
username: ${{ secrets.PACKAGES_USER }}
password: ${{ secrets.PACKAGES_PASS }}
- name: Build Docker image (amd64)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node14/Dockerfile
@@ -73,7 +70,7 @@ jobs:
ghcr.io/buanet/iobroker:dev-amd64
- name: Build Docker image (arm32v7)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node14/Dockerfile
@@ -84,7 +81,7 @@ jobs:
ghcr.io/buanet/iobroker:dev-arm32v7
- name: Build Docker image (arm64v8)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node14/Dockerfile
@@ -102,7 +99,7 @@ jobs:
./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_dev.yaml
- name: Delete untagged images from GitHub packages
uses: actions/github-script@v5
uses: actions/github-script@v6
with:
github-token: ${{ secrets.PACKAGES_PASS }}
script: |

View File

@@ -1,25 +1,29 @@
# Github action to build Docker image from main branch for iobroker/iobroker (tag: latest)
name: Build debian based image (latest)
name: Build debian latest (iobroker)
on:
workflow_dispatch:
release:
types:
- published
schedule:
- cron: '42 3 * * 5'
- released
workflow_dispatch:
jobs:
bulid-latest-image:
build-latest-image:
runs-on: ubuntu-latest
steps:
- name: Checkout repo (main)
- name: Fetching latest release tag
run: |
LATESTRELEASE="$(curl -sL https://api.github.com/repos/buanet/ioBroker.docker/releases/latest | jq -r '.tag_name')"
echo "Latest release tag : $LATESTRELEASE"
echo "RELEASE_TAG=$LATESTRELEASE" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v2.4.0
with:
repository: 'buanet/ioBroker.docker'
ref: 'main'
ref: ${{ env.RELEASE_TAG }}
- name: Get and write version and date
- name: Fetching and adding version tag and date
id: version
run: |
VERSION="$(cat .VERSION)"
@@ -51,13 +55,13 @@ jobs:
uses: docker/setup-buildx-action@v1.6.0
- name: Login to DockerHub (iobroker)
uses: docker/login-action@v1.10.0
uses: docker/login-action@v1.14.0
with:
username: ${{ secrets.DOCKER_USER_IOB }}
password: ${{ secrets.DOCKER_PASS_IOB }}
- name: Build Docker image (amd64)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node14/Dockerfile
@@ -67,7 +71,7 @@ jobs:
iobroker/iobroker:${{ env.version }}-amd64,
- name: Build Docker image (arm32v7)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node14/Dockerfile
@@ -77,7 +81,7 @@ jobs:
iobroker/iobroker:${{ env.version }}-arm32v7,
- name: Build Docker image (arm64v8)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node14/Dockerfile

View File

@@ -1,25 +1,29 @@
# Github action to build Docker image from main branch (tag: latest)
name: Build debian based image (latest)
name: Build debian latest (buanet)
on:
workflow_dispatch:
release:
types:
- published
schedule:
- cron: '42 3 * * 5'
- released
workflow_dispatch:
jobs:
bulid-latest-image:
build-latest-image:
runs-on: ubuntu-latest
steps:
- name: Checkout repo (main)
- name: Fetching latest release tag
run: |
LATESTRELEASE="$(curl -sL https://api.github.com/repos/buanet/ioBroker.docker/releases/latest | jq -r '.tag_name')"
echo "Latest release tag : $LATESTRELEASE"
echo "RELEASE_TAG=$LATESTRELEASE" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v2.4.0
with:
repository: 'buanet/ioBroker.docker'
ref: 'main'
ref: ${{ env.RELEASE_TAG }}
- name: Get and write version and date
- name: Fetching and adding version tag and date
id: version
run: |
VERSION="$(cat .VERSION)"
@@ -51,20 +55,20 @@ jobs:
uses: docker/setup-buildx-action@v1.6.0
- name: Login to DockerHub (buanet)
uses: docker/login-action@v1.10.0
uses: docker/login-action@v1.14.0
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v1.10.0
uses: docker/login-action@v1.14.0
with:
registry: ghcr.io
username: ${{ secrets.PACKAGES_USER }}
password: ${{ secrets.PACKAGES_PASS }}
- name: Build Docker image (amd64)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node14/Dockerfile
@@ -75,7 +79,7 @@ jobs:
ghcr.io/buanet/iobroker:${{ env.version }}-amd64
- name: Build Docker image (arm32v7)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node14/Dockerfile
@@ -86,7 +90,7 @@ jobs:
ghcr.io/buanet/iobroker:${{ env.version }}-arm32v7
- name: Build Docker image (arm64v8)
uses: docker/build-push-action@v2.7.0
uses: docker/build-push-action@v2.9.0
with:
context: ./debian
file: ./debian/node14/Dockerfile
@@ -112,7 +116,7 @@ jobs:
./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_version.yaml
- name: Delete untagged images from GitHub packages
uses: actions/github-script@v5
uses: actions/github-script@v6
with:
github-token: ${{ secrets.PACKAGES_PASS }}
script: |

View File

@@ -0,0 +1,52 @@
name: Check js-controller release
on:
schedule:
- cron: '42 23 * * *'
workflow_dispatch:
jobs:
check-and-trigger:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v2.4.0
with:
repository: 'buanet/ioBroker.docker'
token: ${{ secrets.ACTIONS_PAT }}
- name: Fetch js-controller release version
run: |
curl -sL https://repo.iobroker.live/sources-dist.json | \
jq -r '."js-controller".version' > .github/dependencies/.js-controller-version
# curl -sL https://api.github.com/repos/ioBroker/ioBroker.js-controller/releases/latest | \
# jq -r ".tag_name" > .github/dependencies/.js-controller-version
echo "[LOG] Fetched js-controller version is $(cat .github/dependencies/.js-controller-version)"
- name: Check for modified files
id: git-check
run: echo ::set-output name=modified::$([ -z "`git status --porcelain`" ] && echo "false" || echo "true")
- name: Commit latest release version
if: steps.git-check.outputs.modified == 'true'
run: |
git config --global user.name 'buanet'
git config --global user.email 'info@buanet.de'
git commit -am "new js-controller release"
git push
- name: Trigger build debian latest (buanet)
if: steps.git-check.outputs.modified == 'true'
uses: benc-uk/workflow-dispatch@v1.1
with:
workflow: Build debian latest (buanet)
repo: buanet/ioBroker.docker
token: ${{ secrets.ACTIONS_PAT }}
- name: Trigger build debian latest (iobroker)
if: steps.git-check.outputs.modified == 'true'
uses: benc-uk/workflow-dispatch@v1.1
with:
workflow: Build debian latest (iobroker)
repo: buanet/ioBroker.docker
token: ${{ secrets.ACTIONS_PAT }}

View File

@@ -0,0 +1,33 @@
# Github action for testing the Docker image
name: Testing Docker image
on:
workflow_dispatch:
jobs:
test-docker-image:
runs-on: ubuntu-latest
steps:
- name: Testing with docker run
run: |
echo "[LOG] Starting ioBroker Container..."
docker run -d -p 8081:8081 --name iobroker -v iobrokerdata:/opt/iobroker buanet/iobroker:latest
echo "[LOG] Done."
echo ' '
echo "[LOG] Waiting for Startup Script..."
sleep 30
echo "[LOG] Done."
echo ' '
echo "[LOG] Writing Logs..."
docker logs iobroker >& testrun.log
echo "[LOG] Done."
echo ' '
echo "[LOG] Checking Web UI..."
curl --insecure http://127.0.0.1:8081 2> /dev/null | grep '<title>Admin</title>' &> /dev/null || exit 1
echo "[LOG] Done."
echo ' '
echo "[LOG] Output testrun.log:"
cat testrun.log
echo ' '
echo "[LOG] Test sucesssful."
echo ' '

View File

@@ -1,16 +1,28 @@
## Changelog
### v6.1.0 (2022-03-01)
* v6.1.0-beta.2 (2022-02-11)
* fix -kbn option in maintenance script
* optimize shutdown/ prevent warnings on upgrade
* remove hostname check for multihost slave
* optimize startup script logging
* add breaks and optimize maintenance script (fixes [#233](https://github.com/buanet/ioBroker.docker/issues/233))
* v6.1.0-beta.1 (2021-12-23)
* some more corrections in maintenance script ([#232 @agross](https://github.com/buanet/ioBroker.docker/pull/232))
* add auto confirm parameter to upgrade function in maintenance script ([#229 @thost96](https://github.com/buanet/ioBroker.docker/pull/229))
* add alias "m" for maintenance script
### v6.0.0 (2021-12-09)
* moving docu/ restructuring readme
* move docu/ restructuring readme
* v6.0.0-beta1 (2021-10-07)
* upgrading node version to recommended node14
* adding beta-node16 tag for beta testing node16
* updating documentation
* upgrade node version to recommended node14
* add beta-node16 tag for beta testing node16
* update documentation
* v5.3.0-beta1 (2021-10-07)
* adding check (installed) PACKAGES on startup (#201)
* adding packages for discovery adapter
* adding packages for backitup adapter
* reorganizing Dockerfile
* add check (installed) PACKAGES on startup (fixes [#201](https://github.com/buanet/ioBroker.docker/issues/201))
* add packages for discovery adapter
* add packages for backitup adapter
* reorganize Dockerfile
### v5.2.0 (2021-09-30)
* v5.2.0-beta4 (2021-09-10)
@@ -29,12 +41,12 @@
* 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
* adding best practice for states db migration 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
* added expose for default admin ui port (fixes [#172](https://github.com/buanet/ioBroker.docker/issues/172))
* added short form for maintenance script
* v5.2.0-beta (2021-04-02)
* some renaming to optimize automated build
* changes in versioning
@@ -43,7 +55,7 @@
### v5.1.0 (2020-11-05)
* v5.0.2-beta (2020-07-28)
* added docker tag for majorversion latest
* extend readme.md doku
* extend readme.md docu
* added maintenance script
* added container healthcheck
* fixed configuration procedure and logging for objects and states db setup
@@ -84,7 +96,7 @@
### v4.1.0 (2020-01-17)
* improved readme.md
* v4.0.3-beta (2020-01-06)
* added support to restore backup on startup
* added support to restore backup on startup ([#56 @duffbeer2000](https://github.com/buanet/ioBroker.docker/pull/56))
* small fixes according to "docker best practices"
* v4.0.2-beta (2019-12-10)
* ~~added env for activating redis~~
@@ -104,13 +116,13 @@
* v3.1.2-beta (2019-09-03)
* using node 10 instead of node 8
* v3.1.1-beta (2019-09-02)
* adding env for setting uid/ gid for iobroker-user
* adding env for setting uid/ gid for iobroker-user ([#33 @mplogas](https://github.com/buanet/ioBroker.docker/pull/33))
### v3.1.0 (2019-08-21)
* v3.0.3-beta (2019-08-21)
* switching base image from "debian:latest" to "debian:stretch"
* v3.0.2-beta (2019-06-13)
* using gosu instead of sudo
* using gosu instead of sudo ([#26 @SchumyHao](https://github.com/buanet/ioBroker.docker/pull/26))
* changing output of ioBroker logging
* v3.0.1-beta (2019-05-18)
* ~~switching back to iobroker-daemon for startup~~

View File

@@ -1,15 +1,20 @@
# Official Docker Image for ioBroker
<img src="https://github.com/buanet/ioBroker.docker/raw/main/src/img/iobroker_logo.png" width="600" title="ioBroker Logo">
<img src="https://github.com/buanet/ioBroker.docker/raw/main/docs/img/iobroker_logo.png" width="600" title="ioBroker Logo">
[![Release](https://img.shields.io/github/v/release/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/releases)
[![GitHub tag (latest SemVer pre-release)](https://img.shields.io/github/v/tag/buanet/ioBroker.docker?include_prereleases&label=pre-release)](https://github.com/buanet/ioBroker.docker/releases)
[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/buanet/ioBroker.docker/Build%20debian%20latest%20\(buanet\))](https://github.com/buanet/ioBroker.docker/actions/workflows/build-debian-image-latest.yml)
[![Github Issues](https://img.shields.io/github/issues/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/issues)
[![GitHub Discussions](https://img.shields.io/github/discussions/buanet/ioBroker.docker)](https://github.com/buanet/ioBroker.docker/discussions)<br>
[![Arch](https://img.shields.io/badge/arch-amd64%20%7C%20arm32v7%20%7C%20arm64v8-blue)](https://hub.docker.com/repository/docker/buanet/iobroker)
[![Docker Image Size (tag)](https://img.shields.io/docker/image-size/buanet/iobroker/latest?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker)
[![Docker Pulls](https://img.shields.io/docker/pulls/buanet/iobroker?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker)
[![Docker Stars](https://img.shields.io/docker/stars/buanet/iobroker?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker)<br>
[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/buanet/ioBroker.docker/Build%20debian%20based%20image%20\(latest\))](https://github.com/buanet/ioBroker.docker/actions/workflows/build-debian-image-main.yml)
[![Release](https://img.shields.io/github/v/release/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/releases)
[![Github Issues](https://img.shields.io/github/issues/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/issues)<br>
[![Source](https://img.shields.io/badge/source-github-blue?style=flat)](https://github.com/buanet/ioBroker.docker)
[![License](https://img.shields.io/github/license/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/blob/master/LICENSE.md)
[![Source](https://img.shields.io/badge/source-github-blue?style=flat)](https://github.com/buanet/ioBroker.docker)
[![GitHub forks](https://img.shields.io/github/forks/buanet/ioBroker.docker)](https://github.com/buanet/ioBroker.docker/network)
[![GitHub stars](https://img.shields.io/github/stars/buanet/ioBroker.docker)](https://github.com/buanet/ioBroker.docker/stargazers)
[![Donate](https://img.shields.io/badge/donate-paypal-blue?style=flat)](https://paypal.me/buanet)
The code provided in this repo is used to automatically generate the official Docker Image for ioBroker.
@@ -26,7 +31,7 @@ Looking for documentation? :arrow_right: [docs.buanet.de](https://docs.buanet.de
### How to run the image?
You can find some basic information about the image amd how to run it on the [Docker Hub page](https://hub.docker.com/r/buanet/iobroker) or [here](https://github.com/buanet/ioBroker.docker/blob/main/src/README_docker_hub_buanet.md).
You can find some basic information about the image amd how to run it on the [Docker Hub page](https://hub.docker.com/r/buanet/iobroker) or [here](https://github.com/buanet/ioBroker.docker/blob/main/docs/README_docker_hub_buanet.md).
### Is there a more detailed documentation?
@@ -61,7 +66,7 @@ If you want to get the newest features and changes feel free to use/ test the be
The easiest way to support this project is to leave me some likes/ stars on Github and Docker hub!<br>
If you want to give something back to the community, feel free to take a look into the [open issues](https://github.com/buanet/ioBroker.docker/issues) or the [ioBroker forum thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) and help me answering questions, fixing bugs or adding new features!<br>
If that doesn't work for you and you want to buy me a beer instead, you can do this here: <a href="https://www.paypal.me/buanet" target="_blank"><img src="https://github.com/buanet/ioBroker.docker/raw/main/src/img/pp_logo.png" height="15" width="15"></a><br>
If that doesn't work for you and you want to buy me a beer instead, you can do this here: <a href="https://www.paypal.me/buanet" target="_blank"><img src="https://github.com/buanet/ioBroker.docker/raw/main/docs/img/pp_logo.png" height="15" width="15"></a><br>
Thank you!
## :memo: Changelog

View File

@@ -39,6 +39,7 @@ echo "----- Debugging information
echo "----- -----"
echo "----- System -----"
echo -n "----- " && echo -n "$(printf "%-20s %-28s" arch: $(uname -m))" && echo " -----"
echo -n "----- " && echo -n "$(printf "%-20s %-28s" hostname: $(hostname))" && echo " -----"
echo "----- -----"
echo "----- Docker-Image -----"
echo -n "----- " && echo -n "$(printf "%-20s %-28s" image: ${VERSION})" && echo " -----"
@@ -86,6 +87,7 @@ then
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 "alias m=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
echo "Done."
echo ' '
fi
@@ -139,7 +141,7 @@ then
then
echo "IoBroker backup file detected in /opt/iobroker. But Multihost is set to \"slave\"."
echo "Restoring a backup is not supported on Multihost slaves. Please check configuration and start over."
echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
exit 1
else
echo "IoBroker backup file detected in /opt/iobroker."
@@ -196,7 +198,7 @@ echo "Done."
echo ' '
# checking hostname in ioBroker to match container hostname
if [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
if [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ] && [ "$multihost" != "slave" ]
then
echo "Hostname in ioBroker does not match the hostname of this container."
echo "Updating hostname to " $(hostname)"..."
@@ -215,7 +217,7 @@ echo "$(printf -- '-%.0s' {1..80})"
echo ' '
echo "Some adapters have special requirements/ settings which can be activated by the use of environment variables."
echo "For more information take a look at readme.md on Github!"
echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
echo ' '
@@ -281,161 +283,164 @@ fi
# Checking ENV for multihost setup
# Configuring objects db host
if [ "$multihost" = "master" ] && [ "$objectsdbtype" = "" ] && [ "$objectsdbhost" = "" ] && [ "$objectsdbport" = "" ]
if [ "$multihost" != "" ]
then
echo "Multihost is set as \"master\" by ENV and no external objects db is set."
echo "Setting host of objects db to \"0.0.0.0\" to allow external communication..."
jq --arg objectsdbhost "0.0.0.0" '.objects.host = $objectsdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
echo "Done."
echo "Checking Multihost Setup..."
echo ' '
# Configuring objects db host
if [ "$multihost" = "master" ] && [ "$objectsdbtype" = "" ] && [ "$objectsdbhost" = "" ] && [ "$objectsdbport" = "" ]
then
echo "Multihost is set as \"master\" by ENV and no external objects db is set."
echo "Setting host of objects db to \"0.0.0.0\" to allow external communication..."
jq --arg objectsdbhost "0.0.0.0" '.objects.host = $objectsdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
echo "Done."
elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ]
then
echo "Multihost is set as \"master\" by ENV. But objects db host is set to \"127.0.0.1\" by ENV too."
echo "This configuration will not allow slaves to connect the objects db! Please change or remove ENV \"IOB_OBJECTSDB_HOST\" and start over!"
echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
exit 1
elif [ "$multihost" = "master" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
then
echo "Multihost is set as \"master\" by ENV and external objects db is set."
elif ([ "$multihost" = "slave" ] && [ "$objectsdbtype" = "" ]) || ([ "$multihost" = "slave" ] && [ "$objectsdbhost" = "" ]) || ([ "$multihost" = "slave" ] && [ "$objectsdbport" = "" ])
then
echo "Multihost is set as \"slave\" by ENV. But no external objects db is set."
echo "You have to configure ENVs \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" to connect to a maser objects db."
echo "Please check your settings and start over."
echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
exit 1
elif [ "$multihost" = "slave" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
then
echo "Multihost is set as \"slave\" by ENV and external objects db is set."
elif [ "$multihost" != "" ]
then
echo "Multihost is set but it seems like some configuration is missing."
echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" correctly and start over."
echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
exit 1
fi
echo ' '
elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ]
then
echo "Multihost is set as \"master\" by ENV. But objects db host is set to \"127.0.0.1\" by ENV too."
echo "This configuration will not work! Please change or remove ENV \"IOB_OBJECTSDB_HOST\" and start over!"
echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
exit 1
elif [ "$multihost" = "master" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
then
echo "Multihost is set as \"master\" by ENV and external objects db is set."
echo "Skipping this step..."
echo "Done."
echo ' '
elif ([ "$multihost" = "slave" ] && [ "$objectsdbtype" = "" ]) || ([ "$multihost" = "slave" ] && [ "$objectsdbhost" = "" ]) || ([ "$multihost" = "slave" ] && [ "$objectsdbport" = "" ])
then
echo "Multihost is set as \"slave\" by ENV. But no external objects db is set."
echo "You have to configure ENVs \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" to connect to a maser objects db."
echo "Please check your settings and start over."
echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
exit 1
elif [ "$multihost" = "slave" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
then
echo "Multihost is set as \"slave\" by ENV and external objects db is set."
echo "Skipping this step..."
echo "Done."
echo ' '
elif [ "$multihost" != "" ]
then
echo "Multihost is set but it seems like some configuration is missing."
echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" correctly and start over."
echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
exit 1
fi
#Configuring states db host
if [ "$multihost" = "master" ] && [ "$statesdbtype" = "" ] && [ "$statesdbhost" = "" ] && [ "$statesdbport" = "" ]
then
echo "Multihost is set as \"master\" by ENV and no external states db is set."
echo "Setting host of states db to \"0.0.0.0\" to allow external communication..."
jq --arg statesdbhost "0.0.0.0" '.states.host = $statesdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
echo "Done."
echo ' '
elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ]
then
echo "Multihost is set as \"master\" by ENV. But states db host is set to \"127.0.0.1\" by ENV too."
echo "This configuration will not work! Please change or remove ENV \"IOB_STATESDB_HOST\" and start over!"
echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
exit 1
elif [ "$multihost" = "master" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
then
echo "Multihost is set as \"master\" by ENV and external states db is set."
echo "Skipping this step..."
echo "Done."
echo ' '
elif ([ "$multihost" = "slave" ] && [ "$statesdbtype" = "" ]) || ([ "$multihost" = "slave" ] && [ "$statesdbhost" = "" ]) || ([ "$multihost" = "slave" ] && [ "$statesdbport" = "" ])
then
echo "Multihost is set as \"slave\" by ENV. But no external states db is set."
echo "You have to configure ENVs \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESDB_PORT\" to connect to a maser states db."
echo "Please check your settings and start over."
echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
exit 1
elif [ "$multihost" = "slave" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
then
echo "Multihost is set as \"slave\" by ENV and external states db is set."
echo "Skipping this step..."
echo "Done."
echo ' '
elif [ "$multihost" != "" ]
then
echo "Multihost is set but it seems like some configuration is missing."
echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESTDB_PORT\" correctly and start over."
echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
exit 1
fi
#Configuring states db host
if [ "$multihost" = "master" ] && [ "$statesdbtype" = "" ] && [ "$statesdbhost" = "" ] && [ "$statesdbport" = "" ]
then
echo "Multihost is set as \"master\" by ENV and no external states db is set."
echo "Setting host of states db to \"0.0.0.0\" to allow external communication..."
jq --arg statesdbhost "0.0.0.0" '.states.host = $statesdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
echo "Done."
elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ]
then
echo "Multihost is set as \"master\" by ENV. But states db host is set to \"127.0.0.1\" by ENV too."
echo "This configuration will not work! Please change or remove ENV \"IOB_STATESDB_HOST\" and start over!"
echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
exit 1
elif [ "$multihost" = "master" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
then
echo "Multihost is set as \"master\" by ENV and external states db is set."
elif ([ "$multihost" = "slave" ] && [ "$statesdbtype" = "" ]) || ([ "$multihost" = "slave" ] && [ "$statesdbhost" = "" ]) || ([ "$multihost" = "slave" ] && [ "$statesdbport" = "" ])
then
echo "Multihost is set as \"slave\" by ENV. But no external states db is set."
echo "You have to configure ENVs \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESDB_PORT\" to connect to a maser states db."
echo "Please check your settings and start over."
echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
exit 1
elif [ "$multihost" = "slave" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
then
echo "Multihost is set as \"slave\" by ENV and external states db is set."
elif [ "$multihost" != "" ]
then
echo "Multihost is set but it seems like some configuration is missing."
echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESTDB_PORT\" correctly and start over."
echo "For more information see ioBroker Docker Image Docs (https://docs.buanet.de/iobroker-docker-image/docs/)."
exit 1
fi
echo ' '
echo "Done."
echo ' '
fi
# Checking ENVs for custom setup of objects db
if [ "$objectsdbtype" != "" ] || [ "$objectsdbhost" != "" ] || [ "$objectsdbport" != "" ]
then
echo "Checking custom settings for objects db..."
echo ' '
if [ "$objectsdbtype" != $(jq -r '.objects.type' /opt/iobroker/iobroker-data/iobroker.json) ]
then
echo "ENV IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation."
echo "IOB_OBJECTSDB_TYPE is set and value is different from detected ioBroker installation."
echo "Setting type of objects db to \""$objectsdbtype"\"..."
jq --arg objectsdbtype "$objectsdbtype" '.objects.type = $objectsdbtype' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
echo "Done."
else
echo "ENV IOB_OBJECTSDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here."
echo "IOB_OBJECTSDB_TYPE is set and value meets detected ioBroker installation."
fi
if [ "$objectsdbhost" != $(jq -r '.objects.host' /opt/iobroker/iobroker-data/iobroker.json) ]
then
echo "ENV IOB_OBJECTSDB_HOST is set and value is different from detected ioBroker installation."
echo "IOB_OBJECTSDB_HOST is set and value is different from detected ioBroker installation."
echo "Setting host of objects db to \""$objectsdbhost"\"..."
jq --arg objectsdbhost "$objectsdbhost" '.objects.host = $objectsdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
echo "Done."
else
echo "ENV IOB_OBJECTSDB_HOST is set and value meets detected ioBroker installation. Nothing to do here."
echo "IOB_OBJECTSDB_HOST is set and value meets detected ioBroker installation."
fi
if [ "$objectsdbport" != $(jq -r '.objects.port' /opt/iobroker/iobroker-data/iobroker.json) ]
then
echo "ENV IOB_OBJECTSDB_PORT is set and value is different from detected ioBroker installation."
echo "IOB_OBJECTSDB_PORT is set and value is different from detected ioBroker installation."
echo "Setting port of objects db to \""$objectsdbport"\"..."
jq --arg objectsdbport $objectsdbport '.objects.port = $objectsdbport' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
echo "Done."
else
echo "ENV IOB_OBJECTSDB_PORT is set and value meets detected ioBroker installation. Nothing to do here."
echo "IOB_OBJECTSDB_PORT is set and value meets detected ioBroker installation."
fi
echo ' '
echo "Done."
echo ' '
fi
# Checking ENVs for custom setup of states db#
if [ "$statesdbtype" != "" ] || [ "$statesdbhost" != "" ] || [ "$statesdbport" != "" ]
then
echo "Checking custom settings for states db..."
echo ' '
if [ "$statesdbtype" != $(jq -r '.states.type' /opt/iobroker/iobroker-data/iobroker.json) ]
then
echo "ENV IOB_STATESDB_TYPE is set and value is different from detected ioBroker installation."
echo "IOB_STATESDB_TYPE is set and value is different from detected ioBroker installation."
echo "Setting type of states db to \""$statesdbtype"\"..."
jq --arg statesdbtype "$statesdbtype" '.states.type = $statesdbtype' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
echo "Done."
else
echo "ENV IOB_STATESDB_TYPE is set and value meets detected ioBroker installation. Nothing to do here."
echo "IOB_STATESDB_TYPE is set and value meets detected ioBroker installation."
fi
if [ "$statesdbhost" != $(jq -r '.states.host' /opt/iobroker/iobroker-data/iobroker.json) ]
then
echo "ENV IOB_STATESDB_HOST is set and value is different from detected ioBroker installation."
echo "IOB_STATESDB_HOST is set and value is different from detected ioBroker installation."
echo "Setting host of states db to \""$statesdbhost"\"..."
jq --arg statesdbhost "$statesdbhost" '.states.host = $statesdbhost' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
echo "Done."
else
echo "ENV IOB_STATESDB_HOST is set and value meets detected ioBroker installation. Nothing to do here."
echo "IOB_STATESDB_HOST is set and value meets detected ioBroker installation."
fi
if [ "$statesdbport" != $(jq -r '.states.port' /opt/iobroker/iobroker-data/iobroker.json) ]
then
echo "ENV IOB_STATESDB_PORT is set and value is different from detected ioBroker installation."
echo "IOB_STATESDB_PORT is set and value is different from detected ioBroker installation."
echo "Setting port of states db to \""$statesdbport"\"..."
jq --arg statesdbport $statesdbport '.states.port = $statesdbport' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp && mv /opt/iobroker/iobroker-data/iobroker.json.tmp /opt/iobroker/iobroker-data/iobroker.json
chown -R $setuid:$setgid /opt/iobroker/iobroker-data/iobroker.json && chmod 674 /opt/iobroker/iobroker-data/iobroker.json
echo "Done."
else
echo "ENV IOB_STATESDB_PORT is set and value meets detected ioBroker installation. Nothing to do here."
echo "IOB_STATESDB_PORT is set and value meets detected ioBroker installation."
fi
echo ' '
echo "Done."
echo ' '
fi
@@ -493,8 +498,7 @@ shut_down() {
echo ' '
echo "Recived termination signal (SIGTERM)."
echo "Shutting down ioBroker..."
pid=$(ps -ef | awk '/[j]s.controller/{print $2}')
kill -SIGTERM "$pid"
pkill -SIGTERM -u iobroker -f iobroker.js-controller
exit
}

View File

@@ -17,20 +17,21 @@ display_help() {
echo ''
echo "Usage: maintenance [ COMMAND ] [ OPTION ]"
echo " maint [ COMMAND ] [ OPTION ]"
echo " m [ COMMAND ] [ OPTION ]"
echo ''
echo "COMMANDS"
echo "------------------"
echo " status > gives the current state of maintenance mode"
echo " status > reports 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 " off > switches mantenance mode OFF and shuts down or 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 ''
echo " -h|--help > shows this help"
echo ''
exit 0
}
@@ -49,13 +50,13 @@ check_status() {
switch_on() {
if [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ] && [ "$killbyname" == "yes" ] # maintenance mode OFF / killbyname = yes / undocumented, only for use with backitup restore scripts
then
echo 'This command will activate maintenance mode and stop all node processes.'
echo 'This command will activate maintenance mode and stop js-controller.'
echo 'Activating maintenance mode...'
echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
sleep 1
echo 'Done.'
echo 'Stopping ioBroker...'
pkill node
pkill -u iobroker -f iobroker.js-controller
sleep 1
echo 'Done.'
exit 0
@@ -100,11 +101,11 @@ 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.'
echo 'Depending on the restart policy, your container will be stopped or 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 'Deactivating maintenance mode and forcing container to stop or restart...'
echo "stopping" > /opt/scripts/.docker_config/.healthcheck
pkill -u root
echo 'Done.'
@@ -115,9 +116,9 @@ switch_off() {
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 'Depending on the restart policy, your container will be stopped or restarted immediately.'
echo 'This command was already confirmed by -y or --yes option.'
echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
echo 'Deactivating maintenance mode and forcing container to stop or restart...'
echo "stopping" > /opt/scripts/.docker_config/.healthcheck
pkill -u root
echo 'Done.'
@@ -132,31 +133,43 @@ 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" ]
echo 'Depending of the restart policy, your container will be stopped or restarted automatically after the upgrade.'
if [ "$autoconfirm" == "no" ]
then
read -p 'Do you want to continue [yes/no]? ' A
if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
then
: # Continue.
else
exit 0
fi
elif [ "$autoconfirm" == "yes" ]
then
echo 'This command was already confirmed by -y or --yes option.'
fi
if [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ]
then
echo 'Activating maintenance mode...'
echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
sleep 1
echo 'Done.'
echo '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
echo 'Done.'
fi
echo 'Upgrading js-controller...'
iobroker update
sleep 1
iobroker upgrade self
sleep 1
echo 'Done.'
echo 'Container will be stopped or restarted in 5 seconds...'
sleep 5
echo "stopping" > /opt/scripts/.docker_config/.healthcheck
pkill -u root
exit 0
}
########################################
@@ -169,7 +182,7 @@ for i in "$@"; do
reverse="$i $reverse"
done
# checking the arguments
# checking the arguments
for i in $reverse; do
case $i in
help|-h|--help)
@@ -218,4 +231,4 @@ for i in $reverse; do
esac
done
exit 0
exit 0

View File

@@ -1,8 +1,8 @@
<img src="https://github.com/buanet/ioBroker.docker/raw/main/src/img/iobroker_logo.png" width="600" title="ioBroker Logo">
<img src="https://github.com/buanet/ioBroker.docker/raw/main/docs/img/iobroker_logo.png" width="600" title="ioBroker Logo">
[![Docker Image Size (tag)](https://img.shields.io/docker/image-size/buanet/iobroker/latest?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker)
[![Docker Pulls](https://img.shields.io/docker/pulls/buanet/iobroker?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker)
[![Docker Stars](https://img.shields.io/docker/stars/buanet/iobroker?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker)<br>
[![Docker Image Size (tag)](https://img.shields.io/docker/image-size/buanet/iobroker/latest?style=flat)](https://hub.docker.com/r/buanet/iobroker)
[![Docker Pulls](https://img.shields.io/docker/pulls/buanet/iobroker?style=flat)](https://hub.docker.com/r/buanet/iobroker)
[![Docker Stars](https://img.shields.io/docker/stars/buanet/iobroker?style=flat)](https://hub.docker.com/r/buanet/iobroker)<br>
[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/buanet/ioBroker.docker/Build%20debian%20based%20image%20\(latest\))](https://github.com/buanet/ioBroker.docker/actions/workflows/build-debian-image-main.yml)
[![Release](https://img.shields.io/github/v/release/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/releases)
[![Github Issues](https://img.shields.io/github/issues/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/issues)<br>
@@ -10,7 +10,7 @@
[![License](https://img.shields.io/github/license/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/blob/master/LICENSE.md)
[![Donate](https://img.shields.io/badge/donate-paypal-blue?style=flat)](https://paypal.me/buanet)
# Important Note
# Important note
New major image versions (e.g. v4, v5, v6) always come with a new major version of node! This might lead to problems when you update your ioBroker container by simply recreating it from the new major version image! To avoid having trouble with recompiling adapters, it is recommended to upgrade your container manually with backup and restore procedure. For more details please see the maintenance part of the new [ioBroker Docker image docs](https://docs.buanet.de/iobroker-docker-image/docs/#maintenance).
@@ -93,7 +93,7 @@ You could use environment variables to auto configure your ioBroker container on
* `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_OBJECTSDB_TYPE` (optional, default: file) Sets type of ioBroker objects db, could 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"

View File

@@ -1,15 +1,17 @@
<img src="https://github.com/buanet/ioBroker.docker/raw/main/src/img/iobroker_logo.png" width="600" title="ioBroker Logo">
###### [iobroker/iobroker](https://hub.docker.com/r/iobroker/iobroker) is an alias for [buanet/iobroker](https://hub.docker.com/r/buanet/iobroker)
<img src="https://github.com/buanet/ioBroker.docker/raw/main/docs/img/iobroker_logo.png" width="600" title="ioBroker Logo">
[![Docker Image Size (tag)](https://img.shields.io/docker/image-size/buanet/iobroker/latest?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker)
[![Docker Pulls](https://img.shields.io/docker/pulls/buanet/iobroker?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker)
[![Docker Stars](https://img.shields.io/docker/stars/buanet/iobroker?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker)<br>
[![Docker Image Size (tag)](https://img.shields.io/docker/image-size/buanet/iobroker/latest?style=flat)](https://hub.docker.com/r/buanet/iobroker)
[![Docker Pulls](https://img.shields.io/docker/pulls/buanet/iobroker?style=flat)](https://hub.docker.com/r/buanet/iobroker)
[![Docker Stars](https://img.shields.io/docker/stars/buanet/iobroker?style=flat)](https://hub.docker.com/r/buanet/iobroker)<br>
[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/buanet/ioBroker.docker/Build%20debian%20based%20image%20\(latest\))](https://github.com/buanet/ioBroker.docker/actions/workflows/build-debian-image-main.yml)
[![Release](https://img.shields.io/github/v/release/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/releases)
[![Github Issues](https://img.shields.io/github/issues/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/issues)<br>
[![Source](https://img.shields.io/badge/source-github-blue?style=flat)](https://github.com/buanet/ioBroker.docker)
[![License](https://img.shields.io/github/license/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/blob/master/LICENSE.md)
# Important Note
# Important note
New major image versions (e.g. v4, v5, v6) always come with a new major version of node! This might lead to problems when you update your ioBroker container by simply recreating it from the new major version image! To avoid having trouble with recompiling adapters, it is recommended to upgrade your container manually with backup and restore procedure. For more details please see the maintenance part of the new [ioBroker Docker image docs](https://docs.buanet.de/iobroker-docker-image/docs/#maintenance).
@@ -92,7 +94,7 @@ You could use environment variables to auto configure your ioBroker container on
* `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_OBJECTSDB_TYPE` (optional, default: file) Sets type of ioBroker objects db, could 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"

View File

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 63 KiB

View File

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB