diff --git a/.VERSION b/.VERSION index 9773998b..64214079 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -v6.0.0 +v6.1.0-beta.1 \ No newline at end of file diff --git a/.github/workflows/build-debian-image-beta-node16.yml b/.github/workflows/build-debian-image-beta-node16.yml index 6936c86e..1b4b6936 100644 --- a/.github/workflows/build-debian-image-beta-node16.yml +++ b/.github/workflows/build-debian-image-beta-node16.yml @@ -1,7 +1,8 @@ # Github action to build Docker image from beta branch (tag: beta) -name: Build debian based image (beta-node16) +name: Build debian image (beta-node16) on: + workflow_dispatch: pull_request: branches: - beta @@ -9,7 +10,6 @@ on: - closed schedule: - cron: '42 3 * * 1' - workflow_dispatch: jobs: bulid-beta-node16-image: diff --git a/.github/workflows/build-debian-image-beta.yml b/.github/workflows/build-debian-image-beta.yml index f172ebac..fcf8c6d5 100644 --- a/.github/workflows/build-debian-image-beta.yml +++ b/.github/workflows/build-debian-image-beta.yml @@ -1,5 +1,5 @@ # Github action to build Docker image from beta branch (tag: beta) -name: Build debian based image (beta) +name: Build debian image (beta) on: workflow_dispatch: diff --git a/.github/workflows/build-debian-image-dev-node16.yml b/.github/workflows/build-debian-image-dev-node16.yml index eed6df8e..9f95ad63 100644 --- a/.github/workflows/build-debian-image-dev-node16.yml +++ b/.github/workflows/build-debian-image-dev-node16.yml @@ -1,5 +1,5 @@ # Github action to build Docker image from dev branch (tag: dev) -name: Build debian based image (dev-node16) +name: Build debian image (dev-node16) on: workflow_dispatch: diff --git a/.github/workflows/build-debian-image-dev.yml b/.github/workflows/build-debian-image-dev.yml index dd1db9ca..f87ad185 100644 --- a/.github/workflows/build-debian-image-dev.yml +++ b/.github/workflows/build-debian-image-dev.yml @@ -1,5 +1,5 @@ # Github action to build Docker image from dev branch (tag: dev) -name: Build debian based image (dev) +name: Build debian image (dev) on: workflow_dispatch: diff --git a/.github/workflows/build-debian-image-main.yml b/.github/workflows/build-debian-image-main.yml index 6e4ba53c..a16cc5bd 100644 --- a/.github/workflows/build-debian-image-main.yml +++ b/.github/workflows/build-debian-image-main.yml @@ -1,5 +1,5 @@ # Github action to build Docker image from main branch (tag: latest) -name: Build debian based image (latest) +name: Build debian image (latest) on: workflow_dispatch: diff --git a/.github/workflows/build-debian-image-main_iob.yml b/.github/workflows/build-debian-image-main_iob.yml index 496d8354..3523d7d6 100644 --- a/.github/workflows/build-debian-image-main_iob.yml +++ b/.github/workflows/build-debian-image-main_iob.yml @@ -1,5 +1,5 @@ # Github action to build Docker image from main branch for iobroker/iobroker (tag: latest) -name: Build debian based image (latest) +name: Build debian image (latest) on: workflow_dispatch: diff --git a/CHANGELOG.md b/CHANGELOG.md index c8482e59..2b0ea08c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## Changelog +### v6.1.0-beta.1 (2021-12-14) +* added alias "m" for maintenance script + ### v6.0.0 (2021-12-09) * moving docu/ restructuring readme * v6.0.0-beta1 (2021-10-07) @@ -29,12 +32,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 short form for maintenance script * v5.2.0-beta (2021-04-02) * some renaming to optimize automated build * changes in versioning @@ -43,7 +46,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 diff --git a/debian/scripts/iobroker_startup.sh b/debian/scripts/iobroker_startup.sh index 5a7fb412..e268ff56 100644 --- a/debian/scripts/iobroker_startup.sh +++ b/debian/scripts/iobroker_startup.sh @@ -86,6 +86,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 diff --git a/debian/scripts/maintenance.sh b/debian/scripts/maintenance.sh index a02a60aa..28a66d7f 100644 --- a/debian/scripts/maintenance.sh +++ b/debian/scripts/maintenance.sh @@ -17,6 +17,7 @@ display_help() { echo '' echo "Usage: maintenance [ COMMAND ] [ OPTION ]" echo " maint [ COMMAND ] [ OPTION ]" + echo " m [ COMMAND ] [ OPTION ]" echo '' echo "COMMANDS" echo "------------------" diff --git a/src/README_docker_hub_buanet.md b/src/README_docker_hub_buanet.md index 97c8d2f9..878e550f 100644 --- a/src/README_docker_hub_buanet.md +++ b/src/README_docker_hub_buanet.md @@ -1,8 +1,8 @@ - + -[![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)
+[![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)
[![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)
@@ -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). diff --git a/src/README_docker_hub_iobroker.md b/src/README_docker_hub_iobroker.md index 35de2fdb..9dd114b8 100644 --- a/src/README_docker_hub_iobroker.md +++ b/src/README_docker_hub_iobroker.md @@ -1,15 +1,17 @@ - +###### [iobroker/iobroker](https://hub.docker.com/r/iobroker/iobroker) is an alias for [buanet/iobroker](https://hub.docker.com/r/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)
+[![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)
[![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)
[![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).