Merge pull request #365 from buanet/beta

beta to main
buanet · Aug 15, 2023 · 048603b · 048603b
2 parents 47bccc9 + dbae1ff
commit 048603b
Show file tree

Hide file tree

Showing 23 changed files with 260 additions and 459 deletions.
diff --git a/.VERSION b/.VERSION
@@ -1 +1 @@
-v8.1.0-beta.2
+v8.1.0
diff --git a/.github/workflows/build-debian-image-beta-node20.yml b/.github/workflows/build-debian-image-beta-node20.yml
@@ -14,7 +14,7 @@ jobs:
         run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           repository: 'buanet/ioBroker.docker'
           ref: ${{ env.RELEASE_TAG }}
@@ -43,7 +43,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/[email protected].0
+        uses: docker/[email protected].1
 
       - name: Login to DockerHub
         uses: docker/[email protected]

diff --git a/.github/workflows/build-debian-image-beta.yml b/.github/workflows/build-debian-image-beta.yml
@@ -14,7 +14,7 @@ jobs:
         run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           repository: 'buanet/ioBroker.docker'
           ref: ${{ env.RELEASE_TAG }}
@@ -43,7 +43,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/[email protected].0
+        uses: docker/[email protected].1
 
       - name: Login to DockerHub
         uses: docker/[email protected]

diff --git a/.github/workflows/build-debian-image-dev-node20.yml b/.github/workflows/build-debian-image-dev-node20.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/[email protected].0
+        uses: actions/[email protected].3
         with:
           repository: 'buanet/ioBroker.docker'
 
@@ -37,7 +37,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/[email protected].0
+        uses: docker/[email protected].1
 
       - name: Login to DockerHub
         uses: docker/[email protected]

diff --git a/.github/workflows/build-debian-image-dev.yml b/.github/workflows/build-debian-image-dev.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/[email protected].0
+        uses: actions/[email protected].3
         with:
           repository: 'buanet/ioBroker.docker'
 
@@ -37,7 +37,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/[email protected].0
+        uses: docker/[email protected].1
 
       - name: Login to DockerHub
         uses: docker/[email protected]

diff --git a/.github/workflows/build-debian-image-latest-iob.yml b/.github/workflows/build-debian-image-latest-iob.yml
@@ -17,7 +17,7 @@ jobs:
           echo "RELEASE_TAG=$LATESTRELEASE" >> $GITHUB_ENV
     
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           repository: 'buanet/ioBroker.docker'
           ref: ${{ env.RELEASE_TAG }}
@@ -46,7 +46,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/[email protected].0
+        uses: docker/[email protected].1
 
       - name: Login to DockerHub (iobroker)
         uses: docker/[email protected]

diff --git a/.github/workflows/build-debian-image-latest.yml b/.github/workflows/build-debian-image-latest.yml
@@ -17,7 +17,7 @@ jobs:
           echo "RELEASE_TAG=$LATESTRELEASE" >> $GITHUB_ENV
 
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           repository: 'buanet/ioBroker.docker'
           ref: ${{ env.RELEASE_TAG }}
@@ -46,7 +46,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/[email protected].0
+        uses: docker/[email protected].1
       - name: Login to DockerHub (buanet)
         uses: docker/[email protected]
         with:

diff --git a/.github/workflows/check-iobroker-versions.yml b/.github/workflows/check-iobroker-versions.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           repository: 'buanet/ioBroker.docker'
           token: ${{ secrets.ACTIONS_PAT }}

diff --git a/.github/workflows/update-docker-readme.yml b/.github/workflows/update-docker-readme.yml
@@ -12,10 +12,10 @@ jobs:
   update-docker-readme:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v3.5.3
 
     - name: Update Docker Hub Readme (buanet)
-      uses: peter-evans/dockerhub-description@v3
+      uses: peter-evans/dockerhub-description@v3.4.2
       with:
         username: ${{ secrets.DOCKER_USER }}
         password: ${{ secrets.DOCKER_PASS }}
@@ -24,7 +24,7 @@ jobs:
         readme-filepath: ./docs/README_docker_hub_buanet.md
 
     - name: Update Docker Hub Readme (iobroker)
-      uses: peter-evans/dockerhub-description@v3
+      uses: peter-evans/dockerhub-description@v3.4.2
       with:
         username: ${{ secrets.DOCKER_USER_IOB }}
         password: ${{ secrets.DOCKER_PASS_IOB }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,20 @@
 ## Changelog
 
-### v8.1.0-beta.2 (coming soon)
-* prohibit restore when startup script is still running
-* extend time before restart after restore is done
-* influx data repo will be added automatically when PACKAGES contains influxdb or influxdb2-cli package
+### v8.1.0 (15.08.2023)
+* repo cleanup
+* v8.1.0-beta.4 (29.07.2023)
+  * fix container restart in maintenance script 
+  * fix running maintenance script as iobroker
+  * enhance quoting ([#357 by @dontobi](https://github.com/buanet/ioBroker.docker/pull/357))
+* v8.1.0-beta.3 (05.07.2023)
+  * fix permission issue for restart container as iobroker user
+  * fix issue with js-controller ui upgrade
+  * fix small issues in maintenance script
+  * update action workflows
+* v8.1.0-beta.2 (26.04.2023)
+  * prohibit restore when startup script is still running
+  * extend time before restart after restore is done
+  * influx data repo will be added automatically when PACKAGES contains influxdb or influxdb2-cli package
 * v8.1.0-beta.1 (14.04.2023)
   * enhance github actions
   * enhance log output of maintenance script on restore ([#333](https://github.com/buanet/ioBroker.docker/issues/333))
@@ -276,4 +287,4 @@
 * added support for avahi-daemon (installation and autostart)
 
 ### v0.0.1 (2017-01-31)
-* project started / initial release
+* project started / initial release
diff --git a/debian/node12/Dockerfile b/debian/node12/Dockerfile
diff --git a/debian/node14/Dockerfile b/debian/node14/Dockerfile
diff --git a/debian/scripts/healthcheck.sh b/debian/scripts/healthcheck.sh
@@ -4,17 +4,17 @@
 
 if [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "starting" ]
 then
-  echo 'Health status: OK - Startup script is still running.'
+  echo "Health status: OK - Startup script is still running."
   exit 0
 elif [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "maintenance" ]
 then
-  echo 'Health status: OK - Container is running in maintenance mode.'
+  echo "Health status: OK - Container is running in maintenance mode."
   exit 0
 elif [ "$(ps -fe|grep "[i]obroker.js-controller"|awk '{print $2}')" != "" ]
 then
-  echo 'Health status: OK - Main process (js-controller) is running.'
+  echo "Health status: OK - Main process (js-controller) is running."
   exit 0
 fi
 
-echo 'Health status: !!! NOT OK !!! - Something went wrong. Please see container logs for more details and/or try restarting the container.'
+echo "Health status: !!! NOT OK !!! - Something went wrong. Please see container logs for more details and/or try restarting the container."
 exit 1