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