Skip to content

Commit

Permalink
Merge pull request #453 from buanet/beta
Browse files Browse the repository at this point in the history
Merge Hotfix v9.1.2 into main
  • Loading branch information
buanet authored Apr 5, 2024
2 parents 74e3789 + bfe581d commit b7465c5
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v9.1.1
v9.1.2
20 changes: 10 additions & 10 deletions .github/workflows/build-debian12-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

- name: Checkout repo
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
repository: 'buanet/ioBroker.docker'
ref: ${{ env.RELEASE_TAG }}
Expand Down Expand Up @@ -54,23 +54,23 @@ jobs:

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

- name: Login to DockerHub
uses: docker/login-action@v3.0.0
uses: docker/login-action@v3.1.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.1.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@v5.3.0
with:
context: ./debian12
file: ./debian12/Dockerfile
Expand All @@ -96,7 +96,7 @@ jobs:
run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

- name: Checkout repo
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
repository: 'buanet/ioBroker.docker'
ref: ${{ env.RELEASE_TAG }}
Expand Down Expand Up @@ -126,23 +126,23 @@ jobs:

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

- name: Login to DockerHub
uses: docker/login-action@v3.0.0
uses: docker/login-action@v3.1.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.1.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@v5.3.0
with:
context: ./debian12
file: ./debian12/Dockerfile
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/build-debian12-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
repository: 'buanet/ioBroker.docker'

Expand Down Expand Up @@ -48,23 +48,23 @@ jobs:

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

- name: Login to DockerHub
uses: docker/login-action@v3.0.0
uses: docker/login-action@v3.1.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.1.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@v5.3.0
with:
context: ./debian12
file: ./debian12/Dockerfile
Expand All @@ -85,7 +85,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
repository: 'buanet/ioBroker.docker'

Expand Down Expand Up @@ -114,23 +114,23 @@ jobs:

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

- name: Login to DockerHub
uses: docker/login-action@v3.0.0
uses: docker/login-action@v3.1.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.1.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@v5.3.0
with:
context: ./debian12
file: ./debian12/Dockerfile
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/build-debian12-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
echo "RELEASE_TAG=$LATESTRELEASE" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
repository: 'buanet/ioBroker.docker'
ref: ${{ env.RELEASE_TAG }}
Expand Down Expand Up @@ -48,23 +48,23 @@ jobs:

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

- name: Login to DockerHub (buanet)
uses: docker/login-action@v3.0.0
uses: docker/login-action@v3.1.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.1.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@v5.3.0
with:
context: ./debian12
file: ./debian12/Dockerfile
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
echo "RELEASE_TAG=$LATESTRELEASE" >> $GITHUB_ENV
- name: Checkout repo
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
repository: 'buanet/ioBroker.docker'
ref: ${{ env.RELEASE_TAG }}
Expand Down Expand Up @@ -124,16 +124,16 @@ jobs:

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

- name: Login to DockerHub (buanet)
uses: docker/login-action@v3.0.0
uses: docker/login-action@v3.1.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@v5.3.0
with:
context: ./debian12
file: ./debian12/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-docker-readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
update-docker-readme:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].2

- name: Update Docker Hub Readme (buanet)
uses: peter-evans/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/version-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
repository: 'buanet/ioBroker.docker'
token: ${{ secrets.ACTIONS_PAT }}
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## Changelog

### v9.1.2 (05.04.2024)
* fix build process by updating npm to latest

### v9.1.1 (24.01.2024)
* fix node js setup

Expand Down
4 changes: 4 additions & 0 deletions debian12/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ RUN apt-get update && apt-get upgrade -y \
&& 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
Expand Down

0 comments on commit b7465c5

Please sign in to comment.