prepare new beta

This commit is contained in:
buanet
2022-02-11 15:02:53 +01:00
parent 30cfacd55f
commit 6c819aac1c
4 changed files with 18 additions and 17 deletions

View File

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

View File

@@ -1,25 +1,27 @@
## Changelog ## Changelog
### v6.1.0-beta.2 (upcoming) ### 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 * remove hostname check for multihost slave
* optimize startup script logging * optimize startup script logging
* adding breaks and optimizing maintenance script (fixes [#233](https://github.com/buanet/ioBroker.docker/issues/233)) * add breaks and optimize maintenance script (fixes [#233](https://github.com/buanet/ioBroker.docker/issues/233))
* v6.1.0-beta.1 (2021-12-23) * v6.1.0-beta.1 (2021-12-23)
* some more corrections in maintenance script ([#232 @agross](https://github.com/buanet/ioBroker.docker/pull/232)) * 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)) * add autoconfirm parameter to upgrade function in maintenance script ([#229 @thost96](https://github.com/buanet/ioBroker.docker/pull/229))
* added alias "m" for maintenance script * add alias "m" for maintenance script
### v6.0.0 (2021-12-09) ### v6.0.0 (2021-12-09)
* moving docu/ restructuring readme * move docu/ restructuring readme
* v6.0.0-beta1 (2021-10-07) * v6.0.0-beta1 (2021-10-07)
* upgrading node version to recommended node14 * upgrade node version to recommended node14
* adding beta-node16 tag for beta testing node16 * add beta-node16 tag for beta testing node16
* updating documentation * update documentation
* v5.3.0-beta1 (2021-10-07) * v5.3.0-beta1 (2021-10-07)
* adding check (installed) PACKAGES on startup (fixes [#201](https://github.com/buanet/ioBroker.docker/issues/201)) * add check (installed) PACKAGES on startup (fixes [#201](https://github.com/buanet/ioBroker.docker/issues/201))
* adding packages for discovery adapter * add packages for discovery adapter
* adding packages for backitup adapter * add packages for backitup adapter
* reorganizing Dockerfile * reorganize Dockerfile
### v5.2.0 (2021-09-30) ### v5.2.0 (2021-09-30)
* v5.2.0-beta4 (2021-09-10) * v5.2.0-beta4 (2021-09-10)

View File

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

View File

@@ -50,13 +50,13 @@ check_status() {
switch_on() { switch_on() {
if [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ] && [ "$killbyname" == "yes" ] # maintenance mode OFF / killbyname = yes / undocumented, only for use with backitup restore scripts if [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ] && [ "$killbyname" == "yes" ] # maintenance mode OFF / killbyname = yes / undocumented, only for use with backitup restore scripts
then 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 'Activating maintenance mode...'
echo "maintenance" > /opt/scripts/.docker_config/.healthcheck echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
sleep 1 sleep 1
echo 'Done.' echo 'Done.'
echo 'Stopping ioBroker...' echo 'Stopping ioBroker...'
pkill node pkill -u iobroker -f iobroker.js-controller
sleep 1 sleep 1
echo 'Done.' echo 'Done.'
exit 0 exit 0