fix typo

Bump docker/build-push-action from 6.5.0 to 6.6.0

.VERSION

@@ -1 +1 @@
-v10.0.0-beta.1
+v10.0.0-beta.2

.github/workflows/build-debian12-beta.yml

@@ -50,27 +50,27 @@ 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
-        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
+        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 }}
           password: ${{ secrets.PACKAGES_PASS }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v6.3.0
+        uses: docker/build-push-action@v6.6.0
         with:
           context: ./debian12
           file: ./debian12/Dockerfile
@@ -122,27 +122,27 @@ 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
-          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
+          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 }}
             password: ${{ secrets.PACKAGES_PASS }}
 
         - name: Build and push Docker image
-          uses: docker/build-push-action@v6.3.0
+          uses: docker/build-push-action@v6.6.0
           with:
             context: ./debian12
             file: ./debian12/Dockerfile

.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: refs/heads/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: refs/heads/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 }}

.github/workflows/build-debian12-dev.yml

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

.github/workflows/build-debian12-latest.yml

@@ -44,27 +44,27 @@ 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
-        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
+        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 }}
           password: ${{ secrets.PACKAGES_PASS }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v6.3.0
+        uses: docker/build-push-action@v6.6.0
         with:
           context: ./debian12
           file: ./debian12/Dockerfile
@@ -120,20 +120,20 @@ 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
-        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
+        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@v6.3.0
+        uses: docker/build-push-action@v6.6.0
         with:
           context: ./debian12
           file: ./debian12/Dockerfile

.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 }}

CHANGELOG.md

@@ -1,6 +1,9 @@
 ## Changelog
 
-### v10.0.0-beta.1 (13.07.2024)
+### 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))

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,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" \