From a53b5e9ff2b069d839dffd6428dd5cf982c468e5 Mon Sep 17 00:00:00 2001 From: buanet Date: Fri, 19 Jan 2024 14:42:12 +0100 Subject: [PATCH 1/4] prepare v9.1.0 release --- .VERSION | 2 +- CHANGELOG.md | 16 +++++++++------- docs/README_docker_hub_buanet.md | 4 ++-- docs/README_docker_hub_iobroker.md | 3 ++- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.VERSION b/.VERSION index aac3eaf..8827639 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -v9.1.0-beta.4 \ No newline at end of file +v9.1.0 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index bc590a2..ab61e74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,14 @@ ## Changelog -### v9.1.0-beta.4 (08.01.2023) -* dropping arm/v7 support (temporary) -* add trap for debugging mode ([#421](https://github.com/buanet/ioBroker.docker/issues/421)) -* fix ownership of userscripts ([#423 by @EugenMayer](https://github.com/buanet/ioBroker.docker/pull/423)) -* add strict mode to healthcheck.sh ([#424 by @EugenMayer](https://github.com/buanet/ioBroker.docker/pull/424)) -* fixes for ci process and dockerfile -* remove deprecated files from repo +### v9.1.0 (19.01.2024) +* update docs and ci +* v9.1.0-beta.4 (08.01.2024) + * dropping arm/v7 support (temporary) + * add trap for debugging mode ([#421](https://github.com/buanet/ioBroker.docker/issues/421)) + * fix ownership of userscripts ([#423 by @EugenMayer](https://github.com/buanet/ioBroker.docker/pull/423)) + * add strict mode to healthcheck.sh ([#424 by @EugenMayer](https://github.com/buanet/ioBroker.docker/pull/424)) + * fixes for ci process and dockerfile + * remove deprecated files from repo * v9.1.0-beta.3 (23.11.2023) * add --force to restore in maintenance script * improve shebang in scripts for downgrade and portability diff --git a/docs/README_docker_hub_buanet.md b/docs/README_docker_hub_buanet.md index 4c6b251..ff31094 100644 --- a/docs/README_docker_hub_buanet.md +++ b/docs/README_docker_hub_buanet.md @@ -35,8 +35,8 @@ New major image versions (e.g. v6, v7, v8) usually include a new major version o 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 -* [`v9.0.1`](https://github.com/buanet/ioBroker.docker/blob/v9.0.1/debian12/Dockerfile), [`latest-v9`](https://github.com/buanet/ioBroker.docker/blob/v9.0.1/debian12/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v9.0.1/debian12/Dockerfile) -* [`v9.0.0`](https://github.com/buanet/ioBroker.docker/blob/v9.0.0/debian12/Dockerfile) +* [`v9.1.0`](https://github.com/buanet/ioBroker.docker/blob/v9.1.0/debian12/Dockerfile), [`latest-v9`](https://github.com/buanet/ioBroker.docker/blob/v9.1.0/debian12/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v9.1.0/debian12/Dockerfile) +* [`v9.0.1`](https://github.com/buanet/ioBroker.docker/blob/v9.0.1/debian12/Dockerfile) * [`v8.1.0`](https://github.com/buanet/ioBroker.docker/blob/v8.1.0/debian/node18/Dockerfile), [`latest-v8`](https://github.com/buanet/ioBroker.docker/blob/v8.1.0/debian/node18/Dockerfile), * [`v8.0.1`](https://github.com/buanet/ioBroker.docker/blob/v8.0.1/debian/node18/Dockerfile) * [`v8.0.0`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile) diff --git a/docs/README_docker_hub_iobroker.md b/docs/README_docker_hub_iobroker.md index dae3cc2..0d96388 100644 --- a/docs/README_docker_hub_iobroker.md +++ b/docs/README_docker_hub_iobroker.md @@ -37,7 +37,8 @@ New major image versions (e.g. v6, v7, v8) usually include a new major version o 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 -* [`v9.0.1`](https://github.com/buanet/ioBroker.docker/blob/v9.0.1/debian12/Dockerfile), [`latest-v9`](https://github.com/buanet/ioBroker.docker/blob/v9.0.1/debian12/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v9.0.1/debian12/Dockerfile) +* [`v9.1.0`](https://github.com/buanet/ioBroker.docker/blob/v9.1.0/debian12/Dockerfile), [`latest-v9`](https://github.com/buanet/ioBroker.docker/blob/v9.1.0/debian12/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v9.1.0/debian12/Dockerfile) +* [`v9.0.1`](https://github.com/buanet/ioBroker.docker/blob/v9.0.1/debian12/Dockerfile) * [`v9.0.0`](https://github.com/buanet/ioBroker.docker/blob/v9.0.0/debian12/Dockerfile) * [`v8.1.0`](https://github.com/buanet/ioBroker.docker/blob/v8.1.0/debian/node18/Dockerfile), [`latest-v8`](https://github.com/buanet/ioBroker.docker/blob/v8.1.0/debian/node18/Dockerfile), * [`v8.0.1`](https://github.com/buanet/ioBroker.docker/blob/v8.0.1/debian/node18/Dockerfile) From beb310b693e7e9930b1b50f8c685fdb5bc3ca0de Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 24 Jan 2024 21:00:33 +0100 Subject: [PATCH 2/4] test nodes js fix --- .VERSION | 2 +- CHANGELOG.md | 3 +++ debian12/Dockerfile | 5 ++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.VERSION b/.VERSION index 8827639..5f91e20 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -v9.1.0 \ No newline at end of file +v9.1.1 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index ab61e74..dad0c85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## Changelog +### v9.1.1 (24.01.2024) +* fix node js setup + ### v9.1.0 (19.01.2024) * update docs and ci * v9.1.0-beta.4 (08.01.2024) diff --git a/debian12/Dockerfile b/debian12/Dockerfile index f0b999e..da8d746 100644 --- a/debian12/Dockerfile +++ b/debian12/Dockerfile @@ -39,14 +39,13 @@ RUN apt-get update && apt-get upgrade -y \ udev \ wget \ # teporär - && apt-get install -q -y --no-install-recommends sudo \ + #&& apt-get install -q -y --no-install-recommends sudo \ # Install node && mkdir -p /etc/apt/keyrings \ && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODE}.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ + && echo -e "Package: *\nPin: origin deb.nodesource.com\nPin-Priority: 1001" | tee /etc/apt/preferences.d/nodesource \ && apt-get update && apt-get install -q -y --no-install-recommends nodejs \ - # Check for and install npm if not installed (no longer comes with nodejs? Bug?) - && npm --version || apt-get install -q -y --no-install-recommends npm \ # Install node-gyp && npm install --production -g node-gyp \ # Generating locales From 3ff0cb94e3c4f86eba2cdf114158e14a41526d87 Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 24 Jan 2024 21:08:42 +0100 Subject: [PATCH 3/4] test node fix --- debian12/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian12/Dockerfile b/debian12/Dockerfile index da8d746..a086308 100644 --- a/debian12/Dockerfile +++ b/debian12/Dockerfile @@ -44,7 +44,7 @@ RUN apt-get update && apt-get upgrade -y \ && mkdir -p /etc/apt/keyrings \ && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODE}.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo -e "Package: *\nPin: origin deb.nodesource.com\nPin-Priority: 1001" | tee /etc/apt/preferences.d/nodesource \ + && printf "Package: *\nPin: origin deb.nodesource.com\nPin-Priority: 1001\n" > /etc/apt/preferences.d/nodesource \ && apt-get update && apt-get install -q -y --no-install-recommends nodejs \ # Install node-gyp && npm install --production -g node-gyp \ From e24d7c5c386001d3ce2d70df48c41db0f06d07a3 Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 24 Jan 2024 21:50:00 +0100 Subject: [PATCH 4/4] cleanup --- debian12/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian12/Dockerfile b/debian12/Dockerfile index a086308..8ffa3fe 100644 --- a/debian12/Dockerfile +++ b/debian12/Dockerfile @@ -38,8 +38,6 @@ RUN apt-get update && apt-get upgrade -y \ tzdata \ udev \ wget \ - # teporär - #&& apt-get install -q -y --no-install-recommends sudo \ # Install node && mkdir -p /etc/apt/keyrings \ && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \