From 66f90932cbf78ee9afa795b4a2c99d1ffeeb8808 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:41:52 +0000 Subject: [PATCH 1/5] Bumping version to 4.0.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0c89fc9..cc868b6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.0 \ No newline at end of file +4.0.1 \ No newline at end of file From 5efe007138f18fc36fe7f253a2de58fbe54f7513 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:43:20 +0000 Subject: [PATCH 2/5] Bumping version to 4.1.0 --- VERSION | 2 +- VERSION_MINOR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index cc868b6..99eba4d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.1 \ No newline at end of file +4.1.0 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index 389f774..8a36cd1 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -4.0 \ No newline at end of file +4.1 \ No newline at end of file From ff2119dfc9e1fbaf9b9749854939946b98858db7 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:44:04 +0000 Subject: [PATCH 3/5] Adding NodeJS 24 --- .github/workflows/dev.yml | 2 +- .github/workflows/publish.yml | 4 ++-- 24/ALPINE_MINOR | 1 + 24/Dockerfile | 16 ++++++++++++++++ 24/PKG.url | 1 + 24/overlay/tmp/NODE_BUILD | 1 + 24/overlay/tmp/NODE_MINOR | 1 + 24/overlay/tmp/NODE_PKG | 1 + 24/overlay/tmp/NPM_BUILD | 1 + generate-dockerfiles.sh | 2 +- run.sh | 2 +- test.sh | 2 +- 12 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 24/ALPINE_MINOR create mode 100644 24/Dockerfile create mode 100644 24/PKG.url create mode 100644 24/overlay/tmp/NODE_BUILD create mode 100644 24/overlay/tmp/NODE_MINOR create mode 100644 24/overlay/tmp/NODE_PKG create mode 100644 24/overlay/tmp/NPM_BUILD diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 71c4edd..2220fd3 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - node: [ "16", "17", "18", "19", "20", "21", "22", "23" ] + node: [ "16", "17", "18", "19", "20", "21", "22", "23", "24" ] runs-on: ubuntu-latest steps: - diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 880cddf..0564fd0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - node: [ "16", "17", "18", "19", "20", "21", "22", "23" ] + node: [ "16", "17", "18", "19", "20", "21", "22", "23", "24" ] runs-on: ubuntu-latest steps: - @@ -92,7 +92,7 @@ jobs: - name: Build and push default id: docker_build_default - if: matrix.node == '22' + if: matrix.node == '24' uses: docker/build-push-action@v6 with: context: . diff --git a/24/ALPINE_MINOR b/24/ALPINE_MINOR new file mode 100644 index 0000000..2ef9c66 --- /dev/null +++ b/24/ALPINE_MINOR @@ -0,0 +1 @@ +3.23 \ No newline at end of file diff --git a/24/Dockerfile b/24/Dockerfile new file mode 100644 index 0000000..72d1635 --- /dev/null +++ b/24/Dockerfile @@ -0,0 +1,16 @@ +FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1 + +LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" + +ARG BF_IMAGE +ARG BF_PUBLISHING +ARG BF_VERSION + +EXPOSE 3000 + +COPY ./overlay / +COPY ./23/overlay / + +RUN bf-install + +VOLUME [ "/app/live" ] diff --git a/24/PKG.url b/24/PKG.url new file mode 100644 index 0000000..efede16 --- /dev/null +++ b/24/PKG.url @@ -0,0 +1 @@ +https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.22&repo=&arch=&maintainer= diff --git a/24/overlay/tmp/NODE_BUILD b/24/overlay/tmp/NODE_BUILD new file mode 100644 index 0000000..f55b16c --- /dev/null +++ b/24/overlay/tmp/NODE_BUILD @@ -0,0 +1 @@ +24.11.1-r0 \ No newline at end of file diff --git a/24/overlay/tmp/NODE_MINOR b/24/overlay/tmp/NODE_MINOR new file mode 100644 index 0000000..f677377 --- /dev/null +++ b/24/overlay/tmp/NODE_MINOR @@ -0,0 +1 @@ +24.11.1 \ No newline at end of file diff --git a/24/overlay/tmp/NODE_PKG b/24/overlay/tmp/NODE_PKG new file mode 100644 index 0000000..0c524b7 --- /dev/null +++ b/24/overlay/tmp/NODE_PKG @@ -0,0 +1 @@ +nodejs \ No newline at end of file diff --git a/24/overlay/tmp/NPM_BUILD b/24/overlay/tmp/NPM_BUILD new file mode 100644 index 0000000..f3aaee3 --- /dev/null +++ b/24/overlay/tmp/NPM_BUILD @@ -0,0 +1 @@ +11.6.3-r0 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index f01dfe0..a7d236a 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -7,7 +7,7 @@ docker pull bfren/alpine BASE_VERSION="6.0.1" echo "Base: ${BASE_VERSION}" -NODE_VERSIONS="16 17 18 19 20 21 22 23" +NODE_VERSIONS="16 17 18 19 20 21 22 23 24" for V in ${NODE_VERSIONS} ; do echo "Node.js ${V}" diff --git a/run.sh b/run.sh index 2647cd9..55da164 100755 --- a/run.sh +++ b/run.sh @@ -1,7 +1,7 @@ #!/bin/sh IMAGE=`cat VERSION` -NODE=${1:-22} +NODE=${1:-24} docker buildx build \ --load \ diff --git a/test.sh b/test.sh index a0aeef8..97acc2a 100644 --- a/test.sh +++ b/test.sh @@ -2,7 +2,7 @@ IMAGE=node VERSION=`cat VERSION` -NODE=${1:-22} +NODE=${1:-24} TAG=${IMAGE}-test docker buildx build \ From 02dfd08fac544c05a907847bb3de8b2bff81d696 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:44:26 +0000 Subject: [PATCH 4/5] Using latest base images --- 16/Dockerfile | 2 +- 17/Dockerfile | 2 +- 18/Dockerfile | 2 +- 19/Dockerfile | 2 +- 20/Dockerfile | 2 +- 21/Dockerfile | 2 +- 22/Dockerfile | 2 +- 23/Dockerfile | 2 +- 24/Dockerfile | 4 ++-- 24/PKG.url | 2 +- generate-dockerfiles.sh | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/16/Dockerfile b/16/Dockerfile index 1862149..e485a87 100644 --- a/16/Dockerfile +++ b/16/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.16-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.16-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/17/Dockerfile b/17/Dockerfile index 9c75f9c..7695056 100644 --- a/17/Dockerfile +++ b/17/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.15-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.15-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/18/Dockerfile b/18/Dockerfile index ec29d0e..dd023a7 100644 --- a/18/Dockerfile +++ b/18/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.18-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.18-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/19/Dockerfile b/19/Dockerfile index b6e74e4..f57a155 100644 --- a/19/Dockerfile +++ b/19/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.17-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.17-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/20/Dockerfile b/20/Dockerfile index 1bce0b5..ebb4c65 100644 --- a/20/Dockerfile +++ b/20/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.20-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/21/Dockerfile b/21/Dockerfile index f9d685b..bd29356 100644 --- a/21/Dockerfile +++ b/21/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.20-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/22/Dockerfile b/22/Dockerfile index 4b4ab1a..095dfdf 100644 --- a/22/Dockerfile +++ b/22/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/23/Dockerfile b/23/Dockerfile index 72d1635..e442237 100644 --- a/23/Dockerfile +++ b/23/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/24/Dockerfile b/24/Dockerfile index 72d1635..c786a39 100644 --- a/24/Dockerfile +++ b/24/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1 +FROM quay.io/bfren/alpine-s6:alpine3.23-6.1.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" @@ -9,7 +9,7 @@ ARG BF_VERSION EXPOSE 3000 COPY ./overlay / -COPY ./23/overlay / +COPY ./24/overlay / RUN bf-install diff --git a/24/PKG.url b/24/PKG.url index efede16..15387f1 100644 --- a/24/PKG.url +++ b/24/PKG.url @@ -1 +1 @@ -https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.22&repo=&arch=&maintainer= +https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.23&repo=&arch=&maintainer= diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index a7d236a..61454fb 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="6.0.1" +BASE_VERSION="6.1.0" echo "Base: ${BASE_VERSION}" NODE_VERSIONS="16 17 18 19 20 21 22 23 24" From 587a6af393aae867103ba541d6051ebca5b225bf Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 5 Dec 2025 19:46:34 +0000 Subject: [PATCH 5/5] Updating NPM build --- 22/overlay/tmp/NPM_BUILD | 2 +- 23/overlay/tmp/NPM_BUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/22/overlay/tmp/NPM_BUILD b/22/overlay/tmp/NPM_BUILD index f3aaee3..de482d6 100644 --- a/22/overlay/tmp/NPM_BUILD +++ b/22/overlay/tmp/NPM_BUILD @@ -1 +1 @@ -11.6.3-r0 \ No newline at end of file +11.6.4-r0 \ No newline at end of file diff --git a/23/overlay/tmp/NPM_BUILD b/23/overlay/tmp/NPM_BUILD index f3aaee3..de482d6 100644 --- a/23/overlay/tmp/NPM_BUILD +++ b/23/overlay/tmp/NPM_BUILD @@ -1 +1 @@ -11.6.3-r0 \ No newline at end of file +11.6.4-r0 \ No newline at end of file