Compare commits

..

49 Commits

Author SHA1 Message Date
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
André Germann
bfe581df36 Update .VERSION 2024-04-05 09:08:49 +02:00
buanet
c1b43166d1 hotfix beta 2024-04-05 08:15:36 +02:00
buanet
283776f511 preparing hotfix for npm issue 2024-04-05 08:13:54 +02:00
buanet
731a01339c fix 2024-04-05 00:06:17 +02:00
buanet
f575c66883 testing 2024-04-05 00:03:09 +02:00
buanet
8f1fe5b986 testing 2024-04-04 23:54:08 +02:00
buanet
beead83dbf fix typo 2024-04-04 23:51:03 +02:00
buanet
026d050136 temp fix npm test 2024-04-04 23:49:35 +02:00
buanet
5835a0e835 preparation 2024-04-04 21:55:54 +02:00
André Germann
ca43f24804 Merge pull request #447 from buanet/dependabot/github_actions/beta/actions/checkout-4.1.2
Bump actions/checkout from 4.1.1 to 4.1.2
2024-04-04 21:45:01 +02:00
André Germann
e171da0c4e Merge pull request #449 from buanet/dependabot/github_actions/beta/docker/setup-buildx-action-3.2.0
Bump docker/setup-buildx-action from 3.0.0 to 3.2.0
2024-04-04 21:44:06 +02:00
André Germann
c6a0a789f0 Merge pull request #450 from buanet/dependabot/github_actions/beta/docker/login-action-3.1.0
Bump docker/login-action from 3.0.0 to 3.1.0
2024-04-04 21:43:42 +02:00
André Germann
4fee9bf397 Merge pull request #451 from buanet/dependabot/github_actions/beta/docker/build-push-action-5.3.0
Bump docker/build-push-action from 5.1.0 to 5.3.0
2024-04-04 21:43:10 +02:00
dependabot[bot]
4c39600957 Bump docker/build-push-action from 5.1.0 to 5.3.0
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5.1.0 to 5.3.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v5.1.0...v5.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-03-14 09:03:26 +00:00
dependabot[bot]
abb803a4ff Bump docker/login-action from 3.0.0 to 3.1.0
Bumps [docker/login-action](https://github.com/docker/login-action) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v3.0.0...v3.1.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-03-14 09:03:23 +00:00
dependabot[bot]
5ca414109b Bump docker/setup-buildx-action from 3.0.0 to 3.2.0
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.0.0 to 3.2.0.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v3.0.0...v3.2.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-03-14 09:03:19 +00:00
dependabot[bot]
05347a1eda Bump actions/checkout from 4.1.1 to 4.1.2
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.1.2.
- [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.1...v4.1.2)

---
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-03-13 09:09:36 +00:00
buanet
ba1c874781 test and fix arm/v7 2024-01-26 13:12:25 +01:00
André Germann
b7dd2a5ec2 test arm v7 build 2024-01-26 12:35:54 +01:00
André Germann
222db010cc Merge pull request #433 from buanet/dependabot/github_actions/beta/peter-evans/dockerhub-description-4.0.0
Bump peter-evans/dockerhub-description from 3.4.2 to 4.0.0
2024-01-26 11:47:46 +01:00
dependabot[bot]
1f04cd3ab8 Bump peter-evans/dockerhub-description from 3.4.2 to 4.0.0
Bumps [peter-evans/dockerhub-description](https://github.com/peter-evans/dockerhub-description) from 3.4.2 to 4.0.0.
- [Release notes](https://github.com/peter-evans/dockerhub-description/releases)
- [Commits](https://github.com/peter-evans/dockerhub-description/compare/v3.4.2...v4.0.0)

---
updated-dependencies:
- dependency-name: peter-evans/dockerhub-description
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-26 09:27:29 +00:00
André Germann
0a21f09e85 Merge pull request #430 from buanet/dependabot/github_actions/beta/mkumatag/container-image-updater-action-1.0.6
Bump mkumatag/container-image-updater-action from 1.0.5 to 1.0.6
2024-01-25 00:07:28 +01:00
André Germann
c6e50c9e1a Merge pull request #432 from buanet/main
Update beta
2024-01-25 00:07:13 +01:00
dependabot[bot]
2dbb5a7c76 Bump mkumatag/container-image-updater-action from 1.0.5 to 1.0.6
Bumps [mkumatag/container-image-updater-action](https://github.com/mkumatag/container-image-updater-action) from 1.0.5 to 1.0.6.
- [Release notes](https://github.com/mkumatag/container-image-updater-action/releases)
- [Commits](https://github.com/mkumatag/container-image-updater-action/compare/v1.0.5...v1.0.6)

---
updated-dependencies:
- dependency-name: mkumatag/container-image-updater-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-23 09:56:43 +00:00
10 changed files with 133 additions and 75 deletions

View File

@@ -1 +1 @@
v9.1.1
v10.0.0-beta.1

View File

@@ -24,7 +24,7 @@ jobs:
run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v4.1.1
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.1.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.0.0
uses: docker/setup-buildx-action@v3.4.0
- name: Login to DockerHub
uses: docker/login-action@v3.0.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.0.0
uses: docker/login-action@v3.2.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.1.0
uses: docker/build-push-action@v6.3.0
with:
context: ./debian12
file: ./debian12/Dockerfile
@@ -78,7 +78,7 @@ jobs:
platforms: |
linux/amd64
linux/arm64/v8
# linux/arm/v7
linux/arm/v7
tags: |
buanet/iobroker:beta,
buanet/iobroker:${{ env.version }},
@@ -96,7 +96,7 @@ jobs:
run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v4.1.1
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.1.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.0.0
uses: docker/setup-buildx-action@v3.4.0
- name: Login to DockerHub
uses: docker/login-action@v3.0.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.0.0
uses: docker/login-action@v3.2.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.1.0
uses: docker/build-push-action@v6.3.0
with:
context: ./debian12
file: ./debian12/Dockerfile
@@ -150,11 +150,11 @@ jobs:
platforms: |
linux/amd64
linux/arm64/v8
# linux/arm/v7
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)

View File

@@ -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: 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
workflow: iob.docker - Build Debian 12 Image (beta)
repo: buanet/private.actionsrunner
inputs: '{ "chose_node_version": "${{ inputs.chose_node_version }}" }'
token: ${{ secrets.ACTIONS_PAT }}

View File

@@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v4.1.1
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.1.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.0.0
uses: docker/setup-buildx-action@v3.4.0
- name: Login to DockerHub
uses: docker/login-action@v3.0.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.0.0
uses: docker/login-action@v3.2.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.1.0
uses: docker/build-push-action@v6.3.0
with:
context: ./debian12
file: ./debian12/Dockerfile
@@ -72,12 +72,12 @@ jobs:
platforms: |
linux/amd64
linux/arm64/v8
# linux/arm/v7
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.1
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.1.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.0.0
uses: docker/setup-buildx-action@v3.4.0
- name: Login to DockerHub
uses: docker/login-action@v3.0.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.0.0
uses: docker/login-action@v3.2.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.1.0
uses: docker/build-push-action@v6.3.0
with:
context: ./debian12
file: ./debian12/Dockerfile
@@ -138,7 +138,7 @@ jobs:
platforms: |
linux/amd64
linux/arm64/v8
# linux/arm/v7
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 }}

View File

@@ -18,7 +18,7 @@ jobs:
echo "RELEASE_TAG=$LATESTRELEASE" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v4.1.1
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.1.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.0.0
uses: docker/setup-buildx-action@v3.4.0
- name: Login to DockerHub (buanet)
uses: docker/login-action@v3.0.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.0.0
uses: docker/login-action@v3.2.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.1.0
uses: docker/build-push-action@v6.3.0
with:
context: ./debian12
file: ./debian12/Dockerfile
@@ -72,7 +72,7 @@ jobs:
platforms: |
linux/amd64
linux/arm64/v8
# linux/arm/v7
linux/arm/v7
tags: |
buanet/iobroker:latest,
buanet/iobroker:${{ env.majorversion }},
@@ -94,7 +94,7 @@ jobs:
echo "RELEASE_TAG=$LATESTRELEASE" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/checkout@v4.1.1
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.1.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.0.0
uses: docker/setup-buildx-action@v3.4.0
- name: Login to DockerHub (buanet)
uses: docker/login-action@v3.0.0
uses: docker/login-action@v3.2.0
with:
username: ${{ secrets.DOCKER_USER_IOB }}
password: ${{ secrets.DOCKER_PASS_IOB }}
- name: Build and push Docker image
uses: docker/build-push-action@v5.1.0
uses: docker/build-push-action@v6.3.0
with:
context: ./debian12
file: ./debian12/Dockerfile
@@ -141,7 +141,7 @@ jobs:
platforms: |
linux/amd64
linux/arm64/v8
# linux/arm/v7
linux/arm/v7
tags: |
iobroker/iobroker:latest,
iobroker/iobroker:${{ env.majorversion }},

View File

@@ -12,10 +12,10 @@ jobs:
update-docker-readme:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.1.1
- uses: actions/checkout@v4.1.7
- name: Update Docker Hub Readme (buanet)
uses: peter-evans/dockerhub-description@v3.4.2
uses: peter-evans/dockerhub-description@v4.0.0
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASS }}
@@ -24,7 +24,7 @@ jobs:
readme-filepath: ./docs/README_docker_hub_buanet.md
- name: Update Docker Hub Readme (iobroker)
uses: peter-evans/dockerhub-description@v3.4.2
uses: peter-evans/dockerhub-description@v4.0.0
with:
username: ${{ secrets.DOCKER_USER_IOB }}
password: ${{ secrets.DOCKER_PASS_IOB }}

View File

@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v4.1.1
uses: actions/checkout@v4.1.7
with:
repository: 'buanet/ioBroker.docker'
token: ${{ secrets.ACTIONS_PAT }}
@@ -24,7 +24,7 @@ jobs:
- name: Docker Baseimage Checker
id: baseimage
uses: mkumatag/container-image-updater-action@v1.0.5
uses: mkumatag/container-image-updater-action@v1.0.6
with:
base-image: '${{ env.baseimage }}'
image: '${{ env.iobroker }}'

View File

@@ -1,5 +1,14 @@
## 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
### v9.1.2 (05.04.2024)
* fix build process by updating npm to latest
### v9.1.1 (24.01.2024)
* fix node js setup

View File

@@ -39,13 +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 \
# 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 \
@@ -59,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 \

View File

@@ -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