From 89d61d42aff6003d3b137043b583310e8038da64 Mon Sep 17 00:00:00 2001 From: Neur0toxine Date: Mon, 13 Nov 2023 14:44:37 +0300 Subject: [PATCH] add nodejs 20 (iron) --- .github/workflows/buildx.yml | 9 +++------ .github/workflows/dockerimage.yml | 3 +-- .github/workflows/hadolint.yml | 2 +- 14/Dockerfile | 10 ---------- {14-3.13 => 20}/Dockerfile | 2 +- README.md | 4 ++-- 6 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 14/Dockerfile rename {14-3.13 => 20}/Dockerfile (79%) diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index 470d1f0..fc965a6 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -13,21 +13,18 @@ jobs: fail-fast: false matrix: docker-file: - - path: 14 - tags: "14 fermium" - platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 - path: 16 tags: "16 gallium" platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 - - path: 14-3.13 - tags: "14-3.13 fermium3.13" - platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 - path: 16-3.13 tags: "16-3.13 gallium3.13 latest3.13" platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 - path: 18 tags: "18 hydrogen latest" platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 + - path: 20 + tags: "20 iron latest" + platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 steps: - name: Checkout diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 751904c..47112ca 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -9,9 +9,8 @@ jobs: - uses: actions/checkout@v3 - name: Build the Docker image run: | - docker run -i $(docker build -q 14) /bin/sh -c "node --version && npm --version && bash --version && ssh -V && git --version && python3 -V && make -v && g++ -v && pkgconf --version" docker run -i $(docker build -q 16) /bin/sh -c "node --version && npm --version && bash --version && ssh -V && git --version && python3 -V && make -v && g++ -v && pkgconf --version" - docker run -i $(docker build -q 14-3.13) /bin/sh -c "node --version && npm --version && bash --version && ssh -V && git --version && python3 -V && make -v && g++ -v && pkgconf --version" docker run -i $(docker build -q 16-3.13) /bin/sh -c "node --version && npm --version && bash --version && ssh -V && git --version && python3 -V && make -v && g++ -v && pkgconf --version" docker run -i $(docker build -q 16) /bin/sh -c "node --version && npm --version && bash --version && ssh -V && git --version && python3 -V && make -v && g++ -v && pkgconf --version" docker run -i $(docker build -q 18) /bin/sh -c "node --version && npm --version && bash --version && ssh -V && git --version && python3 -V && make -v && g++ -v && pkgconf --version" + docker run -i $(docker build -q 20) /bin/sh -c "node --version && npm --version && bash --version && ssh -V && git --version && python3 -V && make -v && g++ -v && pkgconf --version" diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml index 101261a..8e6769c 100644 --- a/.github/workflows/hadolint.yml +++ b/.github/workflows/hadolint.yml @@ -8,4 +8,4 @@ jobs: steps: - uses: actions/checkout@v3 - run: brew install hadolint - - run: hadolint {14,16,14-3.13,16-3.13,18}/Dockerfile + - run: hadolint {16,16-3.13,18,20}/Dockerfile diff --git a/14/Dockerfile b/14/Dockerfile deleted file mode 100644 index fc0d24c..0000000 --- a/14/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM timbru31/node-alpine-git:14 -RUN apk -U upgrade \ - && apk add --no-cache \ - bash \ - git \ - openssh \ - python3 \ - make \ - g++ \ - pkgconfig \ No newline at end of file diff --git a/14-3.13/Dockerfile b/20/Dockerfile similarity index 79% rename from 14-3.13/Dockerfile rename to 20/Dockerfile index 7f57ff3..7f746b5 100644 --- a/14-3.13/Dockerfile +++ b/20/Dockerfile @@ -1,4 +1,4 @@ -FROM node:fermium-alpine3.13 +FROM timbru31/node-alpine-git:20 RUN apk -U upgrade \ && apk add --no-cache \ bash \ diff --git a/README.md b/README.md index 247bd98..affcbd3 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,12 @@ [![buildx Status](https://github.com/Neur0toxine/docker-node-alpine-git-gyp/workflows/buildx/badge.svg)](https://github.com/Neur0toxine/docker-node-alpine-git-gyp/actions?query=workflow%3Abuildx) [![Lint Dockerfiles](https://github.com/Neur0toxine/docker-node-alpine-git-gyp/workflows/Lint%20Dockerfiles/badge.svg)](https://github.com/Neur0toxine/docker-node-alpine-git-gyp/actions?query=workflow%3A%22Lint+Dockerfiles%22) -A minimal Dockerfile based on Node.js 14 LTS (Fermium), Node.js 16 LTS (Gallium) or Node.js 18 LTS (Hydrogen) alpine with Git and ssh installed. +A minimal Dockerfile based on Node.js 16 LTS (Gallium), Node.js 18 LTS (Hydrogen) or Nodejs 20 LTS (Iron) & alpine with additional tools. ## What's included - Node.js 14 LTS (Fermium), 16 LTS (Gallium) or 18 LTS (Hydrogen) -- npm 6 (Node.js 14) or npm 8 (Node.js >=16) +- npm 8 (Node.js 16) or npm 9 (Node.js >= 18) - yarn - Bash - Git