From 687bbe16062b1a47e86149ff495e00cfa7af079b Mon Sep 17 00:00:00 2001
From: Andrew Calcutt <acalcutt@techidiots.net>
Date: Sun, 8 Jan 2023 22:19:21 -0500
Subject: [PATCH] Update to node 18, add docker build test (#699)

* Update to node 18

* match version in readme

* test docker build

* Update node in docs

* update to new readthedocs url

* v4.4.0
---
 .github/workflows/ct.yml | 15 +++++++++++++++
 Dockerfile               |  4 ++--
 Dockerfile_light         |  2 +-
 Dockerfile_test          |  2 +-
 README.md                |  2 +-
 docs/installation.rst    |  2 +-
 package.json             |  4 ++--
 7 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ct.yml b/.github/workflows/ct.yml
index 3368e70..f7b55c3 100644
--- a/.github/workflows/ct.yml
+++ b/.github/workflows/ct.yml
@@ -55,3 +55,18 @@ jobs:
 
       - name: Run tests 🧪
         run: xvfb-run --server-args="-screen 0 1024x768x24" npm test
+        
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: 'arm64'
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        
+      - name: Test Docker Build
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: false
+          platforms: linux/arm64,linux/amd64
diff --git a/Dockerfile b/Dockerfile
index 0e4808e..0644af3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,7 @@ RUN set -ex; \
       librsvg2-dev \
       libcurl4-openssl-dev \
       libpixman-1-dev; \
-    wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
+    wget -qO- https://deb.nodesource.com/setup_18.x | bash; \
     apt-get install -y nodejs; \
     apt-get -y remove wget; \
     apt-get -y --purge autoremove; \
@@ -61,7 +61,7 @@ RUN set -ex; \
       libcurl4 \
       librsvg2-2 \
       libpango1.0; \
-    wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
+    wget -qO- https://deb.nodesource.com/setup_18.x | bash; \
     apt-get install -y nodejs; \
     apt-get -y remove wget; \
     apt-get -y --purge autoremove; \
diff --git a/Dockerfile_light b/Dockerfile_light
index f2ea8e4..fa6f9a4 100644
--- a/Dockerfile_light
+++ b/Dockerfile_light
@@ -13,7 +13,7 @@ RUN set -ex; \
     apt-get -y --no-install-recommends install \
       ca-certificates \
       wget; \
-    wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
+    wget -qO- https://deb.nodesource.com/setup_18.x | bash; \
     apt-get install -y nodejs; \
     apt-get -y remove wget; \
     apt-get -y --purge autoremove; \
diff --git a/Dockerfile_test b/Dockerfile_test
index f5b743f..7b9b414 100644
--- a/Dockerfile_test
+++ b/Dockerfile_test
@@ -27,7 +27,7 @@ RUN set -ex; \
       librsvg2-dev \
       libcurl4-openssl-dev \
       libpixman-1-dev; \
-    wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
+    wget -qO- https://deb.nodesource.com/setup_18.x | bash; \
     apt-get install -y nodejs; \
     apt-get clean;
 
diff --git a/README.md b/README.md
index 2e9ff52..d4cbc9b 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Vector and raster maps with GL styles. Server-side rendering by MapLibre GL Nati
 Download vector tiles from [OpenMapTiles](https://data.maptiler.com/downloads/planet/).
 ## Getting Started with Node
 
-Make sure you have Node.js version **14.20.0** or above installed. Node 16 is recommended. (running `node -v` it should output something like `v16.x.x`). Running without docker requires [Native dependencies](https://tileserver.readthedocs.io/en/latest/installation.html#npm) to be installed first.
+Make sure you have Node.js version **14.20.0** or above installed. Node 18 is recommended. (running `node -v` it should output something like `v18.x.x`). Running without docker requires [Native dependencies](https://maptiler-tileserver.readthedocs.io/en/latest/installation.html#npm) to be installed first.
 
 Install `tileserver-gl` with server-side raster rendering of vector tiles with npm. 
 
diff --git a/docs/installation.rst b/docs/installation.rst
index 058b320..a2e61e3 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -60,7 +60,7 @@ Alternatively, you can use ``tileserver-gl-light`` package instead, which is pur
 From source
 ===========
 
-Make sure you have Node v10 (nvm install 10) and run::
+Make sure you have Node v18 (nvm install 18) and run::
 
   npm install
   node .
diff --git a/package.json b/package.json
index 80354d8..19275e7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tileserver-gl",
-  "version": "4.3.4",
+  "version": "4.4.0",
   "description": "Map tile server for JSON GL styles - vector and server side generated raster tiles",
   "main": "src/main.js",
   "bin": "src/main.js",
@@ -69,7 +69,7 @@
   ],
   "license": "BSD-2-Clause",
   "engines": {
-    "node": ">=14.15.0 <17"
+    "node": ">=14.20.0 <19"
   },
   "repository": {
     "url": "git+https://github.com/maptiler/tileserver-gl.git",