refactor!: drop Node.js 16 LTS support because it is EOL

timbru31 · Sep 15, 2023 · 22adf96 · 22adf96
1 parent ff855e9
commit 22adf96
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 263 deletions.
diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml
@@ -15,16 +15,6 @@ jobs:
       fail-fast: false
       matrix:
         docker-file:
-          - path: 3.0/16
-            tags: "3.0-16 3.0-gallium"
-            platforms: linux/amd64,linux/arm64,linux/arm/v7
-          - path: 3.0/16/slim
-            tags: "3.0-slim-16 3.0-slim-gallium"
-            platforms: linux/amd64,linux/arm64,linux/arm/v7
-          - path: 3.0/16/alpine
-            tags: "3.0-alpine-16 3.0-alpine-gallium"
-            platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6
-
           - path: 3.0/18
             tags: "3.0 3.0-18 3.0-hydrogen"
             platforms: linux/amd64,linux/arm64,linux/arm/v7
@@ -35,16 +25,6 @@ jobs:
             tags: "3.0-alpine 3.0-alpine-18 3.0-alpine-hydrogen"
             platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6
 
-          - path: 3.1/16
-            tags: "3.1 3.1-16 3.1-gallium"
-            platforms: linux/amd64,linux/arm64,linux/arm/v7
-          - path: 3.1/16/slim
-            tags: "3.1-slim 3.1-slim-16 3.1-slim-gallium"
-            platforms: linux/amd64,linux/arm64,linux/arm/v7
-          - path: 3.1/16/alpine
-            tags: "3.1-alpine 3.1-alpine-16 3.1-alpine-gallium"
-            platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6
-
           - path: 3.1/18
             tags: "3.1-18 3.1-hydrogen"
             platforms: linux/amd64,linux/arm64,linux/arm/v7
@@ -55,16 +35,6 @@ jobs:
             tags: "3.1-alpine-18 3.1-alpine-hydrogen"
             platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6
 
-          - path: 3.2/16
-            tags: "3.2-16 3.2-gallium"
-            platforms: linux/amd64,linux/arm64,linux/arm/v7
-          - path: 3.2/16/slim
-            tags: "3.2-slim-16 3.2-slim-gallium"
-            platforms: linux/amd64,linux/arm64,linux/arm/v7
-          - path: 3.2/16/alpine
-            tags: "3.2-alpine-16 3.2-alpine-gallium"
-            platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6
-
           - path: 3.2/18
             tags: "3.2 3.2-18 3.2-hydrogen latest"
             platforms: linux/amd64,linux/arm64,linux/arm/v7
@@ -75,16 +45,6 @@ jobs:
             tags: "3.2-alpine 3.2-alpine-18 3.2-alpine-hydrogen alpine"
             platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6
 
-          - path: 3.3/16
-            tags: "3.3-16 3.3-gallium"
-            platforms: linux/amd64,linux/arm64,linux/arm/v7
-          - path: 3.3/16/slim
-            tags: "3.3-slim-16 3.3-slim-gallium"
-            platforms: linux/amd64,linux/arm64,linux/arm/v7
-          - path: 3.3/16/alpine
-            tags: "3.3-alpine-16 3.3-alpine-gallium"
-            platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6
-
           - path: 3.3/18
             tags: "3.3 3.3-18 3.3-hydrogen"
             platforms: linux/amd64,linux/arm64,linux/arm/v7

diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -15,51 +15,27 @@ jobs:
 
       - name: Build the Docker image
         run: |
-          echo "3.0 with Node.js 16"
-          docker run -i $(docker build -q 3.0/16) /bin/sh -c "ruby --version && node --version && npm --version"
-          echo "3.0 slim with Node.js 16"
-          docker run -i $(docker build -q 3.0/16/slim) /bin/sh -c "ruby --version && node --version && npm --version"
-          echo "3.0 alpine with Node.js 16"
-          docker run -i $(docker build -q 3.0/16/alpine) /bin/sh -c "ruby --version && node --version && npm --version"
           echo "3.0 with Node.js 18"
           docker run -i $(docker build -q 3.0/18) /bin/sh -c "ruby --version && node --version && npm --version"
           echo "3.0 slim with Node.js 18"
           docker run -i $(docker build -q 3.0/18/slim) /bin/sh -c "ruby --version && node --version && npm --version"
           echo "3.0 alpine with Node.js 18"
           docker run -i $(docker build -q 3.0/18/alpine) /bin/sh -c "ruby --version && node --version && npm --version"
 
-          echo "3.1 with Node.js 16"
-          docker run -i $(docker build -q 3.1/16) /bin/sh -c "ruby --version && node --version && npm --version"
-          echo "3.1 slim with Node.js 16"
-          docker run -i $(docker build -q 3.1/16/slim) /bin/sh -c "ruby --version && node --version && npm --version"
-          echo "3.1 alpine with Node.js 16"
-          docker run -i $(docker build -q 3.1/16/alpine) /bin/sh -c "ruby --version && node --version && npm --version"
           echo "3.1 with Node.js 18"
           docker run -i $(docker build -q 3.1/18) /bin/sh -c "ruby --version && node --version && npm --version"
           echo "3.1 slim with Node.js 18"
           docker run -i $(docker build -q 3.1/18/slim) /bin/sh -c "ruby --version && node --version && npm --version"
           echo "3.1 alpine with Node.js 18"
           docker run -i $(docker build -q 3.1/18/alpine) /bin/sh -c "ruby --version && node --version && npm --version"
 
-          echo "3.2 with Node.js 16"
-          docker run -i $(docker build -q 3.2/16) /bin/sh -c "ruby --version && node --version && npm --version"
-          echo "3.2 slim with Node.js 16"
-          docker run -i $(docker build -q 3.2/16/slim) /bin/sh -c "ruby --version && node --version && npm --version"
-          echo "3.2 alpine with Node.js 16"
-          docker run -i $(docker build -q 3.2/16/alpine) /bin/sh -c "ruby --version && node --version && npm --version"
           echo "3.2 with Node.js 18"
           docker run -i $(docker build -q 3.2/18) /bin/sh -c "ruby --version && node --version && npm --version"
           echo "3.2 slim with Node.js 18"
           docker run -i $(docker build -q 3.2/18/slim) /bin/sh -c "ruby --version && node --version && npm --version"
           echo "3.2 alpine with Node.js 18"
           docker run -i $(docker build -q 3.2/18/alpine) /bin/sh -c "ruby --version && node --version && npm --version"
 
-          echo "3.3 with Node.js 16"
-          docker run -i $(docker build -q 3.3/16) /bin/sh -c "ruby --version && node --version && npm --version"
-          echo "3.3 slim with Node.js 16"
-          docker run -i $(docker build -q 3.3/16/slim) /bin/sh -c "ruby --version && node --version && npm --version"
-          echo "3.3 alpine with Node.js 16"
-          docker run -i $(docker build -q 3.3/16/alpine) /bin/sh -c "ruby --version && node --version && npm --version"
           echo "3.3 with Node.js 18"
           docker run -i $(docker build -q 3.3/18) /bin/sh -c "ruby --version && node --version && npm --version"
           echo "3.3 slim with Node.js 18"
@@ -77,6 +53,6 @@ jobs:
 
     steps:
       - name: Automatically merge dependabot upgrades
-        uses: fastify/github-action-merge-dependabot@v3
+        uses: fastify/github-action-merge-dependabot@v3.9.1
         with:
           target: minor
diff --git a/3.0/16/Dockerfile b/3.0/16/Dockerfile
diff --git a/3.0/16/alpine/Dockerfile b/3.0/16/alpine/Dockerfile
diff --git a/3.0/16/slim/Dockerfile b/3.0/16/slim/Dockerfile
diff --git a/3.1/16/Dockerfile b/3.1/16/Dockerfile
diff --git a/3.1/16/alpine/Dockerfile b/3.1/16/alpine/Dockerfile
diff --git a/3.1/16/slim/Dockerfile b/3.1/16/slim/Dockerfile
diff --git a/3.2/16/Dockerfile b/3.2/16/Dockerfile
diff --git a/3.2/16/alpine/Dockerfile b/3.2/16/alpine/Dockerfile
diff --git a/3.2/16/slim/Dockerfile b/3.2/16/slim/Dockerfile
diff --git a/3.3/16/Dockerfile b/3.3/16/Dockerfile
diff --git a/3.3/16/alpine/Dockerfile b/3.3/16/alpine/Dockerfile
diff --git a/3.3/16/slim/Dockerfile b/3.3/16/slim/Dockerfile
diff --git a/README.md b/README.md
@@ -1,16 +1,16 @@
-# Ruby 3.0, 3.1, 3.2 or 3.3 with Node.js 16 or 18 LTS Dockerfile
+# Ruby 3.0, 3.1, 3.2 or 3.3 with Node.js 18 LTS Dockerfile
 
 [![Docker Automated build](https://img.shields.io/docker/automated/timbru31/ruby-node.svg)](https://hub.docker.com/r/timbru31/ruby-node/)
 [![buildx Status](https://github.com/timbru31/docker-ruby-node/workflows/buildx/badge.svg)](https://github.com/timbru31/docker-ruby-node/actions?query=workflow%3Abuildx)
 [![Lint Dockerfiles](https://github.com/timbru31/docker-ruby-node/workflows/Lint%20Dockerfiles/badge.svg)](https://github.com/timbru31/docker-ruby-node/actions?query=workflow%3A%22Lint+Dockerfiles%22)
 
-A minimal Dockerfile based on Ruby (3.0, 3.1, 3.2, 3.3) Dockerfile (regular, slim or alpine) with Node.js 16 LTS (Gallium) or Node.js 18 LTS (Hydrogen) installed.
+A minimal Dockerfile based on Ruby (3.0, 3.1, 3.2, 3.3) Dockerfile (regular, slim or alpine) with Node.js 18 LTS (Hydrogen) installed.
 
 ## What's included
 
 - Ruby 3.0, 3.1, 3.2, 3.3
-- Node.js 16 LTS (Gallium), Node.js 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 LTS on alpine, see [why](https://gitlab.alpinelinux.org/alpine/aports/-/commit/25b10bd1a93e12a7e49fee38b0a229281ae49fb7))
 - yarn
 
 ### Available platforms