v3.3.0 (#94)

bfren · web-flow · commit 91fc21786d84 · 2024-12-06T16:48:25.000Z
Minor updates
* Using latest base images
* Adding Node 22 and 23
* Updating NPM to 10.9.1
diff --git 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
@@ -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/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/16/PKG.url b/16/PKG.url
@@ -1 +1 @@
-https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.16&repo=&arch=&maintainer=
+https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.16&repo=&arch=&maintainer=
diff --git 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/17/PKG.url b/17/PKG.url
@@ -1 +1 @@
-https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.15&repo=&arch=&maintainer=
+https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.15&repo=&arch=&maintainer=
diff --git 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/18/PKG.url b/18/PKG.url
@@ -1 +1 @@
-https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.18&repo=&arch=&maintainer=
+https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.18&repo=&arch=&maintainer=
diff --git 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/19/PKG.url b/19/PKG.url
@@ -1 +1 @@
-https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.17&repo=&arch=&maintainer=
+https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.17&repo=&arch=&maintainer=
diff --git 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/20/PKG.url b/20/PKG.url
@@ -1 +1 @@
-https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.20&repo=&arch=&maintainer=
+https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.20&repo=&arch=&maintainer=
diff --git a/20/overlay/tmp/NPM_BUILD b/20/overlay/tmp/NPM_BUILD
@@ -1 +1 @@
-10.8.0-r0
+10.9.1-r0
diff --git 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"
 
diff --git a/21/PKG.url b/21/PKG.url
@@ -1 +1 @@
-https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.20&repo=&arch=&maintainer=
+https://pkgs.alpinelinux.org/packages?name=nodejs-current&branch=v3.20&repo=&arch=&maintainer=
diff --git a/21/overlay/tmp/NPM_BUILD b/21/overlay/tmp/NPM_BUILD
@@ -1 +1 @@
-10.8.0-r0
+10.9.1-r0
diff --git a/22/ALPINE_MINOR b/22/ALPINE_MINOR
@@ -0,0 +1 @@
+3.21
diff --git a/22/Dockerfile 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
@@ -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
@@ -0,0 +1 @@
+22.11.0-r0
diff --git a/22/overlay/tmp/NODE_MINOR b/22/overlay/tmp/NODE_MINOR
@@ -0,0 +1 @@
+22.11
diff --git a/22/overlay/tmp/NODE_PKG b/22/overlay/tmp/NODE_PKG
@@ -0,0 +1 @@
+nodejs
diff --git a/22/overlay/tmp/NPM_BUILD b/22/overlay/tmp/NPM_BUILD
@@ -0,0 +1 @@
+10.9.1-r0
diff --git a/23/ALPINE_MINOR b/23/ALPINE_MINOR
@@ -0,0 +1 @@
+3.21
diff --git a/23/Dockerfile 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
@@ -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
@@ -0,0 +1 @@
+23.2.0-r1
diff --git a/23/overlay/tmp/NODE_MINOR b/23/overlay/tmp/NODE_MINOR
@@ -0,0 +1 @@
+23.2
diff --git a/23/overlay/tmp/NODE_PKG b/23/overlay/tmp/NODE_PKG
@@ -0,0 +1 @@
+nodejs-current
diff --git a/23/overlay/tmp/NPM_BUILD b/23/overlay/tmp/NPM_BUILD
@@ -0,0 +1 @@
+10.9.1-r0
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.2.20
+3.3.0
diff --git a/VERSION_MINOR b/VERSION_MINOR
@@ -1 +1 @@
-3.2
+3.3
diff --git 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
@@ -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
@@ -2,7 +2,7 @@
 
 IMAGE=node
 VERSION=`cat VERSION`
-NODE=${1:-20}
+NODE=${1:-22}
 TAG=${IMAGE}-test
 
 docker buildx build \

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ jobs:`
`14`	`14`	`strategy:`
`15`	`15`	`fail-fast: false`
`16`	`16`	`matrix:`
`17`		`- node: [ "16", "17", "18", "19", "20", "21" ]`
	`17`	`+ node: [ "16", "17", "18", "19", "20", "21", "22", "23" ]`
`18`	`18`	`runs-on: ubuntu-latest`
`19`	`19`	`steps:`
`20`	`20`	`-`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ghcr.io/bfren/alpine-s6:alpine3.16-5.4.15`
	`1`	`+FROM ghcr.io/bfren/alpine-s6:alpine3.16-5.5.0`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.16&repo=&arch=&maintainer=`
	`1`	`+https://pkgs.alpinelinux.org/packages?name=nodejs&branch=v3.16&repo=&arch=&maintainer=`