feat!: remove EOL Node.js 16

timbru31 · Nov 2, 2023 · 4abd1ed · 4abd1ed
1 parent 58fe8a2
commit 4abd1ed
Show file tree

Hide file tree

Showing 15 changed files with 4 additions and 262 deletions.
diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml
@@ -15,98 +15,50 @@ jobs:
       fail-fast: false
       matrix:
         docker-file:
-          - path: 8/jdk/16
-            tags: "8-jdk 8-jdk-16 8-jdk-gallium"
-            platforms: linux/amd64,linux/arm64,linux/ppc64le
-
           - path: 8/jdk/18
             tags: "8-jdk-18 8-jdk-hydrogen"
             platforms: linux/amd64,linux/arm64,linux/ppc64le
 
-          - path: 8/jdk/16/alpine
-            tags: "8-alpine-jdk-16 8-alpine-jdk-gallium 8-alpine-jdk"
-            platforms: linux/amd64
-
           - path: 8/jdk/18/alpine
             tags: "8-alpine-jdk-18 8-alpine-jdk-hydrogen"
             platforms: linux/amd64
 
-          - path: 8/jre/16
-            tags: "8-jre-16 8-jre-gallium 8-16 8-gallium 8-jre 8"
-            platforms: linux/amd64,linux/arm64,linux/ppc64le
-
           - path: 8/jre/18
             tags: "8-jre-18 8-jre-hydrogen 8-18 8-hydrogen"
             platforms: linux/amd64,linux/arm64,linux/ppc64le
 
-          - path: 8/jre/16/alpine
-            tags: "8-alpine-16 8-alpine-gallium 8-alpine-jre-16 8-alpine-jre-gallium 8-alpine 8-alpine-jre"
-            platforms: linux/amd64
-
           - path: 8/jre/18/alpine
             tags: "8-alpine-18 8-alpine-hydrogen 8-alpine-jre-18 8-alpine-jre-hydrogen"
             platforms: linux/amd64
 
-          - path: 11/jdk/16
-            tags: "11-jdk-16 11-jdk-gallium 11-jdk"
-            platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v7
-
           - path: 11/jdk/18
             tags: "11-jdk-18 11-jdk-hydrogen"
             platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v7
 
-          - path: 11/jdk/16/alpine
-            tags: "11-alpine-jdk-16 11-alpine-jdk-gallium 11-alpine-jdk"
-            platforms: linux/amd64
-
           - path: 11/jdk/18/alpine
             tags: "11-alpine-jdk-18 11-alpine-jdk-hydrogen"
             platforms: linux/amd64
 
-          - path: 11/jre/16
-            tags: "11-16 11-gallium 11-jre-16 11-jre-gallium 11 11-jre"
-            platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v7
-
           - path: 11/jre/18
             tags: "11-18 11-hydrogen 11-jre-18 11-jre-hydrogen"
             platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v7
 
-          - path: 11/jre/16/alpine
-            tags: "11-alpine-16 11-alpine-gallium 11-alpine-jre-16 11-alpine-jre-gallium 11-alpine 11-alpine-jre"
-            platforms: linux/amd64
-
           - path: 11/jre/18/alpine
             tags: "11-alpine-18 11-alpine-hydrogen 11-alpine-jre-18 11-alpine-jre-hydrogen"
             platforms: linux/amd64
 
-          - path: 17/jdk/16
-            tags: "17-jdk-16 17-jdk-gallium jdk-16 jdk-16-gallium 17-jdk jdk"
-            platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v7
-
           - path: 17/jdk/18
             tags: "17-jdk-18 17-jdk-hydrogen jdk-18 jdk-18-hydrogen"
             platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v7
 
-          - path: 17/jdk/16/alpine
-            tags: "alpine-jdk-16 alpine-jdk-gallium 17-alpine-jdk-16 17-alpine-jdk-gallium alpine-jdk 17-alpine-jdk"
-            platforms: linux/amd64
-
           - path: 17/jdk/18/alpine
             tags: "alpine-jdk-18 alpine-jdk-hydrogen 17-alpine-jdk-18 17-alpine-jdk-hydrogen"
             platforms: linux/amd64
 
-          - path: 17/jre/16
-            tags: "17-16 17-gallium 17-jre-16 17-jre-gallium latest 17 17-jre jre"
-            platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v7
-
           - path: 17/jre/18
             tags: "17-18 17-hydrogen 17-jre-18 17-jre-hydrogen"
             platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v7
 
-          - path: 17/jre/16/alpine
-            tags: "17-alpine-16 17-alpine-gallium 17-alpine-jre-16 17-alpine-jre-gallium alpine-16 alpine-gallium alpine-jre-16 alpine-jre-gallium 17-alpine 17-alpine-jre alpine alpine-jre"
-            platforms: linux/amd64
-
           - path: 17/jre/18/alpine
             tags: "17-alpine-18 17-alpine-hydrogen 17-alpine-jre-18 17-alpine-jre-hydrogen alpine-18 alpine-hydrogen alpine-jre-18 alpine-jre-hydrogen"
             platforms: linux/amd64

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -15,61 +15,31 @@ jobs:
 
       - name: Build the Docker image
         run: |
-          printf "JDK8 with Node.js 16\n"
-          docker run -i $(docker build -q 8/jdk/16) /bin/sh -c "java -version && node --version"
-          printf "\n\nJDK8 alpine with Node.js 16\n"
-          docker run -i $(docker build -q 8/jdk/16/alpine) /bin/sh -c "java -version && node --version"
-
           printf "\n\nJDK8 with Node.js 18\n"
           docker run -i $(docker build -q 8/jdk/18) /bin/sh -c "java -version && node --version"
           printf "\n\nJDK8 alpine with Node.js 18\n"
           docker run -i $(docker build -q 8/jdk/18/alpine) /bin/sh -c "java -version && node --version"
 
-          printf "\n\nJRE8 with Node.js 16\n"
-          docker run -i $(docker build -q 8/jre/16) /bin/sh -c "java -version && node --version"
-          printf "\n\nJRE8 alpine with Node.js 16\n"
-          docker run -i $(docker build -q 8/jre/16/alpine) /bin/sh -c "java -version && node --version"
-
           printf "\n\nJRE8 with Node.js 18\n"
           docker run -i $(docker build -q 8/jre/18) /bin/sh -c "java -version && node --version"
           printf "\n\nJRE8 alpine with Node.js 18\n"
           docker run -i $(docker build -q 8/jre/18/alpine) /bin/sh -c "java -version && node --version"
 
-          printf "\n\nJDK11 with Node.js 16\n"
-          docker run -i $(docker build -q 11/jdk/16) /bin/sh -c "java -version && node --version"
-          printf "\n\nJDK11 alpine with Node.js 16\n"
-          docker run -i $(docker build -q 11/jdk/16/alpine) /bin/sh -c "java -version && node --version"
-
           printf "\n\nJDK11 with Node.js 18\n"
           docker run -i $(docker build -q 11/jdk/18) /bin/sh -c "java -version && node --version"
           printf "\n\nJDK11 alpine with Node.js 18\n"
           docker run -i $(docker build -q 11/jdk/18/alpine) /bin/sh -c "java -version && node --version"
 
-          printf "\n\nJRE11 with Node.js 16\n"
-          docker run -i $(docker build -q 11/jre/16) /bin/sh -c "java -version && node --version"
-          printf "\n\nJRE11 alpine with Node.js 16\n"
-          docker run -i $(docker build -q 11/jre/16/alpine) /bin/sh -c "java -version && node --version"
-
           printf "\n\nJRE11 with Node.js 18\n"
           docker run -i $(docker build -q 11/jre/18) /bin/sh -c "java -version && node --version"
           printf "\n\nJRE11 alpine with Node.js 18\n"
           docker run -i $(docker build -q 11/jre/18/alpine) /bin/sh -c "java -version && node --version"
 
-          printf "\n\nJDK17 with Node.js 16\n"
-          docker run -i $(docker build -q 17/jdk/16) /bin/sh -c "java -version && node --version"
-          printf "\n\nJDK17 alpine with Node.js 16\n"
-          docker run -i $(docker build -q 17/jdk/16/alpine) /bin/sh -c "java -version && node --version"
-
           printf "\n\nJDK17 with Node.js 18\n"
           docker run -i $(docker build -q 17/jdk/18) /bin/sh -c "java -version && node --version"
           printf "\n\nJDK17 alpine with Node.js 18\n"
           docker run -i $(docker build -q 17/jdk/18/alpine) /bin/sh -c "java -version && node --version"
 
-          printf "\n\nJRE17 with Node.js 16\n"
-          docker run -i $(docker build -q 17/jre/16) /bin/sh -c "java -version && node --version"
-          printf "\n\nJRE17 alpine with Node.js 16\n"
-          docker run -i $(docker build -q 17/jre/16/alpine) /bin/sh -c "java -version && node --version"
-
           printf "\n\nJRE17 with Node.js 18\n"
           docker run -i $(docker build -q 17/jre/18) /bin/sh -c "java -version && node --version"
           printf "\n\nJRE17 alpine with Node.js 18\n"

diff --git a/11/jdk/16/Dockerfile b/11/jdk/16/Dockerfile
diff --git a/11/jdk/16/alpine/Dockerfile b/11/jdk/16/alpine/Dockerfile
diff --git a/11/jre/16/Dockerfile b/11/jre/16/Dockerfile
diff --git a/11/jre/16/alpine/Dockerfile b/11/jre/16/alpine/Dockerfile
diff --git a/17/jdk/16/Dockerfile b/17/jdk/16/Dockerfile
diff --git a/17/jdk/16/alpine/Dockerfile b/17/jdk/16/alpine/Dockerfile
diff --git a/17/jre/16/Dockerfile b/17/jre/16/Dockerfile
diff --git a/17/jre/16/alpine/Dockerfile b/17/jre/16/alpine/Dockerfile
diff --git a/8/jdk/16/Dockerfile b/8/jdk/16/Dockerfile
diff --git a/8/jdk/16/alpine/Dockerfile b/8/jdk/16/alpine/Dockerfile
diff --git a/8/jre/16/Dockerfile b/8/jre/16/Dockerfile
diff --git a/8/jre/16/alpine/Dockerfile b/8/jre/16/alpine/Dockerfile
diff --git a/README.md b/README.md
@@ -1,16 +1,16 @@
-# Java (JRE or JDK version 8, 11 or 17) with Node.js 16 or 18 LTS Dockerfile
+# Java (JRE or JDK version 8, 11 or 17) with Node.js 18 LTS (Hydrogen) Dockerfile
 
 [![Docker Automated build](https://img.shields.io/docker/automated/timbru31/java-node.svg)](https://hub.docker.com/r/timbru31/java-node/)
 [![buildx Status](https://github.com/timbru31/docker-java-node/workflows/buildx/badge.svg)](https://github.com/timbru31/docker-java-node/actions?query=workflow%3Abuildx)
 [![Lint Dockerfiles](https://github.com/timbru31/docker-java-node/workflows/Lint%20Dockerfiles/badge.svg)](https://github.com/timbru31/docker-java-node/actions?query=workflow%3A%22Lint+Dockerfiles%22)
 
-A minimal Dockerfile based on Eclipse Temurin's OpenJDK JRE or JDK 8/11 Dockerfile (regular, alpine) with Node.js 16 LTS (Gallium) or 18 LTS (Hydrogen) installed.
+A minimal Dockerfile based on Eclipse Temurin's OpenJDK JRE or JDK 8/11 Dockerfile (regular, alpine) with Node.js 18 LTS (Hydrogen) installed.
 
 ## What's included
 
 - JRE or JDK 8/11/17
-- Node.js 16 LTS (Gallium) or 18 LTS (Hydrogen)
-- bundled npm that comes with the respective Node.js version (latest for Node.js LTS v16+ on alpine, see [why](https://gitlab.alpinelinux.org/alpine/aports/-/commit/25b10bd1a93e12a7e49fee38b0a229281ae49fb7))
+- Node.js 18 LTS (Hydrogen)
+- bundled npm that comes with the respective Node.js version (latest for Node.js on alpine, see [why](https://gitlab.alpinelinux.org/alpine/aports/-/commit/25b10bd1a93e12a7e49fee38b0a229281ae49fb7))
 - yarn
 - curl