Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .docker/Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NODE_VERSION=20
ARG NODE_VERSION=24
ARG OS=alpine

#### Stage BASE ########################################################################################################
Expand Down
4 changes: 2 additions & 2 deletions .docker/Dockerfile.debian
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG NODE_VERSION=20
ARG OS=bookworm-slim
ARG NODE_VERSION=24
ARG OS=trixie-slim

#### Stage BASE ########################################################################################################
FROM node:${NODE_VERSION}-${OS} AS base
Expand Down
19 changes: 4 additions & 15 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
alpine:
env:
# Setting the defaults up front
LATEST_NODE: 20
LATEST_NODE: 24
DEFAULT_IMAGE: nodered/node-red
GH_IMAGE: ghcr.io/node-red/node-red
DEV_IMAGE: nodered/node-red-dev
Expand Down Expand Up @@ -155,18 +155,7 @@ jobs:
fi
fi

# if [[ "${{ matrix.node }}" == "18"]]; then
# echo "platforms=linux/amd64,linux/arm/v7,linux/arm64" >> $GITHUB_OUTPUT
# else
# echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
# fi

# if [[ "${{ matrix.suffix }}" == "-minimal" ]]; then
# echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
# else
# echo "platforms=linux/amd64,linux/arm/v7,linux/arm64" >> $GITHUB_OUTPUT
# fi
echo "platforms=linux/amd64,linux/arm/v7,linux/arm64" >> $GITHUB_OUTPUT
echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT

echo $TAGS
echo "tags=$TAGS" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -215,7 +204,7 @@ jobs:
debian:
env:
# Setting the defaults up front
LATEST_NODE: 20
LATEST_NODE: 24
DEFAULT_IMAGE: nodered/node-red
GH_IMAGE: ghcr.io/node-red/node-red
DEV_IMAGE: nodered/node-red-dev
Expand Down Expand Up @@ -321,7 +310,7 @@ jobs:
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
with:
context: .
platforms: linux/amd64, linux/arm64, linux/arm/v7
platforms: linux/amd64, linux/arm64
file: .docker/Dockerfile.debian
push: ${{ steps.nrVersion.outputs.push }}
build-args: |
Expand Down
2 changes: 1 addition & 1 deletion docker-custom/Dockerfile.custom
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG ARCH=amd64
ARG NODE_VERSION=20
ARG NODE_VERSION=24
ARG OS=alpine

#### Stage BASE ########################################################################################################
Expand Down
4 changes: 2 additions & 2 deletions docker-custom/Dockerfile.debian
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG ARCH=amd64
ARG NODE_VERSION=20
ARG OS=bookworm-slim
ARG NODE_VERSION=24
ARG OS=trixie-slim

#### Stage BASE ########################################################################################################
FROM ${ARCH}/node:${NODE_VERSION}-${OS} AS base
Expand Down