From 1293357477fa4d08697e271881f903a3c2ae05f5 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Thu, 14 Mar 2024 17:26:41 +0000 Subject: [PATCH 1/5] Upgrade debian builds to bullseye --- .docker/Dockerfile.debian | 2 +- docker-custom/Dockerfile.debian | 2 +- docker-custom/docker-debian.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.docker/Dockerfile.debian b/.docker/Dockerfile.debian index 737348c6..48ae21e8 100644 --- a/.docker/Dockerfile.debian +++ b/.docker/Dockerfile.debian @@ -1,5 +1,5 @@ ARG NODE_VERSION=20 -ARG OS=buster-slim +ARG OS=bullseye-slim #### Stage BASE ######################################################################################################## FROM node:${NODE_VERSION}-${OS} AS base diff --git a/docker-custom/Dockerfile.debian b/docker-custom/Dockerfile.debian index 64d201e4..5f067aa5 100644 --- a/docker-custom/Dockerfile.debian +++ b/docker-custom/Dockerfile.debian @@ -1,6 +1,6 @@ ARG ARCH=amd64 ARG NODE_VERSION=20 -ARG OS=buster-slim +ARG OS=bullseye-slim #### Stage BASE ######################################################################################################## FROM ${ARCH}/node:${NODE_VERSION}-${OS} AS base diff --git a/docker-custom/docker-debian.sh b/docker-custom/docker-debian.sh index 553ae650..bdd5bab9 100755 --- a/docker-custom/docker-debian.sh +++ b/docker-custom/docker-debian.sh @@ -9,7 +9,7 @@ docker build --rm --no-cache \ --build-arg ARCH=amd64 \ --build-arg NODE_VERSION=20 \ --build-arg NODE_RED_VERSION=${NODE_RED_VERSION} \ - --build-arg OS=buster-slim \ + --build-arg OS=bullseye-slim \ --build-arg BUILD_DATE="$(date +"%Y-%m-%dT%H:%M:%SZ")" \ --build-arg TAG_SUFFIX=default \ --file Dockerfile.debian \ From beb7dcd9e903f6006f8789859266d6aa439b06f2 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Thu, 14 Mar 2024 17:59:06 +0000 Subject: [PATCH 2/5] Drop armv6 from build --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 59f045f6..924c4591 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -143,7 +143,7 @@ jobs: continue-on-error: true with: context: . - platforms: linux/amd64, linux/arm64, linux/arm/v7, linux/arm/v6 + platforms: linux/amd64, linux/arm64, linux/arm/v7 push: ${{ steps.nrVersion.outputs.push }} file: .docker/Dockerfile.alpine build-args: | From 4c9dc1ca90a9050b2b2f3bd8a7e8a12aecbae6c0 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Thu, 14 Mar 2024 18:09:52 +0000 Subject: [PATCH 3/5] Disable ARMv7 as well :-( --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 924c4591..ecebcd64 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -143,7 +143,7 @@ jobs: continue-on-error: true with: context: . - platforms: linux/amd64, linux/arm64, linux/arm/v7 + platforms: linux/amd64, linux/arm64 push: ${{ steps.nrVersion.outputs.push }} file: .docker/Dockerfile.alpine build-args: | From 15b4a5781480aff01383eb42dccd77f4cd6ce36c Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Thu, 14 Mar 2024 18:35:24 +0000 Subject: [PATCH 4/5] Bump action versions --- .github/workflows/main.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ecebcd64..cdc03e60 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,7 +34,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.2 - name: Show Env run: env - @@ -59,7 +59,8 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Get Date id: date - run: echo "::set-output name=date::$(date +'%Y-%m-%dT%H:%M:%SZ')" + # run: echo "::set-output name=date::$(date +'%Y-%m-%dT%H:%M:%SZ')" + run : echo "data=$(date +'%Y-%m-%dT%H:%M:%SZ')" - name: Get Node-RED Version id: nrVersion run: | @@ -166,19 +167,20 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4.1.2 - name: Setup QEMU uses: docker/setup-qemu-action@v3 - name: Setup Docker buildx uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Get Date id: date - run: echo "::set-output name=date::$(date +'%Y-%m-%dT%H:%M:%SZ')" + # run: echo "::set-output name=date::$(date +'%Y-%m-%dT%H:%M:%SZ')" + run : echo "data=$(date +'%Y-%m-%dT%H:%M:%SZ')" - name: Docker Metadata id: meta uses: docker/metadata-action@v5 From c03b7bb1e6a351484ea07c7d96e4ebbb6a2771ad Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Tue, 14 May 2024 13:39:16 +0100 Subject: [PATCH 5/5] Add NodeJS 22 back to build Also ensure date env var is set --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cdc03e60..c87ef4d0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: - node: [18, 20] + node: [18, 20, 22] suffix: ["", "-minimal"] # Steps represent a sequence of tasks that will be executed as part of the job @@ -60,7 +60,7 @@ jobs: - name: Get Date id: date # run: echo "::set-output name=date::$(date +'%Y-%m-%dT%H:%M:%SZ')" - run : echo "data=$(date +'%Y-%m-%dT%H:%M:%SZ')" + run: echo "date=$(date +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT - name: Get Node-RED Version id: nrVersion run: |