Merge pull request #407 from buanet/dependabot/github_actions/beta/actions/checkout-4.1.1

Bump actions/checkout from 4.1.0 to 4.1.1

.VERSION

@@ -1 +1 @@
-v9.1.0-beta.2
+v9.1.0-beta.3

.github/dependabot.yml

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

.github/workflows/build-debian12-beta.yml

@@ -24,7 +24,7 @@ jobs:
         run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
       - name: Checkout repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           repository: 'buanet/ioBroker.docker'
           ref: ${{ env.RELEASE_TAG }}
@@ -96,7 +96,7 @@ jobs:
           run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
         - name: Checkout repo
-          uses: actions/checkout@v4.1.0
+          uses: actions/checkout@v4.1.1
           with:
             repository: 'buanet/ioBroker.docker'
             ref: ${{ env.RELEASE_TAG }}

.github/workflows/build-debian12-dev.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           repository: 'buanet/ioBroker.docker'
 
@@ -85,7 +85,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           repository: 'buanet/ioBroker.docker'
 

.github/workflows/build-debian12-latest.yml

@@ -18,7 +18,7 @@ jobs:
           echo "RELEASE_TAG=$LATESTRELEASE" >> $GITHUB_ENV
 
       - name: Checkout repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           repository: 'buanet/ioBroker.docker'
           ref: ${{ env.RELEASE_TAG }}
@@ -94,7 +94,7 @@ jobs:
           echo "RELEASE_TAG=$LATESTRELEASE" >> $GITHUB_ENV
 
       - name: Checkout repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           repository: 'buanet/ioBroker.docker'
           ref: ${{ env.RELEASE_TAG }}

.github/workflows/update-docker-readme.yml

@@ -12,7 +12,7 @@ jobs:
   update-docker-readme:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.1.0
+    - uses: actions/checkout@v4.1.1
 
     - name: Update Docker Hub Readme (buanet)
       uses: peter-evans/dockerhub-description@v3.4.2

.github/workflows/version-checks.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           repository: 'buanet/ioBroker.docker'
           token: ${{ secrets.ACTIONS_PAT }}

CHANGELOG.md

@@ -1,10 +1,13 @@
 ## Changelog
 
-### v9.1.0-beta.2 (coming soon)
+### v9.1.0-beta.3 (23.11.2023)
-* enhance logging/ fix typos
+* add --force to restore in maintenance script
-* add env PACKAGES_UPDATE and remove automatic package updates on first container start
+* improve shebang in scripts for downgrade and portability
-* improve setuid/setgid handling during startup ([#397](https://github.com/buanet/ioBroker.docker/issues/397))
+* v9.1.0-beta.2 (06.11.2023)
-* move maintenance script registration to dockerfile ([#390](https://github.com/buanet/ioBroker.docker/issues/390))
+  * enhance logging/ fix typos
+  * add env PACKAGES_UPDATE and remove automatic package updates on first container start
+  * improve setuid/setgid handling during startup ([#397](https://github.com/buanet/ioBroker.docker/issues/397))
+  * move maintenance script registration to dockerfile ([#390](https://github.com/buanet/ioBroker.docker/issues/390))
 * v9.1.0-beta.1 (03.11.2023)
   * improve maintenance command by symlinking ([#390](https://github.com/buanet/ioBroker.docker/issues/390))
   * fix restore/ adding backup file selection ([#394](https://github.com/buanet/ioBroker.docker/issues/394))

debian12/scripts/healthcheck.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Script checks health of running container
 

debian12/scripts/iobroker.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/usr/bin/env bash
 
 # run iob fix
 iob_fix () {

debian12/scripts/maintenance.sh

@@ -272,7 +272,7 @@ restore_iobroker() {
   # restoe backup
   echo -n "Restoring ioBroker from $selected_backup... "
   set +e
-  bash iobroker restore "$selected_backup" > /opt/iobroker/log/restore.log 2>&1
+  bash iobroker restore "$selected_backup" --force > /opt/iobroker/log/restore.log 2>&1
   return_value=$?
   set -e
 

debian12/scripts/setup_avahi.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [ -e /usr/sbin/avahi-daemon ] && [ -e /var/run/dbus ]
 then

debian12/scripts/setup_iob_db.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # reading env
 debug=$DEBUG

debian12/scripts/setup_packages.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # bash strict mode
 set -euo pipefail