From 70e3e5ef789a5a142dcb1816baf17db06e12d79d Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 6 Dec 2024 16:25:43 +0000 Subject: [PATCH 1/5] Bumping version to 3.2.21 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a221db8..b0d1f2f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.20 \ No newline at end of file +3.2.21 \ No newline at end of file From 71e87e32d247d3d685daa23d36554aa061e76492 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 6 Dec 2024 16:37:01 +0000 Subject: [PATCH 2/5] Bumping version to 3.3.0 --- VERSION | 2 +- VERSION_MINOR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index b0d1f2f..0fa4ae4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.21 \ No newline at end of file +3.3.0 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index 4fe5631..f30101c 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -3.2 \ No newline at end of file +3.3 \ No newline at end of file From c04db57ffc0c8719f41f23e908adcb67b351573f Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 6 Dec 2024 16:37:11 +0000 Subject: [PATCH 3/5] Using latest base images --- 16/Dockerfile | 2 +- 17/Dockerfile | 2 +- 18/Dockerfile | 2 +- 19/Dockerfile | 2 +- 20/Dockerfile | 2 +- 21/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/16/Dockerfile b/16/Dockerfile index 514c95c..873c8fb 100644 --- a/16/Dockerfile +++ b/16/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.16-5.4.15 +FROM ghcr.io/bfren/alpine-s6:alpine3.16-5.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/17/Dockerfile b/17/Dockerfile index b7ddd36..ce9d042 100644 --- a/17/Dockerfile +++ b/17/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.15-5.4.15 +FROM ghcr.io/bfren/alpine-s6:alpine3.15-5.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/18/Dockerfile b/18/Dockerfile index e892a35..0562435 100644 --- a/18/Dockerfile +++ b/18/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.4.15 +FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/19/Dockerfile b/19/Dockerfile index 619077b..391d725 100644 --- a/19/Dockerfile +++ b/19/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.4.15 +FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/20/Dockerfile b/20/Dockerfile index 73c8d39..b7844ca 100644 --- a/20/Dockerfile +++ b/20/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.15 +FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/21/Dockerfile b/21/Dockerfile index 8f95b5f..a3e18fe 100644 --- a/21/Dockerfile +++ b/21/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.4.15 +FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.5.0 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" From dda15392a6223dd40b7ec4bc576d685880178b26 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 6 Dec 2024 16:40:24 +0000 Subject: [PATCH 4/5] Adding Node 22 and 23 --- .github/workflows/dev.yml | 2 +- .github/workflows/publish.yml | 4 ++-- 16/PKG.url | 2 +- 17/PKG.url | 2 +- 18/PKG.url | 2 +- 19/PKG.url | 2 +- 20/PKG.url | 2 +- 21/PKG.url | 2 +- 22/ALPINE_MINOR | 1 + 22/Dockerfile | 16 ++++++++++++++++ 22/PKG.url | 1 + 22/overlay/tmp/NODE_BUILD | 1 + 22/overlay/tmp/NODE_MINOR | 1 + 22/overlay/tmp/NODE_PKG | 1 + 22/overlay/tmp/NPM_BUILD | 1 + 23/ALPINE_MINOR | 1 + 23/Dockerfile | 16 ++++++++++++++++ 23/PKG.url | 1 + 23/overlay/tmp/NODE_BUILD | 1 + 23/overlay/tmp/NODE_MINOR | 1 + 23/overlay/tmp/NODE_PKG | 1 + 23/overlay/tmp/NPM_BUILD | 1 + generate-dockerfiles.sh | 7 +++++-- run.sh | 2 +- test.sh | 2 +- 25 files changed, 60 insertions(+), 13 deletions(-) create mode 100644 22/ALPINE_MINOR create mode 100644 22/Dockerfile create mode 100644 22/PKG.url create mode 100644 22/overlay/tmp/NODE_BUILD create mode 100644 22/overlay/tmp/NODE_MINOR create mode 100644 22/overlay/tmp/NODE_PKG create mode 100644 22/overlay/tmp/NPM_BUILD create mode 100644 23/ALPINE_MINOR create mode 100644 23/Dockerfile create mode 100644 23/PKG.url create mode 100644 23/overlay/tmp/NODE_BUILD create mode 100644 23/overlay/tmp/NODE_MINOR create mode 100644 23/overlay/tmp/NODE_PKG create mode 100644 23/overlay/tmp/NPM_BUILD diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 50e863e..660a582 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" ] + node: [ "16", "17", "18", "19", "20", "21", "22", "23" ] runs-on: ubuntu-latest steps: - diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 87db800..189abdf 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" ] + node: [ "16", "17", "18", "19", "20", "21", "22", "23" ] runs-on: ubuntu-latest steps: - @@ -92,7 +92,7 @@ jobs: - name: Build and push default id: docker_build_default - if: matrix.node == '20' + if: matrix.node == '22' uses: docker/build-push-action@v6 with: context: . diff --git a/16/PKG.url b/16/PKG.url index 0f2873c..70deac4 100644 --- a/16/PKG.url +++ b/16/PKG.url @@ -1 +1 @@ -https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.16&repo=&arch=&maintainer= \ No newline at end of file +https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.16&repo=&arch=&maintainer= diff --git a/17/PKG.url b/17/PKG.url index 1565e46..a69cf9d 100644 --- a/17/PKG.url +++ b/17/PKG.url @@ -1 +1 @@ -https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.15&repo=&arch=&maintainer= \ No newline at end of file +https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.15&repo=&arch=&maintainer= diff --git a/18/PKG.url b/18/PKG.url index d4569e9..e8822db 100644 --- a/18/PKG.url +++ b/18/PKG.url @@ -1 +1 @@ -https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.18&repo=&arch=&maintainer= \ No newline at end of file +https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.18&repo=&arch=&maintainer= diff --git a/19/PKG.url b/19/PKG.url index bdda3c8..4b49f46 100644 --- a/19/PKG.url +++ b/19/PKG.url @@ -1 +1 @@ -https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.17&repo=&arch=&maintainer= \ No newline at end of file +https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.17&repo=&arch=&maintainer= diff --git a/20/PKG.url b/20/PKG.url index 3d54247..b8644b7 100644 --- a/20/PKG.url +++ b/20/PKG.url @@ -1 +1 @@ -https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.20&repo=&arch=&maintainer= \ No newline at end of file +https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.20&repo=&arch=&maintainer= diff --git a/21/PKG.url b/21/PKG.url index 6d5b307..ab037c1 100644 --- a/21/PKG.url +++ b/21/PKG.url @@ -1 +1 @@ -https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.20&repo=&arch=&maintainer= \ No newline at end of file +https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.20&repo=&arch=&maintainer= diff --git a/22/ALPINE_MINOR b/22/ALPINE_MINOR new file mode 100644 index 0000000..f297023 --- /dev/null +++ b/22/ALPINE_MINOR @@ -0,0 +1 @@ +3.21 \ No newline at end of file diff --git a/22/Dockerfile b/22/Dockerfile new file mode 100644 index 0000000..6fd2d99 --- /dev/null +++ b/22/Dockerfile @@ -0,0 +1,16 @@ +FROM ghcr.io/bfren/alpine-s6:alpine3.21-5.5.0 + +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 ./22/overlay / + +RUN bf-install + +VOLUME [ "/app/live" ] diff --git a/22/PKG.url b/22/PKG.url new file mode 100644 index 0000000..97daaef --- /dev/null +++ b/22/PKG.url @@ -0,0 +1 @@ +https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.21&repo=&arch=&maintainer= diff --git a/22/overlay/tmp/NODE_BUILD b/22/overlay/tmp/NODE_BUILD new file mode 100644 index 0000000..999c811 --- /dev/null +++ b/22/overlay/tmp/NODE_BUILD @@ -0,0 +1 @@ +22.11.0-r0 \ No newline at end of file diff --git a/22/overlay/tmp/NODE_MINOR b/22/overlay/tmp/NODE_MINOR new file mode 100644 index 0000000..f07cdfa --- /dev/null +++ b/22/overlay/tmp/NODE_MINOR @@ -0,0 +1 @@ +22.11 \ No newline at end of file diff --git a/22/overlay/tmp/NODE_PKG b/22/overlay/tmp/NODE_PKG new file mode 100644 index 0000000..0c524b7 --- /dev/null +++ b/22/overlay/tmp/NODE_PKG @@ -0,0 +1 @@ +nodejs \ No newline at end of file diff --git a/22/overlay/tmp/NPM_BUILD b/22/overlay/tmp/NPM_BUILD new file mode 100644 index 0000000..3bf5af7 --- /dev/null +++ b/22/overlay/tmp/NPM_BUILD @@ -0,0 +1 @@ +10.9.1-r0 \ No newline at end of file diff --git a/23/ALPINE_MINOR b/23/ALPINE_MINOR new file mode 100644 index 0000000..f297023 --- /dev/null +++ b/23/ALPINE_MINOR @@ -0,0 +1 @@ +3.21 \ No newline at end of file diff --git a/23/Dockerfile b/23/Dockerfile new file mode 100644 index 0000000..aa7e7d5 --- /dev/null +++ b/23/Dockerfile @@ -0,0 +1,16 @@ +FROM ghcr.io/bfren/alpine-s6:alpine3.21-5.5.0 + +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/23/PKG.url b/23/PKG.url new file mode 100644 index 0000000..46eeace --- /dev/null +++ b/23/PKG.url @@ -0,0 +1 @@ +https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.21&repo=&arch=&maintainer= diff --git a/23/overlay/tmp/NODE_BUILD b/23/overlay/tmp/NODE_BUILD new file mode 100644 index 0000000..8f75aab --- /dev/null +++ b/23/overlay/tmp/NODE_BUILD @@ -0,0 +1 @@ +23.2.0-r1 \ No newline at end of file diff --git a/23/overlay/tmp/NODE_MINOR b/23/overlay/tmp/NODE_MINOR new file mode 100644 index 0000000..ce417dd --- /dev/null +++ b/23/overlay/tmp/NODE_MINOR @@ -0,0 +1 @@ +23.2 \ No newline at end of file diff --git a/23/overlay/tmp/NODE_PKG b/23/overlay/tmp/NODE_PKG new file mode 100644 index 0000000..1399534 --- /dev/null +++ b/23/overlay/tmp/NODE_PKG @@ -0,0 +1 @@ +nodejs-current \ No newline at end of file diff --git a/23/overlay/tmp/NPM_BUILD b/23/overlay/tmp/NPM_BUILD new file mode 100644 index 0000000..3bf5af7 --- /dev/null +++ b/23/overlay/tmp/NPM_BUILD @@ -0,0 +1 @@ +10.9.1-r0 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index e963d19..731d6ee 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,14 +4,16 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="5.4.15" +BASE_VERSION="5.5.0" echo "Base: ${BASE_VERSION}" -NODE_VERSIONS="16 17 18 19 20 21" +NODE_VERSIONS="16 17 18 19 20 21 22 23" for V in ${NODE_VERSIONS} ; do echo "Node.js ${V}" ALPINE_MINOR=`cat ./${V}/ALPINE_MINOR` + NODE_PKG=`cat ./${V}/overlay/tmp/NODE_PKG` + URL="https://pkgs.alpinelinux.org/packages?name=${NODE_PKG}&branch=v${ALPINE_MINOR}&repo=&arch=&maintainer=" DOCKERFILE=$(docker run \ -v ${PWD}:/ws \ @@ -24,6 +26,7 @@ for V in ${NODE_VERSIONS} ; do ) echo "${DOCKERFILE}" > ./${V}/Dockerfile + echo "${URL}" > ./${V}/PKG.url done diff --git a/run.sh b/run.sh index 761e59c..2647cd9 100755 --- a/run.sh +++ b/run.sh @@ -1,7 +1,7 @@ #!/bin/sh IMAGE=`cat VERSION` -NODE=${1:-20} +NODE=${1:-22} docker buildx build \ --load \ diff --git a/test.sh b/test.sh index dcd9166..a0aeef8 100644 --- a/test.sh +++ b/test.sh @@ -2,7 +2,7 @@ IMAGE=node VERSION=`cat VERSION` -NODE=${1:-20} +NODE=${1:-22} TAG=${IMAGE}-test docker buildx build \ From 51a4522d79eb671eb7eb10928a51ad4fc166ce1d Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 6 Dec 2024 16:42:25 +0000 Subject: [PATCH 5/5] Updating NPM to 10.9.1 --- 20/overlay/tmp/NPM_BUILD | 2 +- 21/overlay/tmp/NPM_BUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/20/overlay/tmp/NPM_BUILD b/20/overlay/tmp/NPM_BUILD index 2f888f9..3bf5af7 100644 --- a/20/overlay/tmp/NPM_BUILD +++ b/20/overlay/tmp/NPM_BUILD @@ -1 +1 @@ -10.8.0-r0 \ No newline at end of file +10.9.1-r0 \ No newline at end of file diff --git a/21/overlay/tmp/NPM_BUILD b/21/overlay/tmp/NPM_BUILD index 2f888f9..3bf5af7 100644 --- a/21/overlay/tmp/NPM_BUILD +++ b/21/overlay/tmp/NPM_BUILD @@ -1 +1 @@ -10.8.0-r0 \ No newline at end of file +10.9.1-r0 \ No newline at end of file