Skip to content
Open
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 .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
if: ${{ fromJson(needs.gen-matrix.outputs.matrix) }}
needs: gen-matrix
name: build
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
timeout-minutes: 60
strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion 22/alpine3.22/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
&& case "${alpineArch##*-}" in \
x86_64) ARCH='x64' CHECKSUM="c58109c8da448196f0d811df7a6079748678132067e3b53d01c8c8a4bcd86992" OPENSSL_ARCH=linux-x86_64;; \
x86) OPENSSL_ARCH=linux-elf;; \
aarch64) OPENSSL_ARCH=linux-aarch64;; \
aarch64) ARCH='arm64' CHECKSUM="a099f666cd95c80b838cd7eb4ee2ca1dcd24bfa66cbc0b3c17ebb505d5925438" OPENSSL_ARCH=linux-aarch64;; \
arm*) OPENSSL_ARCH=linux-armv4;; \
ppc64le) OPENSSL_ARCH=linux-ppc64le;; \
s390x) OPENSSL_ARCH=linux-s390x;; \
Expand Down
2 changes: 1 addition & 1 deletion 22/alpine3.23/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
&& case "${alpineArch##*-}" in \
x86_64) ARCH='x64' CHECKSUM="c58109c8da448196f0d811df7a6079748678132067e3b53d01c8c8a4bcd86992" OPENSSL_ARCH=linux-x86_64;; \
x86) OPENSSL_ARCH=linux-elf;; \
aarch64) OPENSSL_ARCH=linux-aarch64;; \
aarch64) ARCH='arm64' CHECKSUM="a099f666cd95c80b838cd7eb4ee2ca1dcd24bfa66cbc0b3c17ebb505d5925438" OPENSSL_ARCH=linux-aarch64;; \
arm*) OPENSSL_ARCH=linux-armv4;; \
ppc64le) OPENSSL_ARCH=linux-ppc64le;; \
s390x) OPENSSL_ARCH=linux-s390x;; \
Expand Down
2 changes: 1 addition & 1 deletion 24/alpine3.22/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
&& case "${alpineArch##*-}" in \
x86_64) ARCH='x64' CHECKSUM="8b75070ed35ef8381548f4396d3cf957fd1449db063f288fe00b0cb64456477f" OPENSSL_ARCH=linux-x86_64;; \
x86) OPENSSL_ARCH=linux-elf;; \
aarch64) OPENSSL_ARCH=linux-aarch64;; \
aarch64) ARCH='arm64' CHECKSUM="e57d7ce7bf7ef95209332b0f6786fe76b662984667841b526911068021793eef" OPENSSL_ARCH=linux-aarch64;; \
arm*) OPENSSL_ARCH=linux-armv4;; \
ppc64le) OPENSSL_ARCH=linux-ppc64le;; \
s390x) OPENSSL_ARCH=linux-s390x;; \
Expand Down
2 changes: 1 addition & 1 deletion 24/alpine3.23/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
&& case "${alpineArch##*-}" in \
x86_64) ARCH='x64' CHECKSUM="8b75070ed35ef8381548f4396d3cf957fd1449db063f288fe00b0cb64456477f" OPENSSL_ARCH=linux-x86_64;; \
x86) OPENSSL_ARCH=linux-elf;; \
aarch64) OPENSSL_ARCH=linux-aarch64;; \
aarch64) ARCH='arm64' CHECKSUM="e57d7ce7bf7ef95209332b0f6786fe76b662984667841b526911068021793eef" OPENSSL_ARCH=linux-aarch64;; \
arm*) OPENSSL_ARCH=linux-armv4;; \
ppc64le) OPENSSL_ARCH=linux-ppc64le;; \
s390x) OPENSSL_ARCH=linux-s390x;; \
Expand Down
2 changes: 1 addition & 1 deletion 25/alpine3.22/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
&& case "${alpineArch##*-}" in \
x86_64) ARCH='x64' CHECKSUM="46dfaea08624f9cb9d439d603784b2751ab4d7700c81c26604c032a4dc4e74a1" OPENSSL_ARCH=linux-x86_64;; \
x86) OPENSSL_ARCH=linux-elf;; \
aarch64) OPENSSL_ARCH=linux-aarch64;; \
aarch64) ARCH='arm64' CHECKSUM="12e66efe36cf4e37564eca51a93949c0dab629c349af89d56beb53e2060151d8" OPENSSL_ARCH=linux-aarch64;; \
arm*) OPENSSL_ARCH=linux-armv4;; \
ppc64le) OPENSSL_ARCH=linux-ppc64le;; \
s390x) OPENSSL_ARCH=linux-s390x;; \
Expand Down
2 changes: 1 addition & 1 deletion 25/alpine3.23/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
&& case "${alpineArch##*-}" in \
x86_64) ARCH='x64' CHECKSUM="46dfaea08624f9cb9d439d603784b2751ab4d7700c81c26604c032a4dc4e74a1" OPENSSL_ARCH=linux-x86_64;; \
x86) OPENSSL_ARCH=linux-elf;; \
aarch64) OPENSSL_ARCH=linux-aarch64;; \
aarch64) ARCH='arm64' CHECKSUM="12e66efe36cf4e37564eca51a93949c0dab629c349af89d56beb53e2060151d8" OPENSSL_ARCH=linux-aarch64;; \
arm*) OPENSSL_ARCH=linux-armv4;; \
ppc64le) OPENSSL_ARCH=linux-ppc64le;; \
s390x) OPENSSL_ARCH=linux-s390x;; \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-alpine.template
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN addgroup -g 1000 node \
&& case "${alpineArch##*-}" in \
x86_64) ARCH='x64' CHECKSUM=CHECKSUM_x64 OPENSSL_ARCH=linux-x86_64;; \
x86) OPENSSL_ARCH=linux-elf;; \
aarch64) OPENSSL_ARCH=linux-aarch64;; \
aarch64) ARCH='arm64' CHECKSUM=CHECKSUM_arm64 OPENSSL_ARCH=linux-aarch64;; \
arm*) OPENSSL_ARCH=linux-armv4;; \
ppc64le) OPENSSL_ARCH=linux-ppc64le;; \
s390x) OPENSSL_ARCH=linux-s390x;; \
Expand Down
18 changes: 16 additions & 2 deletions genMatrix.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,23 @@ const generateBuildMatrix = (filesAdded, filesModified, filesRenamed) => {

const entries = dockerfiles.map(getDockerfileMatrixEntry);

let includes = [];

entries.forEach(entry => {
includes.push({
version: entry.version,
'variant': entry.variant,
os: 'ubuntu-24.04'
});
includes.push({
version: entry.version,
'variant': entry.variant,
os: 'ubuntu-24.04-arm'
});
});
// Return null if there are no entries so we can skip the matrix step
return entries.length
? { include: entries }
return includes.length
? { include: includes }
: null;
};

Expand Down
12 changes: 7 additions & 5 deletions update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,11 @@ function update_node_version() {

if is_alpine "${variant}"; then
alpine_version="${variant#*alpine}"
checksum=$(
curl -sSL --compressed "https://unofficial-builds.nodejs.org/download/release/v${nodeVersion}/SHASUMS256.txt" | grep "node-v${nodeVersion}-linux-x64-musl.tar.xz" | cut -d' ' -f1
)
if [ -z "$checksum" ]; then
SHASUMS256=$(curl -sSL --compressed "https://unofficial-builds.nodejs.org/download/release/v${nodeVersion}/SHASUMS256.txt")
CHECKSUM_x64=$(echo "$SHASUMS256" | grep "node-v${nodeVersion}-linux-x64-musl.tar.xz" | cut -d' ' -f1)
CHECKSUM_arm64=$(echo "$SHASUMS256" | grep "node-v${nodeVersion}-linux-arm64-musl.tar.xz" | cut -d' ' -f1)

if [ -z "$CHECKSUM_x64" ] || [ -z "$CHECKSUM_arm64" ]; then
rm -f "${dockerfile}-tmp"
if [ "${SKIP_ALPINE}" = true ]; then
echo "${nodeVersion} is missing the musl build for ${variant}, but skipping for security release!"
Expand All @@ -153,7 +154,8 @@ function update_node_version() {
fi
else
sed -Ei -e "s/(alpine:)0.0/\\1${alpine_version}/" "${dockerfile}-tmp"
sed -Ei -e "s/CHECKSUM=CHECKSUM_x64/CHECKSUM=\"${checksum}\"/" "${dockerfile}-tmp"
sed -Ei -e "s/CHECKSUM=CHECKSUM_x64/CHECKSUM=\"${CHECKSUM_x64}\"/" "${dockerfile}-tmp"
sed -Ei -e "s/CHECKSUM=CHECKSUM_arm64/CHECKSUM=\"${CHECKSUM_arm64}\"/" "${dockerfile}-tmp"
fi
elif is_debian "${variant}"; then
sed -Ei -e "s/(buildpack-deps:)name/\\1${variant}/" "${dockerfile}-tmp"
Expand Down