Compare commits

..

27 Commits

Author SHA1 Message Date
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
13 changed files with 125 additions and 117 deletions

View File

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

View File

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

View File

@@ -1,25 +1,23 @@
# Github action to build Docker image from beta branch (tag: beta) # Github action to build Docker image from beta branch (tag: beta)
name: Build debian based image (beta-node16) name: Build buanet/iobroker:beta-node16
on: on:
pull_request: release:
branches:
- beta
types: types:
- closed - prereleased
schedule:
- cron: '42 3 * * 1'
workflow_dispatch:
jobs: jobs:
bulid-beta-node16-image: build-beta-node16-image:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: 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 uses: actions/checkout@v2.4.0
with: with:
repository: 'buanet/ioBroker.docker' repository: 'buanet/ioBroker.docker'
ref: 'beta' ref: ${{ env.RELEASE_TAG }}
- name: Get and write version and date - name: Get and write version and date
id: version id: version
@@ -53,13 +51,13 @@ jobs:
uses: docker/setup-buildx-action@v1.6.0 uses: docker/setup-buildx-action@v1.6.0
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@v1.10.0 uses: docker/login-action@v1.12.0
with: with:
username: ${{ secrets.DOCKER_USER }} username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }} password: ${{ secrets.DOCKER_PASS }}
- name: Login to GitHub Container Registry - name: Login to GitHub Container Registry
uses: docker/login-action@v1.10.0 uses: docker/login-action@v1.12.0
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ secrets.PACKAGES_USER }} username: ${{ secrets.PACKAGES_USER }}

View File

@@ -1,25 +1,23 @@
# Github action to build Docker image from beta branch (tag: beta) # Github action to build Docker image from beta branch (tag: beta)
name: Build debian based image (beta) name: Build buanet/iobroker:beta
on: on:
workflow_dispatch: release:
pull_request:
branches:
- beta
types: types:
- closed - prereleased
schedule:
- cron: '42 3 * * 1'
jobs: jobs:
bulid-beta-image: build-beta-image:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: 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 uses: actions/checkout@v2.4.0
with: with:
repository: 'buanet/ioBroker.docker' repository: 'buanet/ioBroker.docker'
ref: 'beta' ref: ${{ env.RELEASE_TAG }}
- name: Get and write version and date - name: Get and write version and date
id: version id: version
@@ -53,13 +51,13 @@ jobs:
uses: docker/setup-buildx-action@v1.6.0 uses: docker/setup-buildx-action@v1.6.0
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@v1.10.0 uses: docker/login-action@v1.12.0
with: with:
username: ${{ secrets.DOCKER_USER }} username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }} password: ${{ secrets.DOCKER_PASS }}
- name: Login to GitHub Container Registry - name: Login to GitHub Container Registry
uses: docker/login-action@v1.10.0 uses: docker/login-action@v1.12.0
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ secrets.PACKAGES_USER }} username: ${{ secrets.PACKAGES_USER }}

View File

@@ -1,21 +1,18 @@
# Github action to build Docker image from dev branch (tag: dev) # Github action to build Docker image from dev branch (tag: dev)
name: Build debian based image (dev-node16) name: Build buanet/iobroker:dev-node16
on: on:
workflow_dispatch: workflow_dispatch:
push:
branches:
- dev
jobs: jobs:
bulid-dev-node16-image: build-dev-node16-image:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repo (dev) - name: Checkout repo (dev)
uses: actions/checkout@v2.4.0 uses: actions/checkout@v2.4.0
with: with:
repository: 'buanet/ioBroker.docker' repository: 'buanet/ioBroker.docker'
ref: 'dev' ref: 'main'
- name: Get and write version and date - name: Get and write version and date
id: version id: version
@@ -49,13 +46,13 @@ jobs:
uses: docker/setup-buildx-action@v1.6.0 uses: docker/setup-buildx-action@v1.6.0
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@v1.10.0 uses: docker/login-action@v1.12.0
with: with:
username: ${{ secrets.DOCKER_USER }} username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }} password: ${{ secrets.DOCKER_PASS }}
- name: Login to GitHub Container Registry - name: Login to GitHub Container Registry
uses: docker/login-action@v1.10.0 uses: docker/login-action@v1.12.0
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ secrets.PACKAGES_USER }} username: ${{ secrets.PACKAGES_USER }}

View File

@@ -1,21 +1,18 @@
# Github action to build Docker image from dev branch (tag: dev) # Github action to build Docker image from dev branch (tag: dev)
name: Build debian based image (dev) name: Build buanet/iobroker:dev
on: on:
workflow_dispatch: workflow_dispatch:
push:
branches:
- dev
jobs: jobs:
bulid-dev-image: build-dev-image:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repo (dev) - name: Checkout repo (dev)
uses: actions/checkout@v2.4.0 uses: actions/checkout@v2.4.0
with: with:
repository: 'buanet/ioBroker.docker' repository: 'buanet/ioBroker.docker'
ref: 'dev' ref: 'main'
- name: Get and write version and date - name: Get and write version and date
id: version id: version
@@ -49,13 +46,13 @@ jobs:
uses: docker/setup-buildx-action@v1.6.0 uses: docker/setup-buildx-action@v1.6.0
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@v1.10.0 uses: docker/login-action@v1.12.0
with: with:
username: ${{ secrets.DOCKER_USER }} username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }} password: ${{ secrets.DOCKER_PASS }}
- name: Login to GitHub Container Registry - name: Login to GitHub Container Registry
uses: docker/login-action@v1.10.0 uses: docker/login-action@v1.12.0
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ secrets.PACKAGES_USER }} username: ${{ secrets.PACKAGES_USER }}

View File

@@ -1,23 +1,23 @@
# Github action to build Docker image from main branch for iobroker/iobroker (tag: latest) # Github action to build Docker image from main branch for iobroker/iobroker (tag: latest)
name: Build debian based image (latest) name: Build iobroker/iobroker:latest
on: on:
workflow_dispatch:
release: release:
types: types:
- published - released
schedule:
- cron: '42 3 * * 5'
jobs: jobs:
bulid-latest-image: build-latest-image:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repo (main) - name: Getting published release tag
run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v2.4.0 uses: actions/checkout@v2.4.0
with: with:
repository: 'buanet/ioBroker.docker' repository: 'buanet/ioBroker.docker'
ref: 'main' ref: ${{ env.RELEASE_TAG }}
- name: Get and write version and date - name: Get and write version and date
id: version id: version
@@ -51,7 +51,7 @@ jobs:
uses: docker/setup-buildx-action@v1.6.0 uses: docker/setup-buildx-action@v1.6.0
- name: Login to DockerHub (iobroker) - name: Login to DockerHub (iobroker)
uses: docker/login-action@v1.10.0 uses: docker/login-action@v1.12.0
with: with:
username: ${{ secrets.DOCKER_USER_IOB }} username: ${{ secrets.DOCKER_USER_IOB }}
password: ${{ secrets.DOCKER_PASS_IOB }} password: ${{ secrets.DOCKER_PASS_IOB }}

View File

@@ -1,23 +1,23 @@
# Github action to build Docker image from main branch (tag: latest) # Github action to build Docker image from main branch (tag: latest)
name: Build debian based image (latest) name: Build buanet/iobroker:latest
on: on:
workflow_dispatch:
release: release:
types: types:
- published - released
schedule:
- cron: '42 3 * * 5'
jobs: jobs:
bulid-latest-image: build-latest-image:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repo (main) - name: Getting published release tag
run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v2.4.0 uses: actions/checkout@v2.4.0
with: with:
repository: 'buanet/ioBroker.docker' repository: 'buanet/ioBroker.docker'
ref: 'main' ref: ${{ env.RELEASE_TAG }}
- name: Get and write version and date - name: Get and write version and date
id: version id: version
@@ -51,13 +51,13 @@ jobs:
uses: docker/setup-buildx-action@v1.6.0 uses: docker/setup-buildx-action@v1.6.0
- name: Login to DockerHub (buanet) - name: Login to DockerHub (buanet)
uses: docker/login-action@v1.10.0 uses: docker/login-action@v1.12.0
with: with:
username: ${{ secrets.DOCKER_USER }} username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }} password: ${{ secrets.DOCKER_PASS }}
- name: Login to GitHub Container Registry - name: Login to GitHub Container Registry
uses: docker/login-action@v1.10.0 uses: docker/login-action@v1.12.0
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ secrets.PACKAGES_USER }} username: ${{ secrets.PACKAGES_USER }}

View File

@@ -1,5 +1,10 @@
## Changelog ## Changelog
### v6.1.0-beta.1 (2021-12-23)
* some more corrections in maintenance script ([#232 @agross](https://github.com/buanet/ioBroker.docker/pull/232))
* added autoconfirm parameter to upgrade function in maintenance script ([#229 @thost96](https://github.com/buanet/ioBroker.docker/pull/229))
* added alias "m" for maintenance script
### v6.0.0 (2021-12-09) ### v6.0.0 (2021-12-09)
* moving docu/ restructuring readme * moving docu/ restructuring readme
* v6.0.0-beta1 (2021-10-07) * v6.0.0-beta1 (2021-10-07)
@@ -7,7 +12,7 @@
* adding beta-node16 tag for beta testing node16 * adding beta-node16 tag for beta testing node16
* updating documentation * updating documentation
* v5.3.0-beta1 (2021-10-07) * v5.3.0-beta1 (2021-10-07)
* adding check (installed) PACKAGES on startup (#201) * adding check (installed) PACKAGES on startup (fixes [#201](https://github.com/buanet/ioBroker.docker/issues/201))
* adding packages for discovery adapter * adding packages for discovery adapter
* adding packages for backitup adapter * adding packages for backitup adapter
* reorganizing Dockerfile * reorganizing Dockerfile
@@ -29,12 +34,12 @@
* adding labels in OCI standard format * adding labels in OCI standard format
* adding packages update on first start * adding packages update on first start
* adding file for docker detection by ioBroker adapters * 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) * removing couchdb option for states db (no longer supported)
* v5.2.0-beta1 (2021-05-04) * v5.2.0-beta1 (2021-05-04)
* added upgrade parameter to maintenance script * added upgrade parameter to maintenance script
* added expose for default admin ui port (#172) * added expose for default admin ui port (fixes [#172](https://github.com/buanet/ioBroker.docker/issues/172))
* added shortform for maintenance script * added short form for maintenance script
* v5.2.0-beta (2021-04-02) * v5.2.0-beta (2021-04-02)
* some renaming to optimize automated build * some renaming to optimize automated build
* changes in versioning * changes in versioning
@@ -43,7 +48,7 @@
### v5.1.0 (2020-11-05) ### v5.1.0 (2020-11-05)
* v5.0.2-beta (2020-07-28) * v5.0.2-beta (2020-07-28)
* added docker tag for majorversion latest * added docker tag for majorversion latest
* extend readme.md doku * extend readme.md docu
* added maintenance script * added maintenance script
* added container healthcheck * added container healthcheck
* fixed configuration procedure and logging for objects and states db setup * fixed configuration procedure and logging for objects and states db setup
@@ -84,7 +89,7 @@
### v4.1.0 (2020-01-17) ### v4.1.0 (2020-01-17)
* improved readme.md * improved readme.md
* v4.0.3-beta (2020-01-06) * 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" * small fixes according to "docker best practices"
* v4.0.2-beta (2019-12-10) * v4.0.2-beta (2019-12-10)
* ~~added env for activating redis~~ * ~~added env for activating redis~~
@@ -104,13 +109,13 @@
* v3.1.2-beta (2019-09-03) * v3.1.2-beta (2019-09-03)
* using node 10 instead of node 8 * using node 10 instead of node 8
* v3.1.1-beta (2019-09-02) * 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.1.0 (2019-08-21)
* v3.0.3-beta (2019-08-21) * v3.0.3-beta (2019-08-21)
* switching base image from "debian:latest" to "debian:stretch" * switching base image from "debian:latest" to "debian:stretch"
* v3.0.2-beta (2019-06-13) * 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 * changing output of ioBroker logging
* v3.0.1-beta (2019-05-18) * v3.0.1-beta (2019-05-18)
* ~~switching back to iobroker-daemon for startup~~ * ~~switching back to iobroker-daemon for startup~~

View File

@@ -86,6 +86,7 @@ then
echo "Registering maintenance script as command..." echo "Registering maintenance script as command..."
echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
echo "alias maint=\'/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 "Done."
echo ' ' echo ' '
fi fi

View File

@@ -17,20 +17,21 @@ display_help() {
echo '' echo ''
echo "Usage: maintenance [ COMMAND ] [ OPTION ]" echo "Usage: maintenance [ COMMAND ] [ OPTION ]"
echo " maint [ COMMAND ] [ OPTION ]" echo " maint [ COMMAND ] [ OPTION ]"
echo " m [ COMMAND ] [ OPTION ]"
echo '' echo ''
echo "COMMANDS" echo "COMMANDS"
echo "------------------" 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 " on > switches mantenance mode ON"
echo " off > switches mantenance mode OFF and shuts down/ restarts container" echo " off > switches mantenance mode OFF and shuts down or restarts container"
echo " upgrade > will put container to maintenance mode and upgrade iobroker" echo " upgrade > will put container to maintenance mode and upgrade ioBroker"
echo " help > shows this help" echo " help > shows this help"
echo '' echo ''
echo "OPTIONS" echo "OPTIONS"
echo "------------------" echo "------------------"
echo " -y|--yes > confirms the used command without asking" echo " -y|--yes > confirms the used command without asking"
echo " -h|--help > shows this help" echo " -h|--help > shows this help"
echo '' echo ''
exit 0 exit 0
} }
@@ -100,11 +101,11 @@ switch_off() {
if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ] && [ "$autoconfirm" == "no" ] # maintenance mode ON / autoconfirm = no if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ] && [ "$autoconfirm" == "no" ] # maintenance mode ON / autoconfirm = no
then then
echo 'You are now going to deactivate maintenance mode for this container.' 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 read -p 'Do you want to continue [yes/no]? ' A
if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ] if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
then 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 echo "stopping" > /opt/scripts/.docker_config/.healthcheck
pkill -u root pkill -u root
echo 'Done.' echo 'Done.'
@@ -115,9 +116,9 @@ switch_off() {
elif [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ] && [ "$autoconfirm" == "yes" ] # maintenance mode ON / autoconfirm = yes elif [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ] && [ "$autoconfirm" == "yes" ] # maintenance mode ON / autoconfirm = yes
then then
echo 'You are now going to deactivate maintenance mode for this container.' 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 '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 echo "stopping" > /opt/scripts/.docker_config/.healthcheck
pkill -u root pkill -u root
echo 'Done.' echo 'Done.'
@@ -132,31 +133,40 @@ upgrade() {
echo 'You are now going to upgrade your js-controller.' 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 '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 '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.' echo 'Depending of the restart policy, your container will be stopped or restarted automatically after the upgrade.'
read -p 'Do you want to continue [yes/no]? ' A
if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ] if [ "$autoconfirm" == "no" ]
then then
echo 'Activating maintenance mode...' read -p 'Do you want to continue [yes/no]? ' A
echo "maintenance" > /opt/scripts/.docker_config/.healthcheck if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
sleep 1 then
echo 'Done.' : # Continue.
echo 'Stopping ioBroker...' else
pkill -u iobroker exit 0
sleep 1 fi
echo 'Done.' elif [ "$autoconfirm" == "yes" ]
echo 'Upgrading js-controller...' then
iobroker update echo 'This command was already confirmed by -y or --yes option.'
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 fi
echo 'Activating maintenance mode...'
echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
sleep 1
echo 'Done.'
echo 'Stopping ioBroker...'
pkill -u iobroker
sleep 1
echo 'Done.'
echo 'Upgrading js-controller...'
iobroker update
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 +179,7 @@ for i in "$@"; do
reverse="$i $reverse" reverse="$i $reverse"
done done
# checking the arguments # checking the arguments
for i in $reverse; do for i in $reverse; do
case $i in case $i in
help|-h|--help) help|-h|--help)
@@ -218,4 +228,4 @@ for i in $reverse; do
esac esac
done 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/src/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 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/repository/docker/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/repository/docker/buanet/iobroker)<br> [![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) [![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) [![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> [![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) [![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) [![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). 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_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_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_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_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_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" * `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/src/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 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/repository/docker/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/repository/docker/buanet/iobroker)<br> [![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) [![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) [![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> [![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) [![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) [![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). 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_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_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_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_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_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" * `IOB_STATESDB_TYPE` (optional, default: file) Sets type of ioBroker states db, could be "file" or "redis"