Merge pull request #286 from buanet/v7.1.0-beta.1

V7.1.0 beta.1

.VERSION

@@ -1 +1 @@
-v7.0.1
+v7.1.0-beta.1

.github/workflows/build-debian-image-dev.yml

@@ -12,7 +12,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: 'buanet/ioBroker.docker'
-          ref: 'main'
+          # ref: 'main'
 
       - name: Get and write version and date
         id: version

.github/workflows/check-js-controller-release.yml → .github/workflows/check-iobroker-versions.yml

@@ -1,4 +1,4 @@
-name: Check js-controller release
+name: Check ioBroker versions
 
 on:
   schedule:
@@ -15,13 +15,20 @@ jobs:
           repository: 'buanet/ioBroker.docker'
           token: ${{ secrets.ACTIONS_PAT }}
 
-      - name: Fetch js-controller release version
+      - name: Fetch ioBroker versions
         run: |
           curl -sL https://repo.iobroker.live/sources-dist.json | \
           jq -r '."js-controller".version' > .github/dependencies/.js-controller-version
-          # curl -sL https://api.github.com/repos/ioBroker/ioBroker.js-controller/releases/latest | \
-          # jq -r ".tag_name" > .github/dependencies/.js-controller-version
           echo "[LOG] Fetched js-controller version is $(cat .github/dependencies/.js-controller-version)"
+          curl -sL https://repo.iobroker.live/sources-dist.json | \
+          jq -r '."admin".version' > .github/dependencies/.admin-version
+          echo "[LOG] Fetched admin version is $(cat .github/dependencies/.admin-version)"
+          curl -sL https://repo.iobroker.live/sources-dist.json | \
+          jq -r '."backitup".version' > .github/dependencies/.backitup-version
+          echo "[LOG] Fetched backitup version is $(cat .github/dependencies/.backitup-version)"
+          curl -sL https://repo.iobroker.live/sources-dist.json | \
+          jq -r '."discovery".version' > .github/dependencies/.discovery-version
+          echo "[LOG] Fetched discovery version is $(cat .github/dependencies/.discovery-version)"
 
       - name: Check for modified files
         id: git-check
@@ -32,7 +39,7 @@ jobs:
         run: |
           git config --global user.name 'buanet'
           git config --global user.email '[email protected]'
-          git commit -am "new js-controller release"
+          git commit -am "new ioBroker versions"
           git push
 
       - name: Trigger build debian latest (buanet)

CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Changelog
 
+### v7.1.0-beta.1 (12.10.2022)
+* add env DEBUG for extended debugging log
+* enhance logging in iobroker-startuo.sh
+* enhance build process
+* add restart option to maintenance script
+* add strict mode for iobroker-startup.sh
+* fix "unary operator expected" error
+
 ### v7.0.1 (05.07.2022)
 * backitup restore patch
 

README.md

@@ -60,7 +60,7 @@ Please do not use the issues for support questions. Not every error message is w
 
 ### Beta testing
 
-If you want to get the newest features and changes feel free to use/ test the beta version of the Docker image. You can find the changelog for beta versions [here](https://github.com/buanet/ioBroker.docker/blob/dev/CHANGELOG.md). For more details and beta support join us at the "docker-image" chat on the [ioBroker Discord channel](https://discord.gg/Ne3y6fUac3).
+If you want to get the newest features and changes feel free to use/ test the beta version of the Docker image. For more details and beta support join us at "beta testing & feedback" > "docker-image" on the [ioBroker Discord channel](https://discord.gg/Ne3y6fUac3).
 
 ### Support the project
 

debian/scripts/maintenance.sh

@@ -22,6 +22,7 @@ display_help() {
   echo '       on         > switches mantenance mode ON'
   echo '       off        > switches mantenance mode OFF and stops or restarts the container'
   echo '       upgrade    > puts the container to maintenance mode and upgrades ioBroker'
+  echo '       restart    > stops iobroker and stops or restarts the container'
   echo '       help       > shows this help'
   echo ''
   echo 'OPTIONS'
@@ -157,6 +158,33 @@ upgrade_jscontroller() {
   pkill -u root
 }
 
+# restart container
+restart_container() {
+  echo 'You are now going to call a restart of your container.'
+  echo 'Restarting will work depending on the configured restart policy.'
+
+  if [[ "$autoconfirm" != yes ]]; then
+    local reply
+
+    read -rp 'Do you want to continue [yes/no]? ' reply
+    if [[ "$reply" == y || "$reply" == Y || "$reply" == yes ]]; then
+      : # continue
+    else
+      return 1
+    fi
+  else
+    echo 'This command was already confirmed by the -y or --yes option.'
+  fi
+
+  echo -n 'Stopping ioBroker...'
+  stop_iob
+
+  echo 'Container will be stopped or restarted in 5 seconds...'
+  sleep 5
+  echo 'stopping' > "$healthcheck"
+  pkill -u root
+}
+
 # stop iobroker and wait until all processes stopped or pkill_timeout is reached
 stop_iob() {
   local status timeout
@@ -211,6 +239,9 @@ for arg in "$@"; do
     upgrade)
       run=(upgrade_jscontroller)
       ;;
+    restart)
+      run=(restart_container)
+      ;;
     -y|--yes)
       autoconfirm=yes
       ;;

debian/scripts/setup_packages.sh

@@ -23,13 +23,8 @@ else
   exit 1
 fi
 
-# Cleanup
-apt-get autoclean -y
-apt-get autoremove
-apt-get clean
-rm -rf /tmp/* /var/tmp/*
-rm -rf /root/.cache/*
-rm -rf /var/lib/apt/lists/*
-rm -f /opt/scripts/.docker_config/.packages
+# Silent Cleanup
+apt-get -qq autoclean -y && apt-get -qq autoremove && apt-get -qq clean
+rm -rf /tmp/* /var/tmp/* && rm -rf /root/.cache/* && rm -rf /var/lib/apt/lists/* && rm -f /opt/scripts/.docker_config/.packages
 
 exit 0

docs/README_docker_hub_buanet.md

@@ -110,6 +110,7 @@ You could use environment variables to auto configure your ioBroker container on
 
 ### Configure environment:
 
+* `DEBUG` (optional, default: false) Set true to get extended logging messages on container startup
 * `LANG` (optional, default: de_DE.UTF‑8) The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8
 * `LANGUAGE` (optional, default: de_DE:de) The following locales are pre-generated: de_DE:de, en_US:en
 * `LC_ALL` (optional, default: de_DE.UTF-8) The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8

docs/README_docker_hub_iobroker.md

@@ -111,6 +111,7 @@ You could use environment variables to auto configure your ioBroker container on
 
 ### Configure environment:
 
+* `DEBUG` (optional, default: false) Set true to get extended logging messages on container startup
 * `LANG` (optional, default: de_DE.UTF‑8) The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8
 * `LANGUAGE` (optional, default: de_DE:de) The following locales are pre-generated: de_DE:de, en_US:en
 * `LC_ALL` (optional, default: de_DE.UTF-8) The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8