From c9a4a11265f662242933c9a448c179515217d4e9 Mon Sep 17 00:00:00 2001 From: buanet Date: Sat, 6 Apr 2024 00:25:20 +0200 Subject: [PATCH 01/32] improve logging for failed database check --- .VERSION | 2 +- CHANGELOG.md | 3 +++ debian12/scripts/iobroker_startup.sh | 8 +++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.VERSION b/.VERSION index 0e1418a..f3aee88 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -v9.1.2 +v9.2.0-beta.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 37d1389..af02215 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## Changelog +### v9.2.0-beta.1 (coming soon) +* improve logging for failed database check ([#411](https://github.com/buanet/ioBroker.docker/issues/411)) + ### v9.1.2 (05.04.2024) * fix build process by updating npm to latest diff --git a/debian12/scripts/iobroker_startup.sh b/debian12/scripts/iobroker_startup.sh index 3cb51e2..dd09505 100644 --- a/debian12/scripts/iobroker_startup.sh +++ b/debian12/scripts/iobroker_startup.sh @@ -343,12 +343,10 @@ else echo "Done." echo " " else - errormsg=$(gosu iobroker iob uuid 2>&1 | sed 's/^/[DEBUG] /') echo "Failed." - if [[ "$debug" == "true" ]]; then - echo "[DEBUG] Error message: " - echo "$errormsg" - fi + errormsg=$(gosu iobroker iob uuid 2>&1 | sed 's/^/[ERROR] /') + echo "$errormsg" + echo " " echo "Please check your configuration and try again." echo "For more information see ioBroker Docker image docs (https://docs.buanet.de/iobroker-docker-image/docs)." stop_on_error From 17db723eb781efc0d0d8314c4973696fa0ae275e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 09:32:45 +0000 Subject: [PATCH 02/32] Bump docker/setup-buildx-action from 3.2.0 to 3.3.0 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v3.2.0...v3.3.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-debian12-beta.yml | 4 ++-- .github/workflows/build-debian12-dev.yml | 4 ++-- .github/workflows/build-debian12-latest.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index 8f0e998..39547d7 100644 --- a/.github/workflows/build-debian12-beta.yml +++ b/.github/workflows/build-debian12-beta.yml @@ -54,7 +54,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.2.0 + uses: docker/setup-buildx-action@v3.3.0 - name: Login to DockerHub uses: docker/login-action@v3.1.0 @@ -126,7 +126,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.2.0 + uses: docker/setup-buildx-action@v3.3.0 - name: Login to DockerHub uses: docker/login-action@v3.1.0 diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index 32d52a9..b694d75 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -48,7 +48,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.2.0 + uses: docker/setup-buildx-action@v3.3.0 - name: Login to DockerHub uses: docker/login-action@v3.1.0 @@ -114,7 +114,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.2.0 + uses: docker/setup-buildx-action@v3.3.0 - name: Login to DockerHub uses: docker/login-action@v3.1.0 diff --git a/.github/workflows/build-debian12-latest.yml b/.github/workflows/build-debian12-latest.yml index cd40f2b..0f83f5f 100644 --- a/.github/workflows/build-debian12-latest.yml +++ b/.github/workflows/build-debian12-latest.yml @@ -48,7 +48,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.2.0 + uses: docker/setup-buildx-action@v3.3.0 - name: Login to DockerHub (buanet) uses: docker/login-action@v3.1.0 @@ -124,7 +124,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.2.0 + uses: docker/setup-buildx-action@v3.3.0 - name: Login to DockerHub (buanet) uses: docker/login-action@v3.1.0 From dc9908c3bab6b7bc971764a54afbbe43a8c3ae80 Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 22 May 2024 18:13:31 +0200 Subject: [PATCH 03/32] testing --- debian12/Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/debian12/Dockerfile b/debian12/Dockerfile index 1a84bfa..f027ec0 100644 --- a/debian12/Dockerfile +++ b/debian12/Dockerfile @@ -39,17 +39,17 @@ RUN apt-get update && apt-get upgrade -y \ udev \ wget \ # 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 \ - && 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 \ + #&& 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 \ + #&& 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 \ # Temp Fix (check/log npm version, update npm to latest) - && npm -v \ - && npm install -g npm@latest \ - && npm -v \ + #&& npm -v \ + #&& npm install -g npm@latest \ + #&& npm -v \ # Install node-gyp - && npm install --production -g node-gyp \ + #&& npm install --production -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 \ From 13cb29bed78a6a6d7b5bb929a6e70dcd7c1eb1ff Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 22 May 2024 18:56:17 +0200 Subject: [PATCH 04/32] testing --- debian12/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/debian12/Dockerfile b/debian12/Dockerfile index f027ec0..a0b0273 100644 --- a/debian12/Dockerfile +++ b/debian12/Dockerfile @@ -63,7 +63,12 @@ RUN apt-get update && apt-get upgrade -y \ && mkdir /opt/scripts/.docker_config \ && echo "${VERSION}" > /opt/scripts/.docker_config/.thisisdocker \ # Run iobroker installer - && curl -sL https://iobroker.net/install.sh | bash - \ + #&& curl -sL https://iobroker.net/install.sh | bash - \ + # Temp Testing + && curl -sL https://iobroker.net/install.sh -o install.sh \ + && sed -i 's/NODE_MAJOR=[0-9]\+/NODE_MAJOR=${NODE}/' install.sh \ + && sed -i 's|NODE_JS_BREW_URL=.*|NODE_JS_BREW_URL="https://nodejs.org"|' install.sh \ + && bash install.sh # Deleting UUID from build && iobroker unsetup -y \ && echo "true" > /opt/iobroker/.fresh_install \ From b2895098bc3136a5429708d29e6ca1bd1532e08f Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 22 May 2024 18:56:52 +0200 Subject: [PATCH 05/32] testing --- debian12/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian12/Dockerfile b/debian12/Dockerfile index a0b0273..b417826 100644 --- a/debian12/Dockerfile +++ b/debian12/Dockerfile @@ -68,7 +68,7 @@ RUN apt-get update && apt-get upgrade -y \ && curl -sL https://iobroker.net/install.sh -o install.sh \ && sed -i 's/NODE_MAJOR=[0-9]\+/NODE_MAJOR=${NODE}/' install.sh \ && sed -i 's|NODE_JS_BREW_URL=.*|NODE_JS_BREW_URL="https://nodejs.org"|' install.sh \ - && bash install.sh + && bash install.sh \ # Deleting UUID from build && iobroker unsetup -y \ && echo "true" > /opt/iobroker/.fresh_install \ From 004b5757eae1c17ccd910ba1d2f1d54e80e44e54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 09:05:43 +0000 Subject: [PATCH 06/32] Bump docker/login-action from 3.1.0 to 3.2.0 Bumps [docker/login-action](https://github.com/docker/login-action) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v3.1.0...v3.2.0) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build-debian12-beta.yml | 8 ++++---- .github/workflows/build-debian12-dev.yml | 8 ++++---- .github/workflows/build-debian12-latest.yml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index 8f0e998..ab11048 100644 --- a/.github/workflows/build-debian12-beta.yml +++ b/.github/workflows/build-debian12-beta.yml @@ -57,13 +57,13 @@ jobs: uses: docker/setup-buildx-action@v3.2.0 - name: Login to DockerHub - uses: docker/login-action@v3.1.0 + uses: docker/login-action@v3.2.0 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASS }} - name: Login to GitHub Container Registry - uses: docker/login-action@v3.1.0 + uses: docker/login-action@v3.2.0 with: registry: ghcr.io username: ${{ secrets.PACKAGES_USER }} @@ -129,13 +129,13 @@ jobs: uses: docker/setup-buildx-action@v3.2.0 - name: Login to DockerHub - uses: docker/login-action@v3.1.0 + uses: docker/login-action@v3.2.0 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASS }} - name: Login to GitHub Container Registry - uses: docker/login-action@v3.1.0 + uses: docker/login-action@v3.2.0 with: registry: ghcr.io username: ${{ secrets.PACKAGES_USER }} diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index 32d52a9..8da52b1 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -51,13 +51,13 @@ jobs: uses: docker/setup-buildx-action@v3.2.0 - name: Login to DockerHub - uses: docker/login-action@v3.1.0 + uses: docker/login-action@v3.2.0 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASS }} - name: Login to GitHub Container Registry - uses: docker/login-action@v3.1.0 + uses: docker/login-action@v3.2.0 with: registry: ghcr.io username: ${{ secrets.PACKAGES_USER }} @@ -117,13 +117,13 @@ jobs: uses: docker/setup-buildx-action@v3.2.0 - name: Login to DockerHub - uses: docker/login-action@v3.1.0 + uses: docker/login-action@v3.2.0 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASS }} - name: Login to GitHub Container Registry - uses: docker/login-action@v3.1.0 + uses: docker/login-action@v3.2.0 with: registry: ghcr.io username: ${{ secrets.PACKAGES_USER }} diff --git a/.github/workflows/build-debian12-latest.yml b/.github/workflows/build-debian12-latest.yml index cd40f2b..cbd9d82 100644 --- a/.github/workflows/build-debian12-latest.yml +++ b/.github/workflows/build-debian12-latest.yml @@ -51,13 +51,13 @@ jobs: uses: docker/setup-buildx-action@v3.2.0 - name: Login to DockerHub (buanet) - uses: docker/login-action@v3.1.0 + uses: docker/login-action@v3.2.0 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASS }} - name: Login to GitHub Container Registry - uses: docker/login-action@v3.1.0 + uses: docker/login-action@v3.2.0 with: registry: ghcr.io username: ${{ secrets.PACKAGES_USER }} @@ -127,7 +127,7 @@ jobs: uses: docker/setup-buildx-action@v3.2.0 - name: Login to DockerHub (buanet) - uses: docker/login-action@v3.1.0 + uses: docker/login-action@v3.2.0 with: username: ${{ secrets.DOCKER_USER_IOB }} password: ${{ secrets.DOCKER_PASS_IOB }} From aaeb0119f4181305327a25626d801c267feaf5f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 09:18:28 +0000 Subject: [PATCH 07/32] Bump docker/build-push-action from 5.3.0 to 5.4.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5.3.0 to 5.4.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v5.3.0...v5.4.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build-debian12-beta.yml | 4 ++-- .github/workflows/build-debian12-dev.yml | 4 ++-- .github/workflows/build-debian12-latest.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index 8f0e998..000edf5 100644 --- a/.github/workflows/build-debian12-beta.yml +++ b/.github/workflows/build-debian12-beta.yml @@ -70,7 +70,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v5.3.0 + uses: docker/build-push-action@v5.4.0 with: context: ./debian12 file: ./debian12/Dockerfile @@ -142,7 +142,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v5.3.0 + uses: docker/build-push-action@v5.4.0 with: context: ./debian12 file: ./debian12/Dockerfile diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index 32d52a9..596df68 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -64,7 +64,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v5.3.0 + uses: docker/build-push-action@v5.4.0 with: context: ./debian12 file: ./debian12/Dockerfile @@ -130,7 +130,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v5.3.0 + uses: docker/build-push-action@v5.4.0 with: context: ./debian12 file: ./debian12/Dockerfile diff --git a/.github/workflows/build-debian12-latest.yml b/.github/workflows/build-debian12-latest.yml index cd40f2b..fb3d72f 100644 --- a/.github/workflows/build-debian12-latest.yml +++ b/.github/workflows/build-debian12-latest.yml @@ -64,7 +64,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v5.3.0 + uses: docker/build-push-action@v5.4.0 with: context: ./debian12 file: ./debian12/Dockerfile @@ -133,7 +133,7 @@ jobs: password: ${{ secrets.DOCKER_PASS_IOB }} - name: Build and push Docker image - uses: docker/build-push-action@v5.3.0 + uses: docker/build-push-action@v5.4.0 with: context: ./debian12 file: ./debian12/Dockerfile From 3f67dbc16273e76021e7d21a79f7f69bef9babc3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:09:43 +0000 Subject: [PATCH 08/32] Bump actions/checkout from 4.1.2 to 4.1.7 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.2 to 4.1.7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.2...v4.1.7) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build-debian12-beta.yml | 4 ++-- .github/workflows/build-debian12-dev.yml | 4 ++-- .github/workflows/build-debian12-latest.yml | 4 ++-- .github/workflows/update-docker-readme.yml | 2 +- .github/workflows/version-checks.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index 8f0e998..d956011 100644 --- a/.github/workflows/build-debian12-beta.yml +++ b/.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.2 + uses: actions/checkout@v4.1.7 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.2 + uses: actions/checkout@v4.1.7 with: repository: 'buanet/ioBroker.docker' ref: ${{ env.RELEASE_TAG }} diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index 32d52a9..f32ae61 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.7 with: repository: 'buanet/ioBroker.docker' @@ -85,7 +85,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.7 with: repository: 'buanet/ioBroker.docker' diff --git a/.github/workflows/build-debian12-latest.yml b/.github/workflows/build-debian12-latest.yml index cd40f2b..b7ffa75 100644 --- a/.github/workflows/build-debian12-latest.yml +++ b/.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.2 + uses: actions/checkout@v4.1.7 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.2 + uses: actions/checkout@v4.1.7 with: repository: 'buanet/ioBroker.docker' ref: ${{ env.RELEASE_TAG }} diff --git a/.github/workflows/update-docker-readme.yml b/.github/workflows/update-docker-readme.yml index dd096c3..f415248 100644 --- a/.github/workflows/update-docker-readme.yml +++ b/.github/workflows/update-docker-readme.yml @@ -12,7 +12,7 @@ jobs: update-docker-readme: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4.1.2 + - uses: actions/checkout@v4.1.7 - name: Update Docker Hub Readme (buanet) uses: peter-evans/dockerhub-description@v4.0.0 diff --git a/.github/workflows/version-checks.yml b/.github/workflows/version-checks.yml index 21f5c96..2c1fb93 100644 --- a/.github/workflows/version-checks.yml +++ b/.github/workflows/version-checks.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.7 with: repository: 'buanet/ioBroker.docker' token: ${{ secrets.ACTIONS_PAT }} From 6a2e6498ed02b3ee0c81d631cb6d4703c4ee8fac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 09:51:59 +0000 Subject: [PATCH 09/32] Bump docker/build-push-action from 5.4.0 to 6.0.1 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5.4.0 to 6.0.1. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v5.4.0...v6.0.1) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-debian12-beta.yml | 4 ++-- .github/workflows/build-debian12-dev.yml | 4 ++-- .github/workflows/build-debian12-latest.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index b857f7b..c6098ea 100644 --- a/.github/workflows/build-debian12-beta.yml +++ b/.github/workflows/build-debian12-beta.yml @@ -70,7 +70,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v5.4.0 + uses: docker/build-push-action@v6.0.1 with: context: ./debian12 file: ./debian12/Dockerfile @@ -142,7 +142,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v5.4.0 + uses: docker/build-push-action@v6.0.1 with: context: ./debian12 file: ./debian12/Dockerfile diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index 6a60c81..6c78fc1 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -64,7 +64,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v5.4.0 + uses: docker/build-push-action@v6.0.1 with: context: ./debian12 file: ./debian12/Dockerfile @@ -130,7 +130,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v5.4.0 + uses: docker/build-push-action@v6.0.1 with: context: ./debian12 file: ./debian12/Dockerfile diff --git a/.github/workflows/build-debian12-latest.yml b/.github/workflows/build-debian12-latest.yml index 048391b..f7b113b 100644 --- a/.github/workflows/build-debian12-latest.yml +++ b/.github/workflows/build-debian12-latest.yml @@ -64,7 +64,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v5.4.0 + uses: docker/build-push-action@v6.0.1 with: context: ./debian12 file: ./debian12/Dockerfile @@ -133,7 +133,7 @@ jobs: password: ${{ secrets.DOCKER_PASS_IOB }} - name: Build and push Docker image - uses: docker/build-push-action@v5.4.0 + uses: docker/build-push-action@v6.0.1 with: context: ./debian12 file: ./debian12/Dockerfile From 776e5aa36d21a6523abe3cab4bfd1d22a5d2951e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 09:57:42 +0000 Subject: [PATCH 10/32] Bump docker/build-push-action from 6.0.1 to 6.3.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.0.1 to 6.3.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.0.1...v6.3.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build-debian12-beta.yml | 4 ++-- .github/workflows/build-debian12-dev.yml | 4 ++-- .github/workflows/build-debian12-latest.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index c6098ea..c513771 100644 --- a/.github/workflows/build-debian12-beta.yml +++ b/.github/workflows/build-debian12-beta.yml @@ -70,7 +70,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.0.1 + uses: docker/build-push-action@v6.3.0 with: context: ./debian12 file: ./debian12/Dockerfile @@ -142,7 +142,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.0.1 + uses: docker/build-push-action@v6.3.0 with: context: ./debian12 file: ./debian12/Dockerfile diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index 6c78fc1..b43577a 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -64,7 +64,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.0.1 + uses: docker/build-push-action@v6.3.0 with: context: ./debian12 file: ./debian12/Dockerfile @@ -130,7 +130,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.0.1 + uses: docker/build-push-action@v6.3.0 with: context: ./debian12 file: ./debian12/Dockerfile diff --git a/.github/workflows/build-debian12-latest.yml b/.github/workflows/build-debian12-latest.yml index f7b113b..8adc592 100644 --- a/.github/workflows/build-debian12-latest.yml +++ b/.github/workflows/build-debian12-latest.yml @@ -64,7 +64,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.0.1 + uses: docker/build-push-action@v6.3.0 with: context: ./debian12 file: ./debian12/Dockerfile @@ -133,7 +133,7 @@ jobs: password: ${{ secrets.DOCKER_PASS_IOB }} - name: Build and push Docker image - uses: docker/build-push-action@v6.0.1 + uses: docker/build-push-action@v6.3.0 with: context: ./debian12 file: ./debian12/Dockerfile From 4d1b79ee5359edcf55dcae2ee5fd221f563286e1 Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 3 Jul 2024 22:38:52 +0200 Subject: [PATCH 11/32] prepare v10 beta --- .VERSION | 2 +- .github/workflows/build-debian12-dev.yml | 8 ++++---- CHANGELOG.md | 5 ++++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.VERSION b/.VERSION index f3aee88..b4069f4 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -v9.2.0-beta.1 +v10.0.0-beta.1 diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index b43577a..171c0e7 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -71,8 +71,8 @@ jobs: push: true platforms: | linux/amd64 - linux/arm64/v8 - linux/arm/v7 +# linux/arm64/v8 +# linux/arm/v7 tags: | buanet/iobroker:dev, buanet/iobroker:dev-node${{ vars.RECOMMENDED_NODE_VERSION }}, @@ -137,8 +137,8 @@ jobs: push: true platforms: | linux/amd64 - linux/arm64/v8 - linux/arm/v7 +# linux/arm64/v8 +# linux/arm/v7 tags: | buanet/iobroker:dev-node${{ vars.EXPERIMENTAL_NODE_VERSION }}, ghcr.io/buanet/iobroker:dev-node${{ vars.EXPERIMENTAL_NODE_VERSION }} diff --git a/CHANGELOG.md b/CHANGELOG.md index af02215..1642457 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ ## Changelog -### v9.2.0-beta.1 (coming soon) +### v10.0.0-beta.1 (coming soon) +* upgrade node version to recommended node20 +* remove dedicated node setup from dockerfile * improve logging for failed database check ([#411](https://github.com/buanet/ioBroker.docker/issues/411)) +* rework build process due to problems with github actions ### v9.1.2 (05.04.2024) * fix build process by updating npm to latest From b5bd5ff529fcd253ce2aa5bd97fd4cb50ba5bb0a Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 3 Jul 2024 23:12:06 +0200 Subject: [PATCH 12/32] testing multi arch build --- .github/workflows/build-debian12-dev.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index 171c0e7..b43577a 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -71,8 +71,8 @@ jobs: push: true platforms: | linux/amd64 -# linux/arm64/v8 -# linux/arm/v7 + linux/arm64/v8 + linux/arm/v7 tags: | buanet/iobroker:dev, buanet/iobroker:dev-node${{ vars.RECOMMENDED_NODE_VERSION }}, @@ -137,8 +137,8 @@ jobs: push: true platforms: | linux/amd64 -# linux/arm64/v8 -# linux/arm/v7 + linux/arm64/v8 + linux/arm/v7 tags: | buanet/iobroker:dev-node${{ vars.EXPERIMENTAL_NODE_VERSION }}, ghcr.io/buanet/iobroker:dev-node${{ vars.EXPERIMENTAL_NODE_VERSION }} From 40f1fa1fd727b1cefd1898ef93e837e6a8209ecd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 09:09:34 +0000 Subject: [PATCH 13/32] Bump docker/setup-qemu-action from 3.0.0 to 3.1.0 Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v3.0.0...v3.1.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-debian12-beta.yml | 4 ++-- .github/workflows/build-debian12-dev.yml | 4 ++-- .github/workflows/build-debian12-latest.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index c513771..18b5ea9 100644 --- a/.github/workflows/build-debian12-beta.yml +++ b/.github/workflows/build-debian12-beta.yml @@ -50,7 +50,7 @@ jobs: mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v3.0.0 + uses: docker/setup-qemu-action@v3.1.0 - name: Set up Docker Buildx id: buildx @@ -122,7 +122,7 @@ jobs: mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v3.0.0 + uses: docker/setup-qemu-action@v3.1.0 - name: Set up Docker Buildx id: buildx diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index b43577a..c8099fd 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -44,7 +44,7 @@ jobs: mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v3.0.0 + uses: docker/setup-qemu-action@v3.1.0 - name: Set up Docker Buildx id: buildx @@ -110,7 +110,7 @@ jobs: mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v3.0.0 + uses: docker/setup-qemu-action@v3.1.0 - name: Set up Docker Buildx id: buildx diff --git a/.github/workflows/build-debian12-latest.yml b/.github/workflows/build-debian12-latest.yml index 8adc592..49e198d 100644 --- a/.github/workflows/build-debian12-latest.yml +++ b/.github/workflows/build-debian12-latest.yml @@ -44,7 +44,7 @@ jobs: mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v3.0.0 + uses: docker/setup-qemu-action@v3.1.0 - name: Set up Docker Buildx id: buildx @@ -120,7 +120,7 @@ jobs: mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v3.0.0 + uses: docker/setup-qemu-action@v3.1.0 - name: Set up Docker Buildx id: buildx From 1891d3493469547d57ad2c5ebe11b9a8d177e0bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 09:09:37 +0000 Subject: [PATCH 14/32] Bump docker/setup-buildx-action from 3.3.0 to 3.4.0 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v3.3.0...v3.4.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-debian12-beta.yml | 4 ++-- .github/workflows/build-debian12-dev.yml | 4 ++-- .github/workflows/build-debian12-latest.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index c513771..81e5fd4 100644 --- a/.github/workflows/build-debian12-beta.yml +++ b/.github/workflows/build-debian12-beta.yml @@ -54,7 +54,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.3.0 + uses: docker/setup-buildx-action@v3.4.0 - name: Login to DockerHub uses: docker/login-action@v3.2.0 @@ -126,7 +126,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.3.0 + uses: docker/setup-buildx-action@v3.4.0 - name: Login to DockerHub uses: docker/login-action@v3.2.0 diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index b43577a..bd8e28f 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -48,7 +48,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.3.0 + uses: docker/setup-buildx-action@v3.4.0 - name: Login to DockerHub uses: docker/login-action@v3.2.0 @@ -114,7 +114,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.3.0 + uses: docker/setup-buildx-action@v3.4.0 - name: Login to DockerHub uses: docker/login-action@v3.2.0 diff --git a/.github/workflows/build-debian12-latest.yml b/.github/workflows/build-debian12-latest.yml index 8adc592..2c9d552 100644 --- a/.github/workflows/build-debian12-latest.yml +++ b/.github/workflows/build-debian12-latest.yml @@ -48,7 +48,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.3.0 + uses: docker/setup-buildx-action@v3.4.0 - name: Login to DockerHub (buanet) uses: docker/login-action@v3.2.0 @@ -124,7 +124,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.3.0 + uses: docker/setup-buildx-action@v3.4.0 - name: Login to DockerHub (buanet) uses: docker/login-action@v3.2.0 From 0e1ff982cf199b50729c84953e40e5dc0d27ea01 Mon Sep 17 00:00:00 2001 From: buanet Date: Sat, 13 Jul 2024 23:06:01 +0200 Subject: [PATCH 15/32] add trigger workflow --- .github/workflows/build-debian12-beta_ext.yml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/build-debian12-beta_ext.yml diff --git a/.github/workflows/build-debian12-beta_ext.yml b/.github/workflows/build-debian12-beta_ext.yml new file mode 100644 index 0000000..57d32b4 --- /dev/null +++ b/.github/workflows/build-debian12-beta_ext.yml @@ -0,0 +1,28 @@ +# Github action to trigger external Debian12 image build (Tag: beta) +name: Trigger external Build (beta) + +on: + release: + types: [prereleased] + workflow_dispatch: + inputs: + chose_node_version: + type: choice + description: 'Which Node version should be used?' + options: + - 'Recommended Node version (default)' + - 'Experimental Node version' + - 'Both Node versions' + +jobs: + trigger_beta_build: + runs-on: ubuntu-latest + steps: + - name: Trigger build (beta) + uses: benc-uk/workflow-dispatch@v1.2 + with: + ref: refs/heads/main + workflow: iob.docker - Build Debian 12 Image (beta) + repo: buanet/private.actionsrunner + inputs: '{ "chose_node_version": "${{ inputs.chose_node_version }}" }' + token: ${{ secrets.ACTIONS_PAT }} From 28f5e5410922b597dc760bb4c463aafbc215a417 Mon Sep 17 00:00:00 2001 From: buanet Date: Sat, 13 Jul 2024 23:20:58 +0200 Subject: [PATCH 16/32] update external trigger --- .github/workflows/build-debian12-beta_ext.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-debian12-beta_ext.yml b/.github/workflows/build-debian12-beta_ext.yml index 57d32b4..3f7214b 100644 --- a/.github/workflows/build-debian12-beta_ext.yml +++ b/.github/workflows/build-debian12-beta_ext.yml @@ -15,10 +15,24 @@ on: - 'Both Node versions' jobs: - trigger_beta_build: + trigger_beta_build_on_release: + if: github.event_name == 'release' runs-on: ubuntu-latest steps: - - name: Trigger build (beta) + - name: Trigger beta build on release + uses: benc-uk/workflow-dispatch@v1.2 + with: + ref: refs/heads/main + workflow: iob.docker - Build Debian 12 Image (beta) + repo: buanet/private.actionsrunner + inputs: '{ "chose_node_version": "Both Node versions" }' + token: ${{ secrets.ACTIONS_PAT }} + + trigger_beta_build_manual: + if: github.event_name == 'workflow_dispatch' + runs-on: ubuntu-latest + steps: + - name: Trigger beta build on release uses: benc-uk/workflow-dispatch@v1.2 with: ref: refs/heads/main From f0a8644a7de90cbb0f2bcdb0edfd1ae50eb4d550 Mon Sep 17 00:00:00 2001 From: buanet Date: Sat, 13 Jul 2024 23:40:11 +0200 Subject: [PATCH 17/32] new node version variables for beta and dev build --- .github/workflows/build-debian12-beta.yml | 16 ++++++++-------- .github/workflows/build-debian12-dev.yml | 16 ++++++++-------- CHANGELOG.md | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index 5c382e6..4f8f8ec 100644 --- a/.github/workflows/build-debian12-beta.yml +++ b/.github/workflows/build-debian12-beta.yml @@ -35,7 +35,7 @@ jobs: MAJORVERSION="$(cat .VERSION | cut -c 1-2 | sed -r 's#^(.{0})#\1latest-#')" DATI="$(date --rfc-3339=seconds | sed 's/ /T/')" # Log output and export as Github environment variable - echo "[LOG] Nodejs Version: ${{ vars.RECOMMENDED_NODE_VERSION }}" + echo "[LOG] Nodejs Version: ${{ vars.RECOMMENDED_NODE_VERSION_BETA }}" echo "[LOG] Image Version: $VERSION" echo "version=$VERSION" >> $GITHUB_ENV echo "[LOG] Major Image Version: $MAJORVERSION" @@ -46,7 +46,7 @@ jobs: sed -e "s/\${VERSION}/$VERSION/" -e "s/\${BUILD}/$DATI/" ./debian12/scripts/iobroker_startup.sh > ./debian12/scripts/iobroker_startup.tmp mv -f ./debian12/scripts/iobroker_startup.tmp ./debian12/scripts/iobroker_startup.sh # Set values in Dockerfile - sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.RECOMMENDED_NODE_VERSION }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp + sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.RECOMMENDED_NODE_VERSION_BETA }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile - name: Set up QEMU @@ -107,7 +107,7 @@ jobs: MAJORVERSION="$(cat .VERSION | cut -c 1-2 | sed -r 's#^(.{0})#\1latest-#')" DATI="$(date --rfc-3339=seconds | sed 's/ /T/')" # Log output and export as Github environment variable - echo "[LOG] Nodejs Version: ${{ vars.EXPERIMENTAL_NODE_VERSION }}" + echo "[LOG] Nodejs Version: ${{ vars.EXPERIMENTAL_NODE_VERSION_BETA }}" echo "[LOG] Image Version: $VERSION" echo "version=$VERSION" >> $GITHUB_ENV echo "[LOG] Major Image Version: $MAJORVERSION" @@ -118,7 +118,7 @@ jobs: sed -e "s/\${VERSION}/$VERSION/" -e "s/\${BUILD}/$DATI/" ./debian12/scripts/iobroker_startup.sh > ./debian12/scripts/iobroker_startup.tmp mv -f ./debian12/scripts/iobroker_startup.tmp ./debian12/scripts/iobroker_startup.sh # Set values in Dockerfile - sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.EXPERIMENTAL_NODE_VERSION }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp + sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.EXPERIMENTAL_NODE_VERSION_BETA }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile - name: Set up QEMU @@ -152,9 +152,9 @@ jobs: linux/arm64/v8 linux/arm/v7 tags: | - buanet/iobroker:beta-node${{ vars.EXPERIMENTAL_NODE_VERSION }}, - buanet/iobroker:${{ env.version }}-node${{ vars.EXPERIMENTAL_NODE_VERSION }}, - ghcr.io/buanet/iobroker:beta-node${{ vars.EXPERIMENTAL_NODE_VERSION }}, - ghcr.io/buanet/iobroker:${{ env.version }}-node${{ vars.EXPERIMENTAL_NODE_VERSION }} + buanet/iobroker:beta-node${{ vars.EXPERIMENTAL_NODE_VERSION_BETA }}, + buanet/iobroker:${{ env.version }}-node${{ vars.EXPERIMENTAL_NODE_VERSION_BETA }}, + ghcr.io/buanet/iobroker:beta-node${{ vars.EXPERIMENTAL_NODE_VERSION_BETA }}, + ghcr.io/buanet/iobroker:${{ env.version }}-node${{ vars.EXPERIMENTAL_NODE_VERSION_BETA }} provenance: false outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=Official Docker image for ioBroker smarthome software (https://www.iobroker.net) diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index 4f56c29..6fe3892 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -29,7 +29,7 @@ jobs: MAJORVERSION="$(cat .VERSION | cut -c 1-2 | sed -r 's#^(.{0})#\1latest-#')" DATI="$(date --rfc-3339=seconds | sed 's/ /T/')" # Log output and export as Github environment variable - echo "[LOG] Nodejs Version: ${{ vars.RECOMMENDED_NODE_VERSION }}" + echo "[LOG] Nodejs Version: ${{ vars.RECOMMENDED_NODE_VERSION_BETA }}" echo "[LOG] Image Version: $VERSION" echo "version=$VERSION" >> $GITHUB_ENV echo "[LOG] Major Image Version: $MAJORVERSION" @@ -40,7 +40,7 @@ jobs: sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${BUILD}/$DATI/" ./debian12/scripts/iobroker_startup.sh > ./debian12/scripts/iobroker_startup.tmp mv -f ./debian12/scripts/iobroker_startup.tmp ./debian12/scripts/iobroker_startup.sh # Set values in Dockerfile - sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.RECOMMENDED_NODE_VERSION }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp + sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.RECOMMENDED_NODE_VERSION_BETA }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile - name: Set up QEMU @@ -75,9 +75,9 @@ jobs: linux/arm/v7 tags: | buanet/iobroker:dev, - buanet/iobroker:dev-node${{ vars.RECOMMENDED_NODE_VERSION }}, + buanet/iobroker:dev-node${{ vars.RECOMMENDED_NODE_VERSION_BETA }}, ghcr.io/buanet/iobroker:dev, - ghcr.io/buanet/iobroker:dev-node${{ vars.RECOMMENDED_NODE_VERSION }} + ghcr.io/buanet/iobroker:dev-node${{ vars.RECOMMENDED_NODE_VERSION_BETA }} build-with-experimental-node: if: inputs.chose_node_version == 'Experimental Node version' || inputs.chose_node_version == 'Both Node versions' @@ -95,7 +95,7 @@ jobs: MAJORVERSION="$(cat .VERSION | cut -c 1-2 | sed -r 's#^(.{0})#\1latest-#')" DATI="$(date --rfc-3339=seconds | sed 's/ /T/')" # Log output and export as Github environment variable - echo "[LOG] Nodejs Version: ${{ vars.EXPERIMENTAL_NODE_VERSION }}" + echo "[LOG] Nodejs Version: ${{ vars.EXPERIMENTAL_NODE_VERSION_BETA }}" echo "[LOG] Image Version: $VERSION" echo "version=$VERSION" >> $GITHUB_ENV echo "[LOG] Major Image Version: $MAJORVERSION" @@ -106,7 +106,7 @@ jobs: sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${BUILD}/$DATI/" ./debian12/scripts/iobroker_startup.sh > ./debian12/scripts/iobroker_startup.tmp mv -f ./debian12/scripts/iobroker_startup.tmp ./debian12/scripts/iobroker_startup.sh # Set values in Dockerfile - sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.EXPERIMENTAL_NODE_VERSION }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp + sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" -e "s/\${NODE}/${{ vars.EXPERIMENTAL_NODE_VERSION_BETA }}/" ./debian12/Dockerfile > ./debian12/Dockerfile.tmp mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile - name: Set up QEMU @@ -140,5 +140,5 @@ jobs: linux/arm64/v8 linux/arm/v7 tags: | - buanet/iobroker:dev-node${{ vars.EXPERIMENTAL_NODE_VERSION }}, - ghcr.io/buanet/iobroker:dev-node${{ vars.EXPERIMENTAL_NODE_VERSION }} + buanet/iobroker:dev-node${{ vars.EXPERIMENTAL_NODE_VERSION_BETA }}, + ghcr.io/buanet/iobroker:dev-node${{ vars.EXPERIMENTAL_NODE_VERSION_BETA }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 1642457..ea05efa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## Changelog -### v10.0.0-beta.1 (coming soon) +### v10.0.0-beta.1 (13.07.2024) * upgrade node version to recommended node20 * remove dedicated node setup from dockerfile * improve logging for failed database check ([#411](https://github.com/buanet/ioBroker.docker/issues/411)) From 926f5dd88fd9a663f882dffbbff9ff79234b94bb Mon Sep 17 00:00:00 2001 From: buanet Date: Sun, 14 Jul 2024 23:38:30 +0200 Subject: [PATCH 18/32] fix legacy key value format --- debian12/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian12/Dockerfile b/debian12/Dockerfile index b417826..a88553e 100644 --- a/debian12/Dockerfile +++ b/debian12/Dockerfile @@ -10,7 +10,7 @@ LABEL org.opencontainers.image.title="Official ioBroker Docker Image" \ org.opencontainers.image.version="${VERSION}" \ org.opencontainers.image.created="${DATI}" -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND="noninteractive" # Copy files COPY scripts /opt/scripts From 2416960d6b48cbfad9ceac6d94f7b29c0c7cf19f Mon Sep 17 00:00:00 2001 From: buanet Date: Mon, 15 Jul 2024 00:06:56 +0200 Subject: [PATCH 19/32] update ref --- .github/workflows/build-debian12-beta_ext.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-debian12-beta_ext.yml b/.github/workflows/build-debian12-beta_ext.yml index 3f7214b..98109ba 100644 --- a/.github/workflows/build-debian12-beta_ext.yml +++ b/.github/workflows/build-debian12-beta_ext.yml @@ -22,7 +22,7 @@ jobs: - name: Trigger beta build on release uses: benc-uk/workflow-dispatch@v1.2 with: - ref: refs/heads/main + ref: main workflow: iob.docker - Build Debian 12 Image (beta) repo: buanet/private.actionsrunner inputs: '{ "chose_node_version": "Both Node versions" }' @@ -35,7 +35,7 @@ jobs: - name: Trigger beta build on release uses: benc-uk/workflow-dispatch@v1.2 with: - ref: refs/heads/main + ref: main workflow: iob.docker - Build Debian 12 Image (beta) repo: buanet/private.actionsrunner inputs: '{ "chose_node_version": "${{ inputs.chose_node_version }}" }' From b934d8bb5c7de35b1fa349857ac20ebb60f11556 Mon Sep 17 00:00:00 2001 From: buanet Date: Mon, 15 Jul 2024 01:18:32 +0200 Subject: [PATCH 20/32] testing --- .github/workflows/build-debian12-beta_ext.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-debian12-beta_ext.yml b/.github/workflows/build-debian12-beta_ext.yml index 98109ba..dba5daf 100644 --- a/.github/workflows/build-debian12-beta_ext.yml +++ b/.github/workflows/build-debian12-beta_ext.yml @@ -22,10 +22,10 @@ jobs: - name: Trigger beta build on release uses: benc-uk/workflow-dispatch@v1.2 with: - ref: main - workflow: iob.docker - Build Debian 12 Image (beta) - repo: buanet/private.actionsrunner - inputs: '{ "chose_node_version": "Both Node versions" }' + ref: 'main' + workflow: 'iob.docker - Build Debian 12 Image (beta)' + repo: 'buanet/private.actionsrunner' + inputs: '{ "chose_node_version": "Both Node versions", "ref": "main" }' token: ${{ secrets.ACTIONS_PAT }} trigger_beta_build_manual: @@ -35,8 +35,8 @@ jobs: - name: Trigger beta build on release uses: benc-uk/workflow-dispatch@v1.2 with: - ref: main - workflow: iob.docker - Build Debian 12 Image (beta) - repo: buanet/private.actionsrunner - inputs: '{ "chose_node_version": "${{ inputs.chose_node_version }}" }' + ref: 'main' + workflow: 'iob.docker - Build Debian 12 Image (beta)' + repo: 'buanet/private.actionsrunner' + inputs: '{ "chose_node_version": "${{ inputs.chose_node_version }}", "ref": "main" }' token: ${{ secrets.ACTIONS_PAT }} From 5a8d251652a61d10f553c21e89757df64b159561 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 09:33:18 +0000 Subject: [PATCH 21/32] Bump docker/setup-qemu-action from 3.1.0 to 3.2.0 Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v3.1.0...v3.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-debian12-beta.yml | 4 ++-- .github/workflows/build-debian12-dev.yml | 4 ++-- .github/workflows/build-debian12-latest.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index 4f8f8ec..a161e76 100644 --- a/.github/workflows/build-debian12-beta.yml +++ b/.github/workflows/build-debian12-beta.yml @@ -50,7 +50,7 @@ jobs: mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v3.1.0 + uses: docker/setup-qemu-action@v3.2.0 - name: Set up Docker Buildx id: buildx @@ -122,7 +122,7 @@ jobs: mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v3.1.0 + uses: docker/setup-qemu-action@v3.2.0 - name: Set up Docker Buildx id: buildx diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index 6fe3892..092c8b2 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -44,7 +44,7 @@ jobs: mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v3.1.0 + uses: docker/setup-qemu-action@v3.2.0 - name: Set up Docker Buildx id: buildx @@ -110,7 +110,7 @@ jobs: mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v3.1.0 + uses: docker/setup-qemu-action@v3.2.0 - name: Set up Docker Buildx id: buildx diff --git a/.github/workflows/build-debian12-latest.yml b/.github/workflows/build-debian12-latest.yml index b4c82ee..ff160d1 100644 --- a/.github/workflows/build-debian12-latest.yml +++ b/.github/workflows/build-debian12-latest.yml @@ -44,7 +44,7 @@ jobs: mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v3.1.0 + uses: docker/setup-qemu-action@v3.2.0 - name: Set up Docker Buildx id: buildx @@ -120,7 +120,7 @@ jobs: mv -f ./debian12/Dockerfile.tmp ./debian12/Dockerfile - name: Set up QEMU - uses: docker/setup-qemu-action@v3.1.0 + uses: docker/setup-qemu-action@v3.2.0 - name: Set up Docker Buildx id: buildx From 3910a604e1285b33590ea806439c659c91b2aa38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 09:33:21 +0000 Subject: [PATCH 22/32] Bump docker/login-action from 3.2.0 to 3.3.0 Bumps [docker/login-action](https://github.com/docker/login-action) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v3.2.0...v3.3.0) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build-debian12-beta.yml | 8 ++++---- .github/workflows/build-debian12-dev.yml | 8 ++++---- .github/workflows/build-debian12-latest.yml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index 4f8f8ec..20e816a 100644 --- a/.github/workflows/build-debian12-beta.yml +++ b/.github/workflows/build-debian12-beta.yml @@ -57,13 +57,13 @@ jobs: uses: docker/setup-buildx-action@v3.4.0 - name: Login to DockerHub - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASS }} - name: Login to GitHub Container Registry - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: ghcr.io username: ${{ secrets.PACKAGES_USER }} @@ -129,13 +129,13 @@ jobs: uses: docker/setup-buildx-action@v3.4.0 - name: Login to DockerHub - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASS }} - name: Login to GitHub Container Registry - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: ghcr.io username: ${{ secrets.PACKAGES_USER }} diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index 6fe3892..0934ee4 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -51,13 +51,13 @@ jobs: uses: docker/setup-buildx-action@v3.4.0 - name: Login to DockerHub - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASS }} - name: Login to GitHub Container Registry - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: ghcr.io username: ${{ secrets.PACKAGES_USER }} @@ -117,13 +117,13 @@ jobs: uses: docker/setup-buildx-action@v3.4.0 - name: Login to DockerHub - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASS }} - name: Login to GitHub Container Registry - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: ghcr.io username: ${{ secrets.PACKAGES_USER }} diff --git a/.github/workflows/build-debian12-latest.yml b/.github/workflows/build-debian12-latest.yml index b4c82ee..ee5589b 100644 --- a/.github/workflows/build-debian12-latest.yml +++ b/.github/workflows/build-debian12-latest.yml @@ -51,13 +51,13 @@ jobs: uses: docker/setup-buildx-action@v3.4.0 - name: Login to DockerHub (buanet) - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASS }} - name: Login to GitHub Container Registry - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: registry: ghcr.io username: ${{ secrets.PACKAGES_USER }} @@ -127,7 +127,7 @@ jobs: uses: docker/setup-buildx-action@v3.4.0 - name: Login to DockerHub (buanet) - uses: docker/login-action@v3.2.0 + uses: docker/login-action@v3.3.0 with: username: ${{ secrets.DOCKER_USER_IOB }} password: ${{ secrets.DOCKER_PASS_IOB }} From f0d8013ff68cc461cf70dc20f3c591dcaba54bca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 09:31:40 +0000 Subject: [PATCH 23/32] Bump docker/build-push-action from 6.3.0 to 6.5.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.3.0 to 6.5.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.3.0...v6.5.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build-debian12-beta.yml | 4 ++-- .github/workflows/build-debian12-dev.yml | 4 ++-- .github/workflows/build-debian12-latest.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index 4f8f8ec..dc6f393 100644 --- a/.github/workflows/build-debian12-beta.yml +++ b/.github/workflows/build-debian12-beta.yml @@ -70,7 +70,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.3.0 + uses: docker/build-push-action@v6.5.0 with: context: ./debian12 file: ./debian12/Dockerfile @@ -142,7 +142,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.3.0 + uses: docker/build-push-action@v6.5.0 with: context: ./debian12 file: ./debian12/Dockerfile diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index 6fe3892..d615482 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -64,7 +64,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.3.0 + uses: docker/build-push-action@v6.5.0 with: context: ./debian12 file: ./debian12/Dockerfile @@ -130,7 +130,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.3.0 + uses: docker/build-push-action@v6.5.0 with: context: ./debian12 file: ./debian12/Dockerfile diff --git a/.github/workflows/build-debian12-latest.yml b/.github/workflows/build-debian12-latest.yml index b4c82ee..e8483c1 100644 --- a/.github/workflows/build-debian12-latest.yml +++ b/.github/workflows/build-debian12-latest.yml @@ -64,7 +64,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.3.0 + uses: docker/build-push-action@v6.5.0 with: context: ./debian12 file: ./debian12/Dockerfile @@ -133,7 +133,7 @@ jobs: password: ${{ secrets.DOCKER_PASS_IOB }} - name: Build and push Docker image - uses: docker/build-push-action@v6.3.0 + uses: docker/build-push-action@v6.5.0 with: context: ./debian12 file: ./debian12/Dockerfile From f46849d4ddc7c2694925286214f203c2522e4934 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 09:12:27 +0000 Subject: [PATCH 24/32] Bump docker/setup-buildx-action from 3.4.0 to 3.6.1 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.4.0 to 3.6.1. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v3.4.0...v3.6.1) --- 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-debian12-beta.yml | 4 ++-- .github/workflows/build-debian12-dev.yml | 4 ++-- .github/workflows/build-debian12-latest.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index 4f8f8ec..1cd2d6b 100644 --- a/.github/workflows/build-debian12-beta.yml +++ b/.github/workflows/build-debian12-beta.yml @@ -54,7 +54,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.4.0 + uses: docker/setup-buildx-action@v3.6.1 - name: Login to DockerHub uses: docker/login-action@v3.2.0 @@ -126,7 +126,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.4.0 + uses: docker/setup-buildx-action@v3.6.1 - name: Login to DockerHub uses: docker/login-action@v3.2.0 diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index 6fe3892..1ed10b5 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -48,7 +48,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.4.0 + uses: docker/setup-buildx-action@v3.6.1 - name: Login to DockerHub uses: docker/login-action@v3.2.0 @@ -114,7 +114,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.4.0 + uses: docker/setup-buildx-action@v3.6.1 - name: Login to DockerHub uses: docker/login-action@v3.2.0 diff --git a/.github/workflows/build-debian12-latest.yml b/.github/workflows/build-debian12-latest.yml index b4c82ee..1f5ac94 100644 --- a/.github/workflows/build-debian12-latest.yml +++ b/.github/workflows/build-debian12-latest.yml @@ -48,7 +48,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.4.0 + uses: docker/setup-buildx-action@v3.6.1 - name: Login to DockerHub (buanet) uses: docker/login-action@v3.2.0 @@ -124,7 +124,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v3.4.0 + uses: docker/setup-buildx-action@v3.6.1 - name: Login to DockerHub (buanet) uses: docker/login-action@v3.2.0 From 434ac84f0cc82e1fb0f6eb89ad6da35049efb547 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 09:51:47 +0000 Subject: [PATCH 25/32] Bump docker/build-push-action from 6.5.0 to 6.6.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.5.0 to 6.6.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.5.0...v6.6.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build-debian12-beta.yml | 4 ++-- .github/workflows/build-debian12-dev.yml | 4 ++-- .github/workflows/build-debian12-latest.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index 30c23e5..10e956d 100644 --- a/.github/workflows/build-debian12-beta.yml +++ b/.github/workflows/build-debian12-beta.yml @@ -70,7 +70,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.5.0 + uses: docker/build-push-action@v6.6.0 with: context: ./debian12 file: ./debian12/Dockerfile @@ -142,7 +142,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.5.0 + uses: docker/build-push-action@v6.6.0 with: context: ./debian12 file: ./debian12/Dockerfile diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index d8f5408..25d0130 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -64,7 +64,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.5.0 + uses: docker/build-push-action@v6.6.0 with: context: ./debian12 file: ./debian12/Dockerfile @@ -130,7 +130,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.5.0 + uses: docker/build-push-action@v6.6.0 with: context: ./debian12 file: ./debian12/Dockerfile diff --git a/.github/workflows/build-debian12-latest.yml b/.github/workflows/build-debian12-latest.yml index b74b1c3..3cdda95 100644 --- a/.github/workflows/build-debian12-latest.yml +++ b/.github/workflows/build-debian12-latest.yml @@ -64,7 +64,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.5.0 + uses: docker/build-push-action@v6.6.0 with: context: ./debian12 file: ./debian12/Dockerfile @@ -133,7 +133,7 @@ jobs: password: ${{ secrets.DOCKER_PASS_IOB }} - name: Build and push Docker image - uses: docker/build-push-action@v6.5.0 + uses: docker/build-push-action@v6.6.0 with: context: ./debian12 file: ./debian12/Dockerfile From 870980ccceb9abf8282f1d79dab337ad91c8f3db Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 7 Aug 2024 22:14:04 +0200 Subject: [PATCH 26/32] Add build date and cleanup dockerfile --- .VERSION | 2 +- .../workflows/build-debian12-latest_ext.yml | 19 +++++++++++++++++++ CHANGELOG.md | 13 ++++++++----- debian12/Dockerfile | 18 +++--------------- 4 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 .github/workflows/build-debian12-latest_ext.yml diff --git a/.VERSION b/.VERSION index b4069f4..b568696 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -v10.0.0-beta.1 +v10.0.0-beta.2 diff --git a/.github/workflows/build-debian12-latest_ext.yml b/.github/workflows/build-debian12-latest_ext.yml new file mode 100644 index 0000000..1a8599c --- /dev/null +++ b/.github/workflows/build-debian12-latest_ext.yml @@ -0,0 +1,19 @@ +# Github action to trigger external Debian12 image build (Tag: latest) +name: Trigger external Build (latest) + +on: + release: + types: [released] + workflow_dispatch: + +jobs: + trigger_latest_build_on_release: + runs-on: ubuntu-latest + steps: + - name: Trigger latest build on release + uses: benc-uk/workflow-dispatch@v1.2 + with: + ref: 'main' + workflow: 'iob.docker - Build Debian 12 Image (latest)' + repo: 'buanet/private.actionsrunner' + token: ${{ secrets.ACTIONS_PAT }} diff --git a/CHANGELOG.md b/CHANGELOG.md index ea05efa..ab565a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,13 @@ ## Changelog -### v10.0.0-beta.1 (13.07.2024) -* upgrade node version to recommended node20 -* remove dedicated node setup from dockerfile -* improve logging for failed database check ([#411](https://github.com/buanet/ioBroker.docker/issues/411)) -* rework build process due to problems with github actions +### v10.0.0-beta.2 (08.08.2024) +* add build date to image +* cleanup dockerfile +* v10.0.0-beta.1 (13.07.2024) + * upgrade node version to recommended node20 + * remove dedicated node setup from dockerfile + * improve logging for failed database check ([#411](https://github.com/buanet/ioBroker.docker/issues/411)) + * rework build process due to problems with github actions ### v9.1.2 (05.04.2024) * fix build process by updating npm to latest diff --git a/debian12/Dockerfile b/debian12/Dockerfile index a88553e..03aa51c 100644 --- a/debian12/Dockerfile +++ b/debian12/Dockerfile @@ -38,18 +38,6 @@ RUN apt-get update && apt-get upgrade -y \ tzdata \ udev \ wget \ - # 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 \ - #&& 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 \ - # Temp Fix (check/log npm version, update npm to latest) - #&& npm -v \ - #&& npm install -g npm@latest \ - #&& npm -v \ - # Install node-gyp - #&& npm install --production -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 \ @@ -58,13 +46,12 @@ RUN apt-get update && apt-get upgrade -y \ && mkdir /opt/.docker_config \ && echo "starting" > /opt/.docker_config/.healthcheck \ && echo "${VERSION}" > /opt/.docker_config/.thisisdocker \ + && echo "${DATI}" > /opt/.docker_config/.build \ && echo "true" > /opt/.docker_config/.first_run \ # Prepare old .docker_config (needed until changed in iobroker) && mkdir /opt/scripts/.docker_config \ && echo "${VERSION}" > /opt/scripts/.docker_config/.thisisdocker \ # Run iobroker installer - #&& curl -sL https://iobroker.net/install.sh | bash - \ - # Temp Testing && curl -sL https://iobroker.net/install.sh -o install.sh \ && sed -i 's/NODE_MAJOR=[0-9]\+/NODE_MAJOR=${NODE}/' install.sh \ && sed -i 's|NODE_JS_BREW_URL=.*|NODE_JS_BREW_URL="https://nodejs.org"|' install.sh \ @@ -97,7 +84,8 @@ RUN apt-get update && apt-get upgrade -y \ && rm -rf /tmp/* /var/tmp/* /root/.cache/* /root/.npm/* /var/lib/apt/lists/* # Default environment variables -ENV DEBIAN_FRONTEND="teletype" \ +ENV BUILD="${DATI}" \ + DEBIAN_FRONTEND="teletype" \ LANG="de_DE.UTF-8" \ LANGUAGE="de_DE:de" \ LC_ALL="de_DE.UTF-8" \ From 06de6675d94bd473f0927d9c1b6895261bef7ceb Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 7 Aug 2024 22:19:20 +0200 Subject: [PATCH 27/32] fix typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab565a3..7982964 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## Changelog -### v10.0.0-beta.2 (08.08.2024) +### v10.0.0-beta.2 (07.08.2024) * add build date to image * cleanup dockerfile * v10.0.0-beta.1 (13.07.2024) From 1fb4b5fa66a2bac450697da25ad8dca1e9a0a07d Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 7 Aug 2024 22:27:56 +0200 Subject: [PATCH 28/32] testing build --- .github/workflows/build-debian12-beta_ext.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-debian12-beta_ext.yml b/.github/workflows/build-debian12-beta_ext.yml index dba5daf..b1dcddc 100644 --- a/.github/workflows/build-debian12-beta_ext.yml +++ b/.github/workflows/build-debian12-beta_ext.yml @@ -25,7 +25,7 @@ jobs: ref: 'main' workflow: 'iob.docker - Build Debian 12 Image (beta)' repo: 'buanet/private.actionsrunner' - inputs: '{ "chose_node_version": "Both Node versions", "ref": "main" }' + inputs: '{ "chose_node_version": "Both Node versions" }' token: ${{ secrets.ACTIONS_PAT }} trigger_beta_build_manual: From 37c5ca977853f44324c5fd90d5919bc60c9a88c6 Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 7 Aug 2024 22:29:22 +0200 Subject: [PATCH 29/32] testing --- .github/workflows/build-debian12-beta_ext.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-debian12-beta_ext.yml b/.github/workflows/build-debian12-beta_ext.yml index b1dcddc..8077e96 100644 --- a/.github/workflows/build-debian12-beta_ext.yml +++ b/.github/workflows/build-debian12-beta_ext.yml @@ -38,5 +38,5 @@ jobs: ref: 'main' workflow: 'iob.docker - Build Debian 12 Image (beta)' repo: 'buanet/private.actionsrunner' - inputs: '{ "chose_node_version": "${{ inputs.chose_node_version }}", "ref": "main" }' + inputs: '{ "chose_node_version": "${{ inputs.chose_node_version }}" }' token: ${{ secrets.ACTIONS_PAT }} From ceb56bb9adf692d91a4ceead507f9a5042305c40 Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 7 Aug 2024 22:32:21 +0200 Subject: [PATCH 30/32] fix typo --- .github/workflows/build-debian12-beta_ext.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-debian12-beta_ext.yml b/.github/workflows/build-debian12-beta_ext.yml index 8077e96..0a47e51 100644 --- a/.github/workflows/build-debian12-beta_ext.yml +++ b/.github/workflows/build-debian12-beta_ext.yml @@ -32,7 +32,7 @@ jobs: if: github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest steps: - - name: Trigger beta build on release + - name: Trigger beta build manual uses: benc-uk/workflow-dispatch@v1.2 with: ref: 'main' From 8055e1237234324aebe47a4428ff455dfa8d5cab Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 7 Aug 2024 22:34:48 +0200 Subject: [PATCH 31/32] update ci logging --- .github/workflows/build-debian12-beta_ext.yml | 2 +- .github/workflows/build-debian12-latest_ext.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-debian12-beta_ext.yml b/.github/workflows/build-debian12-beta_ext.yml index 0a47e51..afc2b5c 100644 --- a/.github/workflows/build-debian12-beta_ext.yml +++ b/.github/workflows/build-debian12-beta_ext.yml @@ -32,7 +32,7 @@ jobs: if: github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest steps: - - name: Trigger beta build manual + - name: Trigger beta build on dispatch uses: benc-uk/workflow-dispatch@v1.2 with: ref: 'main' diff --git a/.github/workflows/build-debian12-latest_ext.yml b/.github/workflows/build-debian12-latest_ext.yml index 1a8599c..27f8873 100644 --- a/.github/workflows/build-debian12-latest_ext.yml +++ b/.github/workflows/build-debian12-latest_ext.yml @@ -10,7 +10,7 @@ jobs: trigger_latest_build_on_release: runs-on: ubuntu-latest steps: - - name: Trigger latest build on release + - name: Trigger latest build uses: benc-uk/workflow-dispatch@v1.2 with: ref: 'main' From 17ec58c218833af403b702281c165a85a907adcf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 09:56:04 +0000 Subject: [PATCH 32/32] Bump docker/build-push-action from 6.6.0 to 6.6.1 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.6.0 to 6.6.1. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.6.0...v6.6.1) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build-debian12-beta.yml | 4 ++-- .github/workflows/build-debian12-dev.yml | 4 ++-- .github/workflows/build-debian12-latest.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index 10e956d..d7a2d60 100644 --- a/.github/workflows/build-debian12-beta.yml +++ b/.github/workflows/build-debian12-beta.yml @@ -70,7 +70,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.6.0 + uses: docker/build-push-action@v6.6.1 with: context: ./debian12 file: ./debian12/Dockerfile @@ -142,7 +142,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.6.0 + uses: docker/build-push-action@v6.6.1 with: context: ./debian12 file: ./debian12/Dockerfile diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index 25d0130..1cc9df5 100644 --- a/.github/workflows/build-debian12-dev.yml +++ b/.github/workflows/build-debian12-dev.yml @@ -64,7 +64,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.6.0 + uses: docker/build-push-action@v6.6.1 with: context: ./debian12 file: ./debian12/Dockerfile @@ -130,7 +130,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.6.0 + uses: docker/build-push-action@v6.6.1 with: context: ./debian12 file: ./debian12/Dockerfile diff --git a/.github/workflows/build-debian12-latest.yml b/.github/workflows/build-debian12-latest.yml index 3cdda95..3e8be38 100644 --- a/.github/workflows/build-debian12-latest.yml +++ b/.github/workflows/build-debian12-latest.yml @@ -64,7 +64,7 @@ jobs: password: ${{ secrets.PACKAGES_PASS }} - name: Build and push Docker image - uses: docker/build-push-action@v6.6.0 + uses: docker/build-push-action@v6.6.1 with: context: ./debian12 file: ./debian12/Dockerfile @@ -133,7 +133,7 @@ jobs: password: ${{ secrets.DOCKER_PASS_IOB }} - name: Build and push Docker image - uses: docker/build-push-action@v6.6.0 + uses: docker/build-push-action@v6.6.1 with: context: ./debian12 file: ./debian12/Dockerfile