From b66fff4166e7d029aa35be1ec345c6a326cd8938 Mon Sep 17 00:00:00 2001
From: Neur0toxine <pashok9825@gmail.com>
Date: Wed, 16 Nov 2022 17:18:46 +0300
Subject: [PATCH] add node.js 18 lts (hydrogen)

---
 .github/workflows/buildx.yml      |  5 ++++-
 .github/workflows/dockerimage.yml |  9 +++++----
 .github/workflows/hadolint.yml    |  2 +-
 18/Dockerfile                     | 10 ++++++++++
 README.md                         |  7 ++++---
 5 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 18/Dockerfile

diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml
index 6454dc3..470d1f0 100644
--- a/.github/workflows/buildx.yml
+++ b/.github/workflows/buildx.yml
@@ -17,7 +17,7 @@ jobs:
             tags: "14 fermium"
             platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6
           - path: 16
-            tags: "16 gallium latest"
+            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"
@@ -25,6 +25,9 @@ jobs:
           - 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
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index e1f463e..9b91838 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -9,7 +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"
-          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"
-          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"
-          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"
+          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"
diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml
index 1e05e00..101261a 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}/Dockerfile
+      - run: hadolint {14,16,14-3.13,16-3.13,18}/Dockerfile
diff --git a/18/Dockerfile b/18/Dockerfile
new file mode 100644
index 0000000..f4e9952
--- /dev/null
+++ b/18/Dockerfile
@@ -0,0 +1,10 @@
+FROM timbru31/node-alpine-git:18
+RUN apk -U upgrade \
+  && apk add --no-cache \
+    bash \
+    git \
+    openssh \
+    python3 \
+    make \
+    g++ \
+    pkgconfig
diff --git a/README.md b/README.md
index c10036a..6182977 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) or Node.js 16 LTS (Gallium) alpine with Git and ssh installed.
+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.
 
 ## What's included
 
-- Node.js 14 LTS (Fermium) or 16 LTS (Gallium)
-- npm 6 (Node.js 14) or npm 8 (Node.js 16)
+- Node.js 14 LTS (Fermium), 16 LTS (Gallium) or 18 LTS (Hydrogen)
+- npm 6 (Node.js 14) or npm 8 (Node.js 16 & 18)
 - yarn
 - Bash
 - Git
@@ -17,6 +17,7 @@ A minimal Dockerfile based on Node.js 14 LTS (Fermium) or Node.js 16 LTS (Galliu
 - Python 3.x (for node-gyp)
 - g++ (for node-gyp)
 - make
+- pkgconfig
 
 ### Available platforms