From 031c24663445a09f2529f8f6e2fbac9e3cfeb2fd Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Sat, 22 Jul 2023 12:42:35 -0400
Subject: [PATCH 1/2] feat: Add `node-20-alpine` image

---
 .../build-and-push-docker-images.yml          |  2 +-
 .github/workflows/build-docker-images.yml     |  2 +-
 node-dev-base/node-20-alpine/Dockerfile       | 52 +++++++++++++++++++
 3 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 node-dev-base/node-20-alpine/Dockerfile

diff --git a/.github/workflows/build-and-push-docker-images.yml b/.github/workflows/build-and-push-docker-images.yml
index 3a3d793..bb2e855 100644
--- a/.github/workflows/build-and-push-docker-images.yml
+++ b/.github/workflows/build-and-push-docker-images.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ["14", "16", "18"]
+        node: ["14", "16", "18", "20"]
     name: node-dev-base ${{ matrix.node }} images
     steps:
       - name: Check out the repository
diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index 0bf641e..1e33878 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        node: ["14", "16", "18"]
+        node: ["14", "16", "18", "20"]
     name: node-dev-base ${{ matrix.node }} images
     steps:
       - name: Check out the repository
diff --git a/node-dev-base/node-20-alpine/Dockerfile b/node-dev-base/node-20-alpine/Dockerfile
new file mode 100644
index 0000000..d845412
--- /dev/null
+++ b/node-dev-base/node-20-alpine/Dockerfile
@@ -0,0 +1,52 @@
+FROM node:20-alpine
+
+# Install packages for headless chrome
+RUN apk update \
+    && \
+    apk add --no-cache nmap \
+    && \
+    echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
+    && \
+    echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \
+    && \
+    apk update \
+    && \
+    apk add --no-cache \
+        # Packages needed for npm install of mozjpeg & cwebp, can't --virtual and apk del later
+        # Pre-builts do not work on alpine for either:
+        # ref: https://github.com/imagemin/imagemin/issues/168
+        # ref: https://github.com/imagemin/cwebp-bin/issues/27
+        autoconf \
+        automake \
+        build-base \
+        g++ \
+        gcc \
+        glu \
+        libc6-compat \
+        libtool \
+        libpng-dev \
+        libxxf86vm \
+        make \
+        nasm \
+        # Misc packages
+        nano \
+        # Image optimization packages
+        gifsicle \
+        jpegoptim \
+        libpng-dev \
+        libwebp-tools \
+        libjpeg-turbo-dev \
+        libjpeg-turbo-utils \
+        optipng \
+        pngquant \
+        # Headless Chrome packages
+        chromium \
+        harfbuzz \
+        "freetype>2.8" \
+        ttf-freefont \
+        nss
+
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
+ENV CHROME_BIN /usr/bin/chromium-browser
+ENV LIGHTHOUSE_CHROMIUM_PATH /usr/bin/chromium-browser

From d7ee1e86ebe2c74b92282347726006bbe01f95d1 Mon Sep 17 00:00:00 2001
From: Andrew Welch <andrew@nystudio107.com>
Date: Sat, 22 Jul 2023 12:42:52 -0400
Subject: [PATCH 2/2] chore: Version 1.2.22

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f6a918..d477ac5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/docker-images Change Log
 
+## 1.2.22 - 2023.07.22
+### Added
+* Add `node-20-alpine` image
+
 ## 1.2.21 - 2023.07.19
 ### Added
 * Add `node-18-alpine` image