diff --git a/.VERSION b/.VERSION index 0e1418a..b568696 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -v9.1.2 +v10.0.0-beta.2 diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index 8f0e998..d7a2d60 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 }} @@ -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.1 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.1 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) diff --git a/.github/workflows/build-debian12-beta_ext.yml b/.github/workflows/build-debian12-beta_ext.yml index 57d32b4..afc2b5c 100644 --- a/.github/workflows/build-debian12-beta_ext.yml +++ b/.github/workflows/build-debian12-beta_ext.yml @@ -15,14 +15,28 @@ 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 + ref: '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 dispatch + 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 }}" }' token: ${{ secrets.ACTIONS_PAT }} diff --git a/.github/workflows/build-debian12-dev.yml b/.github/workflows/build-debian12-dev.yml index 32d52a9..1cc9df5 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' @@ -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.1 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.1 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 }} diff --git a/.github/workflows/build-debian12-latest.yml b/.github/workflows/build-debian12-latest.yml index cd40f2b..3e8be38 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 }} @@ -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.1 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.1 with: context: ./debian12 file: ./debian12/Dockerfile diff --git a/.github/workflows/build-debian12-latest_ext.yml b/.github/workflows/build-debian12-latest_ext.yml new file mode 100644 index 0000000..27f8873 --- /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 + 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/.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 507fecb..2a32ecf 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 }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 37d1389..7982964 100644 --- 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 diff --git a/debian12/Dockerfile b/debian12/Dockerfile index 1a84bfa..03aa51c 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 @@ -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" \ 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