From bbac132f284c453477c95315c3ef09aac987d327 Mon Sep 17 00:00:00 2001 From: buanet Date: Sat, 15 Apr 2023 22:30:19 +0200 Subject: [PATCH 01/18] testing influx repo integration --- debian/scripts/iobroker_startup.sh | 2 +- debian/scripts/setup_packages.sh | 40 +++++++++++++++++++++++------- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/debian/scripts/iobroker_startup.sh b/debian/scripts/iobroker_startup.sh index 3977436..d720508 100644 --- a/debian/scripts/iobroker_startup.sh +++ b/debian/scripts/iobroker_startup.sh @@ -143,7 +143,7 @@ if [[ -f /opt/.first_run ]]; then echo "PACKAGES is set, but OFFLINE_MODE is \"true\". Skipping Linux package installation." elif [[ "$packages" != "" ]]; then echo "PACKAGES is set. Installing the following additional Linux packages: ""$packages" - echo "$packages" > /opt/scripts/.docker_config/.packages +# echo "$packages" > /opt/scripts/.docker_config/.packages bash /opt/scripts/setup_packages.sh -install fi # Register maintenance script diff --git a/debian/scripts/setup_packages.sh b/debian/scripts/setup_packages.sh index 48fcd66..7be1f7c 100644 --- a/debian/scripts/setup_packages.sh +++ b/debian/scripts/setup_packages.sh @@ -1,16 +1,37 @@ #!/bin/bash +# bash strict mode +set -euo pipefail + +# Reading ENV +set +u +packages=$PACKAGES +set -u + export DEBIAN_FRONTEND=noninteractive -if [ "$1" == "-install" ] -then +check_package_preq() { + if [[ "$i" == "influxdb" || "$i" == "influxdb2-cli" ]]; then + # add influxdata repo + wget -q https://repos.influxdata.com/influxdata-archive_compat.key + cat influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null + echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list + fi +} + +if [[ "$1" == "-install" ]]; then apt-get -q update >> /opt/scripts/setup_packages.log 2>&1 - packages=$(cat /opt/scripts/.docker_config/.packages) echo ' ' for i in $packages; do - if [ "$(dpkg-query -W -f='${Status}' "$i" 2>/dev/null | grep -c "ok installed")" -eq 0 ]; - then - echo -n "$i is not installed. Installing... " + if [[ "$(dpkg-query -W -f='${Status}' "$i" 2>/dev/null | grep -c "ok installed")" -eq 0 ]]; then + echo -n "$i is not installed. Installing... " + check_package_preq >> /opt/scripts/setup_packages.log 2>&1 + return=$? + if [[ "$return" -ne 0 ]]; then + echo "Failed." + echo "For more details see \"/opt/scripts/setup_packages.log\"." + echo ' ' + else DEBIAN_FRONTEND=noninteractive apt-get -q -y install "$i" >> /opt/scripts/setup_packages.log 2>&1 return=$? if [[ "$return" -ne 0 ]]; then @@ -20,11 +41,12 @@ then else echo "Done." fi - else - echo "$i is already installed." fi + else + echo "$i is already installed." + fi done -elif [ "$1" == "-update" ]; then +elif [[ "$1" == "-update" ]]; then echo -n "Updating Linux packages on first run... " apt-get -q update >> /opt/scripts/setup_packages.log 2>&1 return=$? From 6a55923669c6f6fcaa7b4b0f1dd05d1f08662141 Mon Sep 17 00:00:00 2001 From: buanet Date: Sun, 16 Apr 2023 00:08:10 +0200 Subject: [PATCH 02/18] add check for package validity --- debian/scripts/setup_packages.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/debian/scripts/setup_packages.sh b/debian/scripts/setup_packages.sh index 7be1f7c..5ad055a 100644 --- a/debian/scripts/setup_packages.sh +++ b/debian/scripts/setup_packages.sh @@ -6,11 +6,13 @@ set -euo pipefail # Reading ENV set +u packages=$PACKAGES +debug=$DEBUG set -u export DEBIAN_FRONTEND=noninteractive check_package_preq() { + # check for influx packages if [[ "$i" == "influxdb" || "$i" == "influxdb2-cli" ]]; then # add influxdata repo wget -q https://repos.influxdata.com/influxdata-archive_compat.key @@ -18,10 +20,26 @@ check_package_preq() { echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list fi } +check_package_validity() { + # remove packages when "influxdb" AND "influxdb2-cli" + if [[ echo "$packages" | grep -qw "influxdb" && echo "$packages" | grep -qw "influxdb2-cli" ]]; then + echo "PACKAGES includes \"influxdb\" AND \"influxdb2-cli\"." + echo "As installing both packages together is not possible, they will be skipped." + packages=$(echo "$packages" | sed 's/influxdb//g' | sed 's/influxdb2-cli//g') + if [[ "$debug" == "true" ]]; then echo "[DEBUG] New list of packages: = ""$packages"; fi + echo ' ' + fi + # check string for double spaces + while echo "$packages" | grep -q ' '; do + # remove double spaces + packages=$(echo "$packages" | sed 's/ / /g') + done +} if [[ "$1" == "-install" ]]; then - apt-get -q update >> /opt/scripts/setup_packages.log 2>&1 echo ' ' + apt-get -q update >> /opt/scripts/setup_packages.log 2>&1 + check_package_validity for i in $packages; do if [[ "$(dpkg-query -W -f='${Status}' "$i" 2>/dev/null | grep -c "ok installed")" -eq 0 ]]; then echo -n "$i is not installed. Installing... " From a954b51223a1b3e8f8e45b524dde1792d960051b Mon Sep 17 00:00:00 2001 From: buanet Date: Sun, 16 Apr 2023 00:54:15 +0200 Subject: [PATCH 03/18] small fixes --- debian/scripts/setup_packages.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/scripts/setup_packages.sh b/debian/scripts/setup_packages.sh index 5ad055a..2b9d848 100644 --- a/debian/scripts/setup_packages.sh +++ b/debian/scripts/setup_packages.sh @@ -15,8 +15,7 @@ check_package_preq() { # check for influx packages if [[ "$i" == "influxdb" || "$i" == "influxdb2-cli" ]]; then # add influxdata repo - wget -q https://repos.influxdata.com/influxdata-archive_compat.key - cat influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null + wget -qO- https://repos.influxdata.com/influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list fi } @@ -25,7 +24,7 @@ check_package_validity() { if [[ echo "$packages" | grep -qw "influxdb" && echo "$packages" | grep -qw "influxdb2-cli" ]]; then echo "PACKAGES includes \"influxdb\" AND \"influxdb2-cli\"." echo "As installing both packages together is not possible, they will be skipped." - packages=$(echo "$packages" | sed 's/influxdb//g' | sed 's/influxdb2-cli//g') + packages=$(echo "$packages" | sed 's/influxdb//g;s/influxdb2-cli//g') if [[ "$debug" == "true" ]]; then echo "[DEBUG] New list of packages: = ""$packages"; fi echo ' ' fi @@ -61,7 +60,7 @@ if [[ "$1" == "-install" ]]; then fi fi else - echo "$i is already installed." + echo "$i is already installed." fi done elif [[ "$1" == "-update" ]]; then @@ -87,4 +86,4 @@ fi 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 +exit 0 \ No newline at end of file From 16e30c392d0a41d6d5112972719a01522ab171df Mon Sep 17 00:00:00 2001 From: buanet Date: Sun, 16 Apr 2023 01:10:05 +0200 Subject: [PATCH 04/18] fix typo --- debian/scripts/setup_packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/scripts/setup_packages.sh b/debian/scripts/setup_packages.sh index 2b9d848..8b71305 100644 --- a/debian/scripts/setup_packages.sh +++ b/debian/scripts/setup_packages.sh @@ -14,7 +14,7 @@ export DEBIAN_FRONTEND=noninteractive check_package_preq() { # check for influx packages if [[ "$i" == "influxdb" || "$i" == "influxdb2-cli" ]]; then - # add influxdata repo + # add influxdata repo keys wget -qO- https://repos.influxdata.com/influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list fi From 893908f29d938dbc1584782d3d7de3cb6e64c0c4 Mon Sep 17 00:00:00 2001 From: buanet Date: Sun, 16 Apr 2023 13:44:18 +0200 Subject: [PATCH 05/18] fix typo --- debian/scripts/setup_packages.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/scripts/setup_packages.sh b/debian/scripts/setup_packages.sh index 8b71305..9769bb0 100644 --- a/debian/scripts/setup_packages.sh +++ b/debian/scripts/setup_packages.sh @@ -21,11 +21,11 @@ check_package_preq() { } check_package_validity() { # remove packages when "influxdb" AND "influxdb2-cli" - if [[ echo "$packages" | grep -qw "influxdb" && echo "$packages" | grep -qw "influxdb2-cli" ]]; then - echo "PACKAGES includes \"influxdb\" AND \"influxdb2-cli\"." + if echo "$packages" | grep -qw "influxdb" && echo "$packages" | grep -qw "influxdb2-cli"; then + echo "PACKAGES includes influxdb AND influxdb2-cli." echo "As installing both packages together is not possible, they will be skipped." packages=$(echo "$packages" | sed 's/influxdb//g;s/influxdb2-cli//g') - if [[ "$debug" == "true" ]]; then echo "[DEBUG] New list of packages: = ""$packages"; fi + if [[ $debug == "true" ]]; then echo "[DEBUG] New list of packages: = ""$packages"; fi echo ' ' fi # check string for double spaces From e283d2571064cd55d9fcce25a561dcee6e67c144 Mon Sep 17 00:00:00 2001 From: buanet Date: Sun, 16 Apr 2023 14:57:10 +0200 Subject: [PATCH 06/18] small fixes --- debian/scripts/setup_packages.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/scripts/setup_packages.sh b/debian/scripts/setup_packages.sh index 9769bb0..49c9521 100644 --- a/debian/scripts/setup_packages.sh +++ b/debian/scripts/setup_packages.sh @@ -24,8 +24,8 @@ check_package_validity() { if echo "$packages" | grep -qw "influxdb" && echo "$packages" | grep -qw "influxdb2-cli"; then echo "PACKAGES includes influxdb AND influxdb2-cli." echo "As installing both packages together is not possible, they will be skipped." - packages=$(echo "$packages" | sed 's/influxdb//g;s/influxdb2-cli//g') - if [[ $debug == "true" ]]; then echo "[DEBUG] New list of packages: = ""$packages"; fi + packages=$(echo "$packages" | sed 's/influxdb2-cli//g;s/influxdb//g') + if [[ $debug == "true" ]]; then echo "[DEBUG] New list of packages: ""$packages"; fi echo ' ' fi # check string for double spaces @@ -50,8 +50,8 @@ if [[ "$1" == "-install" ]]; then echo ' ' else DEBIAN_FRONTEND=noninteractive apt-get -q -y install "$i" >> /opt/scripts/setup_packages.log 2>&1 - return=$? - if [[ "$return" -ne 0 ]]; then + return1=$? + if [[ "$return1" -ne 0 ]]; then echo "Failed." echo "For more details see \"/opt/scripts/setup_packages.log\"." echo ' ' From 8fe4d775f57bc90d54428886e6edb1992dec7499 Mon Sep 17 00:00:00 2001 From: buanet Date: Sun, 16 Apr 2023 15:16:37 +0200 Subject: [PATCH 07/18] testing --- debian/scripts/iobroker_startup.sh | 1 + debian/scripts/setup_packages.sh | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/debian/scripts/iobroker_startup.sh b/debian/scripts/iobroker_startup.sh index d720508..14606b4 100644 --- a/debian/scripts/iobroker_startup.sh +++ b/debian/scripts/iobroker_startup.sh @@ -146,6 +146,7 @@ if [[ -f /opt/.first_run ]]; then # echo "$packages" > /opt/scripts/.docker_config/.packages bash /opt/scripts/setup_packages.sh -install fi + echo ' ' # Register maintenance script echo -n 'Registering maintenance script as command... ' echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc diff --git a/debian/scripts/setup_packages.sh b/debian/scripts/setup_packages.sh index 49c9521..655d063 100644 --- a/debian/scripts/setup_packages.sh +++ b/debian/scripts/setup_packages.sh @@ -43,21 +43,14 @@ if [[ "$1" == "-install" ]]; then if [[ "$(dpkg-query -W -f='${Status}' "$i" 2>/dev/null | grep -c "ok installed")" -eq 0 ]]; then echo -n "$i is not installed. Installing... " check_package_preq >> /opt/scripts/setup_packages.log 2>&1 + apt-get -q -y install "$i" >> /opt/scripts/setup_packages.log 2>&1 return=$? if [[ "$return" -ne 0 ]]; then echo "Failed." echo "For more details see \"/opt/scripts/setup_packages.log\"." echo ' ' else - DEBIAN_FRONTEND=noninteractive apt-get -q -y install "$i" >> /opt/scripts/setup_packages.log 2>&1 - return1=$? - if [[ "$return1" -ne 0 ]]; then - echo "Failed." - echo "For more details see \"/opt/scripts/setup_packages.log\"." - echo ' ' - else echo "Done." - fi fi else echo "$i is already installed." From acad72922e7ecb488019fca2c437bfd341f1dad4 Mon Sep 17 00:00:00 2001 From: buanet Date: Sun, 16 Apr 2023 21:55:23 +0200 Subject: [PATCH 08/18] testing --- debian/scripts/setup_packages.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/debian/scripts/setup_packages.sh b/debian/scripts/setup_packages.sh index 655d063..1e5da26 100644 --- a/debian/scripts/setup_packages.sh +++ b/debian/scripts/setup_packages.sh @@ -39,13 +39,11 @@ if [[ "$1" == "-install" ]]; then echo ' ' apt-get -q update >> /opt/scripts/setup_packages.log 2>&1 check_package_validity - for i in $packages; do - if [[ "$(dpkg-query -W -f='${Status}' "$i" 2>/dev/null | grep -c "ok installed")" -eq 0 ]]; then + for i in "$packages"; do + if ! dpkg -s "$i" >/dev/null 2>&1; then echo -n "$i is not installed. Installing... " check_package_preq >> /opt/scripts/setup_packages.log 2>&1 - apt-get -q -y install "$i" >> /opt/scripts/setup_packages.log 2>&1 - return=$? - if [[ "$return" -ne 0 ]]; then + if ! apt-get -q -y install "$i" >> /opt/scripts/setup_packages.log 2>&1; then echo "Failed." echo "For more details see \"/opt/scripts/setup_packages.log\"." echo ' ' @@ -59,10 +57,10 @@ if [[ "$1" == "-install" ]]; then elif [[ "$1" == "-update" ]]; then echo -n "Updating Linux packages on first run... " apt-get -q update >> /opt/scripts/setup_packages.log 2>&1 - return=$? - apt-get -q -y upgrade >> /opt/scripts/setup_packages.log 2>&1 return1=$? - if [[ "$return" -ne 0 || "$return1" -ne 0 ]]; then + apt-get -q -y upgrade >> /opt/scripts/setup_packages.log 2>&1 + return2=$? + if [[ "$return1" -ne 0 || "$return2" -ne 0 ]]; then echo "Failed." echo "For more details see \"/opt/scripts/setup_packages.log\"." echo "Make sure the container has internet access to get the latest package updates." From 065d0cb4df93ede3c188d03eb365956aaffda75c Mon Sep 17 00:00:00 2001 From: buanet Date: Sun, 16 Apr 2023 22:14:03 +0200 Subject: [PATCH 09/18] syntax change --- debian/scripts/setup_packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/scripts/setup_packages.sh b/debian/scripts/setup_packages.sh index 1e5da26..2de041f 100644 --- a/debian/scripts/setup_packages.sh +++ b/debian/scripts/setup_packages.sh @@ -39,7 +39,7 @@ if [[ "$1" == "-install" ]]; then echo ' ' apt-get -q update >> /opt/scripts/setup_packages.log 2>&1 check_package_validity - for i in "$packages"; do + for i in $packages; do if ! dpkg -s "$i" >/dev/null 2>&1; then echo -n "$i is not installed. Installing... " check_package_preq >> /opt/scripts/setup_packages.log 2>&1 From 8c9279b86704deb160a65337090af12157505576 Mon Sep 17 00:00:00 2001 From: buanet Date: Sun, 16 Apr 2023 23:03:23 +0200 Subject: [PATCH 10/18] enhance output --- debian/scripts/setup_packages.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/debian/scripts/setup_packages.sh b/debian/scripts/setup_packages.sh index 2de041f..4d6ddb6 100644 --- a/debian/scripts/setup_packages.sh +++ b/debian/scripts/setup_packages.sh @@ -17,22 +17,26 @@ check_package_preq() { # add influxdata repo keys wget -qO- https://repos.influxdata.com/influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list + apt-get -q update >> /opt/scripts/setup_packages.log 2>&1 fi } check_package_validity() { + # check string for double spaces + while echo "$packages" | grep -q ' '; do + packages=$(echo "$packages" | sed 's/ / /g') + done # remove packages when "influxdb" AND "influxdb2-cli" if echo "$packages" | grep -qw "influxdb" && echo "$packages" | grep -qw "influxdb2-cli"; then echo "PACKAGES includes influxdb AND influxdb2-cli." echo "As installing both packages together is not possible, they will be skipped." packages=$(echo "$packages" | sed 's/influxdb2-cli//g;s/influxdb//g') + # check string for double spaces again + while echo "$packages" | grep -q ' '; do + packages=$(echo "$packages" | sed 's/ / /g') + done if [[ $debug == "true" ]]; then echo "[DEBUG] New list of packages: ""$packages"; fi echo ' ' fi - # check string for double spaces - while echo "$packages" | grep -q ' '; do - # remove double spaces - packages=$(echo "$packages" | sed 's/ / /g') - done } if [[ "$1" == "-install" ]]; then @@ -46,7 +50,6 @@ if [[ "$1" == "-install" ]]; then if ! apt-get -q -y install "$i" >> /opt/scripts/setup_packages.log 2>&1; then echo "Failed." echo "For more details see \"/opt/scripts/setup_packages.log\"." - echo ' ' else echo "Done." fi From d5a65960702234a4ced469e7d51ef1f0e7fad4e7 Mon Sep 17 00:00:00 2001 From: buanet Date: Tue, 25 Apr 2023 21:07:38 +0200 Subject: [PATCH 11/18] update version --- .VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.VERSION b/.VERSION index 6743486..27157ca 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -v8.1.0-beta.1 \ No newline at end of file +v8.1.0-beta.2 \ No newline at end of file From 686b391119e60855ea160f2986b87246aaf15907 Mon Sep 17 00:00:00 2001 From: buanet Date: Tue, 25 Apr 2023 21:15:29 +0200 Subject: [PATCH 12/18] docu --- CHANGELOG.md | 14 +++++++++----- docs/README_docker_hub_buanet.md | 5 +++-- docs/README_docker_hub_iobroker.md | 5 +++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce8c04d..b92969d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,14 @@ ## Changelog -### 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)) -* allow iobroker admin to be disabled at startup ([#332](https://github.com/buanet/ioBroker.docker/issues/332)) -* allow deletion of objects and states db password with value "none" ([#306](https://github.com/buanet/ioBroker.docker/issues/306)) +### v8.1.0-beta.2 (coming soon) +* 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)) + * allow iobroker admin to be disabled at startup ([#332](https://github.com/buanet/ioBroker.docker/issues/332)) + * allow deletion of objects and states db password with value "none" ([#306](https://github.com/buanet/ioBroker.docker/issues/306)) + +### v8.0.1 (17.04.2023) +* fix calling of "iob setup first" on slaves ([#335](https://github.com/buanet/ioBroker.docker/issues/335)) ### v8.0.0 (20.03.2023) * update readme and docs diff --git a/docs/README_docker_hub_buanet.md b/docs/README_docker_hub_buanet.md index f259082..d5f840a 100644 --- a/docs/README_docker_hub_buanet.md +++ b/docs/README_docker_hub_buanet.md @@ -35,10 +35,11 @@ New major image versions (e.g. v6, v7, v8) always include a new major version of It is highly recommended not to use the `latest` tag for production, especially when using any kind of automated update procedure like watchtower. Please use the `latest-v[major_version]` tag instead. ### Node 18 versions -* [`v8.0.0`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`v8.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`v8.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`v8.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest-v8`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile) +* [`v8.0.1`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest-v8`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile) +* [`v8.0.0`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile) ### Node 16 versions -* [`v7.2.0`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`v7.2.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`v7.2.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`v7.2.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`latest-v7`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile) +* [`v7.2.0`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`latest-v7`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile) * [`v7.1.2`](https://github.com/buanet/ioBroker.docker/blob/v7.1.2/debian/node16/Dockerfile), [`v7.1.2-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.1.2/debian/node16/Dockerfile), [`v7.1.2-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.1.2/debian/node16/Dockerfile), [`v7.1.2-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.1.2/debian/node16/Dockerfile) * [`v7.0.1`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile) diff --git a/docs/README_docker_hub_iobroker.md b/docs/README_docker_hub_iobroker.md index e9cec2b..49221bc 100644 --- a/docs/README_docker_hub_iobroker.md +++ b/docs/README_docker_hub_iobroker.md @@ -37,10 +37,11 @@ New major image versions (e.g. v6, v7, v8) always include a new major version of It is highly recommended not to use the `latest` tag for production, especially when using any kind of automated update procedure like watchtower. Please use the `latest-v[major_version]` tag instead. ### Node 18 versions -* [`v8.0.0`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`v8.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`v8.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`v8.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest-v8`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile) +* [`v8.0.1`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest-v8`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile) +* [`v8.0.0`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile) ### Node 16 versions -* [`v7.2.0`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`v7.2.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`v7.2.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`v7.2.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`latest-v7`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile) +* [`v7.2.0`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`latest-v7`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile) * [`v7.1.2`](https://github.com/buanet/ioBroker.docker/blob/v7.1.2/debian/node16/Dockerfile), [`v7.1.2-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.1.2/debian/node16/Dockerfile), [`v7.1.2-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.1.2/debian/node16/Dockerfile), [`v7.1.2-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.1.2/debian/node16/Dockerfile) * [`v7.0.1`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile) From 7a455952dd4f3b23027fa08b4acbd015abae6591 Mon Sep 17 00:00:00 2001 From: buanet Date: Tue, 25 Apr 2023 22:30:15 +0200 Subject: [PATCH 13/18] enhance maintenance script --- CHANGELOG.md | 2 ++ debian/scripts/maintenance.sh | 25 +++++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b92969d..60d227d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ ## Changelog ### v8.1.0-beta.2 (coming soon) +* prohibit restore when startup script is still running +* extend time before restart after restore is done * 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)) diff --git a/debian/scripts/maintenance.sh b/debian/scripts/maintenance.sh index 13f133d..dc423bc 100644 --- a/debian/scripts/maintenance.sh +++ b/debian/scripts/maintenance.sh @@ -38,6 +38,11 @@ maintenance_enabled() { [[ -f "$healthcheck" && "$(cat "$healthcheck")" == maintenance ]] } +# check status starting +check_starting() { + [[ -f "$healthcheck" && "$(cat "$healthcheck")" == starting ]] +} + # display maintenance status maintenance_status() { if maintenance_enabled; then @@ -221,6 +226,8 @@ restart_container() { # restore iobroker restore_iobroker() { echo 'You are now going to perform a restore of your iobroker.' + echo 'During the restore process, the container will automatically switch into maintenance mode and stop ioBroker.' + echo 'Depending on the restart policy, your container will be stopped or restarted automatically after the restore.' if [[ "$autoconfirm" != yes ]]; then local reply @@ -235,11 +242,17 @@ restore_iobroker() { echo 'This command was already confirmed by the -y or --yes option.' fi - echo -n 'Stopping ioBroker...' - stop_iob + if check_starting > /dev/null; then + echo "Startup script is still running." + echo "Please check container log and wait until ioBroker is sucessfully started." + echo "Then try again." + return 1 + fi - # fixing permission errors during restore - #chown -R $setuid:$setgid /opt/iobroker/backup + if ! maintenance_enabled > /dev/null; then + autoconfirm=yes + enable_maintenance + fi echo -n "Restoring ioBroker... " set +e @@ -263,8 +276,8 @@ restore_iobroker() { echo "!!!! You can view installation process by taking a look at ioBroker log. !!!!" echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" sleep 10 - echo 'Container will be stopped or restarted in 5 seconds...' - sleep 5 + echo 'Container will be stopped or restarted in 10 seconds...' + sleep 10 echo 'stopping' > "$healthcheck" pkill -u root } From 5c7dfb3d3cf5a2d1b643b5ca5cc4c6d1f1c14a65 Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 26 Apr 2023 22:06:57 +0200 Subject: [PATCH 14/18] update workflows for node 20 --- .../build-debian-image-beta-node20.yml | 7 +- .../build-debian-image-dev-node20.yml | 19 ++-- debian/node20/Dockerfile | 102 ++++++++++++++++++ 3 files changed, 120 insertions(+), 8 deletions(-) create mode 100644 debian/node20/Dockerfile diff --git a/.github/workflows/build-debian-image-beta-node20.yml b/.github/workflows/build-debian-image-beta-node20.yml index b2368d4..8ad01b4 100644 --- a/.github/workflows/build-debian-image-beta-node20.yml +++ b/.github/workflows/build-debian-image-beta-node20.yml @@ -64,12 +64,17 @@ jobs: context: ./debian file: ./debian/node20/Dockerfile push: true - platforms: linux/amd64,linux/arm/v7,linux/arm64/v8 + platforms: | + linux/amd64 + linux/arm/v7 + linux/arm64/v8 tags: | buanet/iobroker:beta-node20, buanet/iobroker:${{ env.version }}-node20, ghcr.io/buanet/iobroker:beta-node20, ghcr.io/buanet/iobroker:${{ env.version }}-node20 + provenance: false + outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=Official Docker image for ioBroker smarthome software (https://www.iobroker.net) - name: Delete untagged images from GitHub packages uses: actions/github-script@v6 diff --git a/.github/workflows/build-debian-image-dev-node20.yml b/.github/workflows/build-debian-image-dev-node20.yml index 73dea66..ae8e389 100644 --- a/.github/workflows/build-debian-image-dev-node20.yml +++ b/.github/workflows/build-debian-image-dev-node20.yml @@ -9,11 +9,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v3.5.0 with: repository: 'buanet/ioBroker.docker' - - name: Fetching version tag and date + - name: Fetch version tag and date id: version run: | VERSION="$(cat .VERSION)" @@ -52,19 +52,24 @@ jobs: username: ${{ secrets.PACKAGES_USER }} password: ${{ secrets.PACKAGES_PASS }} - - name: Build Docker image (node20) + - name: Build and push Docker image (node20) uses: docker/build-push-action@v4.0.0 with: context: ./debian file: ./debian/node20/Dockerfile push: true - platforms: linux/amd64,linux/arm/v7,linux/arm64/v8 + platforms: | + linux/amd64 + linux/arm/v7 + linux/arm64/v8 tags: | buanet/iobroker:dev-node20, ghcr.io/buanet/iobroker:dev-node20 + provenance: false + outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=Official Docker image for ioBroker smarthome software (https://www.iobroker.net) - - name: Delete untagged images from GitHub packages - uses: actions/github-script@v6 + - name: Delete untagged images from GitHub Container Registry + uses: actions/github-script@v6.4.1 with: github-token: ${{ secrets.PACKAGES_PASS }} script: | @@ -81,4 +86,4 @@ jobs: env: OWNER: buanet PACKAGE_NAME: iobroker - PER_PAGE: 100 + PER_PAGE: 100 diff --git a/debian/node20/Dockerfile b/debian/node20/Dockerfile new file mode 100644 index 0000000..08c0f1a --- /dev/null +++ b/debian/node20/Dockerfile @@ -0,0 +1,102 @@ +FROM debian:bullseye-slim + +LABEL org.opencontainers.image.title="Official ioBroker Docker Image" \ + org.opencontainers.image.description="Official Docker image for ioBroker smarthome software (https://www.iobroker.net)" \ + org.opencontainers.image.documentation="https://github.com/buanet/ioBroker.docker#readme" \ + org.opencontainers.image.authors="André Germann " \ + org.opencontainers.image.url="https://github.com/buanet/ioBroker.docker" \ + org.opencontainers.image.source="https://github.com/buanet/ioBroker.docker" \ + org.opencontainers.image.base.name="docker.io/library/debian:bullseye-slim" \ + org.opencontainers.image.version="${VERSION}" \ + org.opencontainers.image.created="${DATI}" + +ENV DEBIAN_FRONTEND noninteractive + +# Copy scripts +COPY scripts /opt/scripts +COPY userscripts /opt/userscripts + +# Install prerequisites (including node) and generating locales +RUN apt-get update && apt-get install -y \ + apt-utils \ + cifs-utils \ + curl \ + gosu \ + iputils-ping \ + jq \ + locales \ + nfs-common \ + procps \ + python3 \ + python3-dev \ + sudo \ + tar \ + tzdata \ + udev \ + wget \ + # Install node + && curl -sL https://deb.nodesource.com/setup_20.x | bash \ + && apt-get update && apt-get install -y nodejs \ + # Install node-gyp + && npm install -g node-gyp \ + # Generating locales + && sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen \ + && sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \ + && locale-gen \ + # Change permissions for scripts + && chmod 777 /opt/scripts/ \ + && chmod 777 /opt/userscripts/ \ + && chmod +x /opt/scripts/*.sh \ + && chmod +x /opt/userscripts/*.sh \ + # Prepare + && mkdir -p /opt/scripts/.docker_config/ \ + && echo "starting" > /opt/scripts/.docker_config/.healthcheck \ + && echo "${VERSION}" > /opt/scripts/.docker_config/.thisisdocker \ + && echo "true" > /opt/.first_run \ + # Run installer + && curl -sL https://iobroker.net/install.sh | bash - \ + # Deleting UUID from build + && iobroker unsetup -y \ + && echo "true" > /opt/iobroker/.fresh_install \ + # Backup initial ioBroker and userscript folder + && tar -cf /opt/initial_iobroker.tar /opt/iobroker \ + && tar -cf /opt/initial_userscripts.tar /opt/userscripts \ + # Setting up iobroker-user (shell, home dir and rights) + && chsh -s /bin/bash iobroker \ + && usermod --home /opt/iobroker iobroker \ + && usermod -u 1000 iobroker \ + && groupmod -g 1000 iobroker \ + && chown root:iobroker /usr/sbin/gosu \ + && chmod +s /usr/sbin/gosu \ + # Clean up installation cache + && apt-get autoclean -y \ + && apt-get autoremove \ + && apt-get clean \ + && rm -rf /tmp/* /var/tmp/* \ + && rm -rf /root/.cache/* /root/.npm/* \ + && rm -rf /var/lib/apt/lists/* + +# Setting up default ENVs +ENV DEBIAN_FRONTEND="teletype" \ + LANG="de_DE.UTF-8" \ + LANGUAGE="de_DE:de" \ + LC_ALL="de_DE.UTF-8" \ + SETGID=1000 \ + SETUID=1000 \ + TZ="Europe/Berlin" + +# Expose default admin ui port +EXPOSE 8081 + +# Change work dir +WORKDIR /opt/iobroker/ + +# Healthcheck +HEALTHCHECK --interval=15s --timeout=5s --retries=5 \ + CMD ["/bin/bash", "-c", "/opt/scripts/healthcheck.sh"] + +# Volumes for persistent data +VOLUME ["/opt/iobroker"] + +# Run startup-script +ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"] From a46e29fac1da7a4eb4b6e5771ffed9facaf6ea54 Mon Sep 17 00:00:00 2001 From: buanet Date: Thu, 27 Apr 2023 09:41:08 +0200 Subject: [PATCH 15/18] fix changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60d227d..f3d9de5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### 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-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)) From 7e291f98ea648e30ff45bf7412a21f63ca69cc62 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 09:58:06 +0000 Subject: [PATCH 16/18] Bump docker/setup-qemu-action from 2.1.0 to 2.2.0 Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2.1.0 to 2.2.0. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v2.1.0...v2.2.0) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build-debian-image-beta-node20.yml | 2 +- .github/workflows/build-debian-image-beta.yml | 2 +- .github/workflows/build-debian-image-dev-node20.yml | 2 +- .github/workflows/build-debian-image-dev.yml | 2 +- .github/workflows/build-debian-image-latest-iob.yml | 2 +- .github/workflows/build-debian-image-latest.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-debian-image-beta-node20.yml b/.github/workflows/build-debian-image-beta-node20.yml index b2368d4..136f69e 100644 --- a/.github/workflows/build-debian-image-beta-node20.yml +++ b/.github/workflows/build-debian-image-beta-node20.yml @@ -39,7 +39,7 @@ jobs: mv -f ./debian/node20/Dockerfile.tmp ./debian/node20/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v2.1.0 + uses: docker/setup-qemu-action@v2.2.0 - name: Set up Docker Buildx id: buildx diff --git a/.github/workflows/build-debian-image-beta.yml b/.github/workflows/build-debian-image-beta.yml index 135298b..b14b8e6 100644 --- a/.github/workflows/build-debian-image-beta.yml +++ b/.github/workflows/build-debian-image-beta.yml @@ -39,7 +39,7 @@ jobs: mv -f ./debian/node18/Dockerfile.tmp ./debian/node18/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v2.1.0 + uses: docker/setup-qemu-action@v2.2.0 - name: Set up Docker Buildx id: buildx diff --git a/.github/workflows/build-debian-image-dev-node20.yml b/.github/workflows/build-debian-image-dev-node20.yml index 73dea66..64ac154 100644 --- a/.github/workflows/build-debian-image-dev-node20.yml +++ b/.github/workflows/build-debian-image-dev-node20.yml @@ -33,7 +33,7 @@ jobs: mv -f ./debian/node20/Dockerfile.tmp ./debian/node20/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v2.1.0 + uses: docker/setup-qemu-action@v2.2.0 - name: Set up Docker Buildx id: buildx diff --git a/.github/workflows/build-debian-image-dev.yml b/.github/workflows/build-debian-image-dev.yml index ecda6d6..bdbbfb8 100644 --- a/.github/workflows/build-debian-image-dev.yml +++ b/.github/workflows/build-debian-image-dev.yml @@ -33,7 +33,7 @@ jobs: mv -f ./debian/node18/Dockerfile.tmp ./debian/node18/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v2.1.0 + uses: docker/setup-qemu-action@v2.2.0 - name: Set up Docker Buildx id: buildx diff --git a/.github/workflows/build-debian-image-latest-iob.yml b/.github/workflows/build-debian-image-latest-iob.yml index 92b270d..faedac7 100644 --- a/.github/workflows/build-debian-image-latest-iob.yml +++ b/.github/workflows/build-debian-image-latest-iob.yml @@ -42,7 +42,7 @@ jobs: mv -f ./debian/node18/Dockerfile.tmp ./debian/node18/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v2.1.0 + uses: docker/setup-qemu-action@v2.2.0 - name: Set up Docker Buildx id: buildx diff --git a/.github/workflows/build-debian-image-latest.yml b/.github/workflows/build-debian-image-latest.yml index 4b327b4..a49fca8 100644 --- a/.github/workflows/build-debian-image-latest.yml +++ b/.github/workflows/build-debian-image-latest.yml @@ -42,7 +42,7 @@ jobs: mv -f ./debian/node18/Dockerfile.tmp ./debian/node18/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v2.1.0 + uses: docker/setup-qemu-action@v2.2.0 - name: Set up Docker Buildx id: buildx From 800e95a5c230556d16acffbe19e25b5bde98bf8f Mon Sep 17 00:00:00 2001 From: buanet Date: Mon, 19 Jun 2023 23:45:06 +0000 Subject: [PATCH 17/18] new ioBroker versions --- .github/dependencies/.backitup-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependencies/.backitup-version b/.github/dependencies/.backitup-version index 6684b6b..fef250d 100644 --- a/.github/dependencies/.backitup-version +++ b/.github/dependencies/.backitup-version @@ -1 +1 @@ -2.6.19 +2.6.23 From 9f016f53632bb6776358df99bf1b9dd3705d4fb0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Jun 2023 09:42:27 +0000 Subject: [PATCH 18/18] Bump docker/setup-buildx-action from 2.5.0 to 2.8.0 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.5.0 to 2.8.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v2.5.0...v2.8.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build-debian-image-beta-node20.yml | 2 +- .github/workflows/build-debian-image-beta.yml | 2 +- .github/workflows/build-debian-image-dev-node20.yml | 2 +- .github/workflows/build-debian-image-dev.yml | 2 +- .github/workflows/build-debian-image-latest-iob.yml | 2 +- .github/workflows/build-debian-image-latest.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-debian-image-beta-node20.yml b/.github/workflows/build-debian-image-beta-node20.yml index b2368d4..1762135 100644 --- a/.github/workflows/build-debian-image-beta-node20.yml +++ b/.github/workflows/build-debian-image-beta-node20.yml @@ -43,7 +43,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2.5.0 + uses: docker/setup-buildx-action@v2.8.0 - name: Login to DockerHub uses: docker/login-action@v2.1.0 diff --git a/.github/workflows/build-debian-image-beta.yml b/.github/workflows/build-debian-image-beta.yml index 135298b..b3c61fb 100644 --- a/.github/workflows/build-debian-image-beta.yml +++ b/.github/workflows/build-debian-image-beta.yml @@ -43,7 +43,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2.5.0 + uses: docker/setup-buildx-action@v2.8.0 - name: Login to DockerHub uses: docker/login-action@v2.1.0 diff --git a/.github/workflows/build-debian-image-dev-node20.yml b/.github/workflows/build-debian-image-dev-node20.yml index 73dea66..6d0fe52 100644 --- a/.github/workflows/build-debian-image-dev-node20.yml +++ b/.github/workflows/build-debian-image-dev-node20.yml @@ -37,7 +37,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2.5.0 + uses: docker/setup-buildx-action@v2.8.0 - name: Login to DockerHub uses: docker/login-action@v2.1.0 diff --git a/.github/workflows/build-debian-image-dev.yml b/.github/workflows/build-debian-image-dev.yml index ecda6d6..6401f03 100644 --- a/.github/workflows/build-debian-image-dev.yml +++ b/.github/workflows/build-debian-image-dev.yml @@ -37,7 +37,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2.5.0 + uses: docker/setup-buildx-action@v2.8.0 - name: Login to DockerHub uses: docker/login-action@v2.1.0 diff --git a/.github/workflows/build-debian-image-latest-iob.yml b/.github/workflows/build-debian-image-latest-iob.yml index 92b270d..318e4d5 100644 --- a/.github/workflows/build-debian-image-latest-iob.yml +++ b/.github/workflows/build-debian-image-latest-iob.yml @@ -46,7 +46,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2.5.0 + uses: docker/setup-buildx-action@v2.8.0 - name: Login to DockerHub (iobroker) uses: docker/login-action@v2.1.0 diff --git a/.github/workflows/build-debian-image-latest.yml b/.github/workflows/build-debian-image-latest.yml index 4b327b4..190a87d 100644 --- a/.github/workflows/build-debian-image-latest.yml +++ b/.github/workflows/build-debian-image-latest.yml @@ -46,7 +46,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2.5.0 + uses: docker/setup-buildx-action@v2.8.0 - name: Login to DockerHub (buanet) uses: docker/login-action@v2.1.0 with: