fix typo

Add build date and cleanup dockerfile
Merge pull request #484 from buanet/dependabot/github_actions/beta/docker/build-push-action-6.6.0
2025-12-18 02:49:01 +02:00 · 2024-08-07 22:19:20 +02:00 · 2024-08-07 22:14:04 +02:00 · 2024-08-07 20:51:25 +02:00 · 2024-08-07 09:51:47 +00:00 · 2024-08-01 23:38:31 +02:00
18 changed files with 144 additions and 87 deletions
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v9.1.2
+v10.0.0-beta.2
--- a/.github/dependencies/.admin-version
+++ b/.github/dependencies/.admin-version
@@ -1 +1 @@
-6.13.16
+6.12.0
--- a/.github/dependencies/.backitup-version
+++ b/.github/dependencies/.backitup-version
@@ -1 +1 @@
-2.10.11
+2.9.8
--- a/.github/dependencies/.discovery-version
+++ b/.github/dependencies/.discovery-version
@@ -1 +1 @@
-4.4.0
+4.2.0
--- a/.github/dependencies/.js-controller-version
+++ b/.github/dependencies/.js-controller-version
@@ -1 +1 @@
-5.0.19
+5.0.17
--- a/.github/dependencies/.nodejs-version
+++ b/.github/dependencies/.nodejs-version
@@ -1 +1 @@
-v18.20.1
+18.17.1
--- 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 }}
@@ -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,31 +46,31 @@ 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
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v3.2.0

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v3.2.0
+        uses: docker/setup-buildx-action@v3.6.1

      - name: Login to DockerHub
-        uses: docker/login-action@v3.1.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.1.0
+        uses: docker/login-action@v3.3.0
        with:
          registry: ghcr.io
          username: ${{ secrets.PACKAGES_USER }}
          password: ${{ secrets.PACKAGES_PASS }}

      - name: Build and push Docker image
-        uses: docker/build-push-action@v5.3.0
+        uses: docker/build-push-action@v6.6.0
        with:
          context: ./debian12
          file: ./debian12/Dockerfile
@@ -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 }}
@@ -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,31 +118,31 @@ 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
-          uses: docker/setup-qemu-action@v3.0.0
+          uses: docker/setup-qemu-action@v3.2.0

        - name: Set up Docker Buildx
          id: buildx
-          uses: docker/setup-buildx-action@v3.2.0
+          uses: docker/setup-buildx-action@v3.6.1

        - name: Login to DockerHub
-          uses: docker/login-action@v3.1.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.1.0
+          uses: docker/login-action@v3.3.0
          with:
            registry: ghcr.io
            username: ${{ secrets.PACKAGES_USER }}
            password: ${{ secrets.PACKAGES_PASS }}

        - name: Build and push Docker image
-          uses: docker/build-push-action@v5.3.0
+          uses: docker/build-push-action@v6.6.0
          with:
            context: ./debian12
            file: ./debian12/Dockerfile
@@ -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)
--- a/.github/workflows/build-debian12-beta_ext.yml
+++ b/.github/workflows/build-debian12-beta_ext.yml
@@ -0,0 +1,42 @@
+# 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_on_release:
+    if: github.event_name == 'release'
+    runs-on: ubuntu-latest
+    steps:
+      - 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" }'
+          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: '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 }}
--- 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'

@@ -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,31 +40,31 @@ 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
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v3.2.0

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v3.2.0
+        uses: docker/setup-buildx-action@v3.6.1

      - name: Login to DockerHub
-        uses: docker/login-action@v3.1.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.1.0
+        uses: docker/login-action@v3.3.0
        with:
          registry: ghcr.io
          username: ${{ secrets.PACKAGES_USER }}
          password: ${{ secrets.PACKAGES_PASS }}

      - name: Build and push Docker image
-        uses: docker/build-push-action@v5.3.0
+        uses: docker/build-push-action@v6.6.0
        with:
          context: ./debian12
          file: ./debian12/Dockerfile
@@ -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'
@@ -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'

@@ -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,31 +106,31 @@ 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
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v3.2.0

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v3.2.0
+        uses: docker/setup-buildx-action@v3.6.1

      - name: Login to DockerHub
-        uses: docker/login-action@v3.1.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.1.0
+        uses: docker/login-action@v3.3.0
        with:
          registry: ghcr.io
          username: ${{ secrets.PACKAGES_USER }}
          password: ${{ secrets.PACKAGES_PASS }}

      - name: Build and push Docker image
-        uses: docker/build-push-action@v5.3.0
+        uses: docker/build-push-action@v6.6.0
        with:
          context: ./debian12
          file: ./debian12/Dockerfile
@@ -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 }}
--- 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 }}
@@ -44,27 +44,27 @@ 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.2.0

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v3.2.0
+        uses: docker/setup-buildx-action@v3.6.1

      - name: Login to DockerHub (buanet)
-        uses: docker/login-action@v3.1.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.1.0
+        uses: docker/login-action@v3.3.0
        with:
          registry: ghcr.io
          username: ${{ secrets.PACKAGES_USER }}
          password: ${{ secrets.PACKAGES_PASS }}

      - name: Build and push Docker image
-        uses: docker/build-push-action@v5.3.0
+        uses: docker/build-push-action@v6.6.0
        with:
          context: ./debian12
          file: ./debian12/Dockerfile
@@ -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 }}
@@ -120,20 +120,20 @@ 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.2.0

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v3.2.0
+        uses: docker/setup-buildx-action@v3.6.1

      - name: Login to DockerHub (buanet)
-        uses: docker/login-action@v3.1.0
+        uses: docker/login-action@v3.3.0
        with:
          username: ${{ secrets.DOCKER_USER_IOB }}
          password: ${{ secrets.DOCKER_PASS_IOB }}

      - name: Build and push Docker image
-        uses: docker/build-push-action@v5.3.0
+        uses: docker/build-push-action@v6.6.0
        with:
          context: ./debian12
          file: ./debian12/Dockerfile
--- a/.github/workflows/build-debian12-latest_ext.yml
+++ 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 }}
--- 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
--- 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 }}
@@ -43,8 +43,8 @@ jobs:
          curl -sL https://repo.iobroker.live/sources-dist.json | \
          jq -r '."discovery".version' > .github/dependencies/.discovery-version
          echo "[LOG] Fetched discovery version is $(cat .github/dependencies/.discovery-version)"
-          curl -sL https://nodejs.org/dist/index.json | \
-          jq -r 'map(select(.version | startswith("v18."))) | .[0].version' > .github/dependencies/.nodejs-version
+          curl -sL "https://deb.nodesource.com/node_18.x/dists/bullseye/main/binary-amd64/Packages" | \
+          awk -F ': ' '/^Version:/ {split($2,a,"-"); print a[1]}' > .github/dependencies/.nodejs-version
          echo "[LOG] Fetched nodejs version is $(cat .github/dependencies/.nodejs-version)"

      - name: Check for modified files
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 ## Changelog

+### v10.0.0-beta.2 (07.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

--- 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
@@ -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,12 +46,16 @@ 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 - \
+    && 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 \
@@ -92,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" \
--- 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
--- a/docs/README_docker_hub_buanet.md
+++ b/docs/README_docker_hub_buanet.md
@@ -35,9 +35,7 @@ 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.1.2`](https://github.com/buanet/ioBroker.docker/blob/v9.1.2/debian12/Dockerfile), [`latest-v9`](https://github.com/buanet/ioBroker.docker/blob/v9.1.2/debian12/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v9.1.2/debian12/Dockerfile)
-* [`v9.1.1`](https://github.com/buanet/ioBroker.docker/blob/v9.1.1/debian12/Dockerfile)
-* [`v9.1.0`](https://github.com/buanet/ioBroker.docker/blob/v9.1.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)
--- a/docs/README_docker_hub_iobroker.md
+++ b/docs/README_docker_hub_iobroker.md
@@ -37,9 +37,7 @@ 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.1.2`](https://github.com/buanet/ioBroker.docker/blob/v9.1.2/debian12/Dockerfile), [`latest-v9`](https://github.com/buanet/ioBroker.docker/blob/v9.1.2/debian12/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v9.1.2/debian12/Dockerfile)
-* [`v9.1.1`](https://github.com/buanet/ioBroker.docker/blob/v9.1.1/debian12/Dockerfile)
-* [`v9.1.0`](https://github.com/buanet/ioBroker.docker/blob/v9.1.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)
 * [`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),
Author	SHA1	Message	Date
buanet	06de6675d9	fix typo	2024-08-07 22:19:20 +02:00
buanet	870980ccce	Add build date and cleanup dockerfile	2024-08-07 22:14:04 +02:00
André Germann	51a25bb2db	Merge pull request #484 from buanet/dependabot/github_actions/beta/docker/build-push-action-6.6.0 Bump docker/build-push-action from 6.5.0 to 6.6.0	2024-08-07 20:51:25 +02:00
dependabot[bot]	434ac84f0c	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] <support@github.com>	2024-08-07 09:51:47 +00:00
André Germann	56fd73aedf	Merge pull request #477 from buanet/dependabot/github_actions/beta/docker/setup-qemu-action-3.2.0 Bump docker/setup-qemu-action from 3.1.0 to 3.2.0	2024-08-01 23:38:31 +02:00
André Germann	4058b4098a	Merge pull request #478 from buanet/dependabot/github_actions/beta/docker/login-action-3.3.0 Bump docker/login-action from 3.2.0 to 3.3.0	2024-08-01 23:38:21 +02:00
André Germann	3a22d5e146	Merge pull request #480 from buanet/dependabot/github_actions/beta/docker/build-push-action-6.5.0 Bump docker/build-push-action from 6.3.0 to 6.5.0	2024-08-01 23:37:48 +02:00
André Germann	da56dc48b3	Merge pull request #482 from buanet/dependabot/github_actions/beta/docker/setup-buildx-action-3.6.1 Bump docker/setup-buildx-action from 3.4.0 to 3.6.1	2024-08-01 23:37:31 +02:00
dependabot[bot]	f46849d4dd	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] <support@github.com>	2024-07-30 09:12:27 +00:00
dependabot[bot]	f0d8013ff6	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] <support@github.com>	2024-07-23 09:31:40 +00:00
dependabot[bot]	3910a604e1	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] <support@github.com>	2024-07-22 09:33:21 +00:00
dependabot[bot]	5a8d251652	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] <support@github.com>	2024-07-22 09:33:18 +00:00
buanet	b934d8bb5c	testing	2024-07-15 01:18:32 +02:00
buanet	2416960d6b	update ref	2024-07-15 00:06:56 +02:00
buanet	926f5dd88f	fix legacy key value format	2024-07-14 23:38:30 +02:00
buanet	f0a8644a7d	new node version variables for beta and dev build	2024-07-13 23:40:11 +02:00
André Germann	f78a2be83f	Merge pull request #472 from buanet/dependabot/github_actions/beta/docker/setup-qemu-action-3.1.0 Bump docker/setup-qemu-action from 3.0.0 to 3.1.0	2024-07-13 23:23:44 +02:00
André Germann	d9b6141b80	Merge pull request #473 from buanet/dependabot/github_actions/beta/docker/setup-buildx-action-3.4.0 Bump docker/setup-buildx-action from 3.3.0 to 3.4.0	2024-07-13 23:23:29 +02:00
buanet	28f5e54109	update external trigger	2024-07-13 23:20:58 +02:00
buanet	0e1ff982cf	add trigger workflow	2024-07-13 23:06:01 +02:00
dependabot[bot]	1891d34934	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] <support@github.com>	2024-07-04 09:09:37 +00:00
dependabot[bot]	40f1fa1fd7	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] <support@github.com>	2024-07-04 09:09:34 +00:00
buanet	b5bd5ff529	testing multi arch build	2024-07-03 23:12:06 +02:00
buanet	4d1b79ee53	prepare v10 beta	2024-07-03 22:38:52 +02:00
André Germann	9252643fe7	Merge pull request #471 from buanet/dependabot/github_actions/beta/docker/build-push-action-6.3.0 Bump docker/build-push-action from 6.0.1 to 6.3.0	2024-07-03 22:19:44 +02:00
dependabot[bot]	776e5aa36d	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] <support@github.com>	2024-07-03 09:57:42 +00:00
André Germann	bef837b476	Merge pull request #467 from buanet/dependabot/github_actions/beta/docker/build-push-action-6.0.1 Bump docker/build-push-action from 5.4.0 to 6.0.1	2024-06-20 22:11:00 +02:00
dependabot[bot]	6a2e6498ed	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] <support@github.com>	2024-06-19 09:51:59 +00:00
André Germann	801413e579	Merge pull request #454 from buanet/dependabot/github_actions/beta/docker/setup-buildx-action-3.3.0 Bump docker/setup-buildx-action from 3.2.0 to 3.3.0	2024-06-16 22:23:34 +02:00
André Germann	0acf0995ea	Merge pull request #461 from buanet/dependabot/github_actions/beta/docker/login-action-3.2.0 Bump docker/login-action from 3.1.0 to 3.2.0	2024-06-16 22:23:23 +02:00
André Germann	b4c9e9bca1	Merge pull request #462 from buanet/dependabot/github_actions/beta/docker/build-push-action-5.4.0 Bump docker/build-push-action from 5.3.0 to 5.4.0	2024-06-16 22:23:13 +02:00
André Germann	6858374b83	Merge pull request #464 from buanet/dependabot/github_actions/beta/actions/checkout-4.1.7 Bump actions/checkout from 4.1.2 to 4.1.7	2024-06-16 22:23:01 +02:00
dependabot[bot]	3f67dbc162	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] <support@github.com>	2024-06-13 09:09:43 +00:00
dependabot[bot]	aaeb0119f4	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] <support@github.com>	2024-06-10 09:18:28 +00:00
dependabot[bot]	004b5757ea	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] <support@github.com>	2024-05-28 09:05:43 +00:00
buanet	b2895098bc	testing	2024-05-22 18:56:52 +02:00
buanet	13cb29bed7	testing	2024-05-22 18:56:17 +02:00
buanet	dc9908c3ba	testing	2024-05-22 18:13:31 +02:00
dependabot[bot]	17db723eb7	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] <support@github.com>	2024-04-08 09:32:45 +00:00
buanet	c9a4a11265	improve logging for failed database check	2024-04-06 00:25:20 +02:00
@@ -1 +1 @@
 .13.16
 .12.0
@@ -1 +1 @@
 .10.11
 .9.8
@@ -1 +1 @@
 .4.0
 .2.0
@@ -1 +1 @@
 .0.19
 .0.17