Skip to content

Commit

Permalink
Update to node 18, add docker build test (#699)
Browse files Browse the repository at this point in the history
* Update to node 18

* match version in readme

* test docker build

* Update node in docs

* update to new readthedocs url

* v4.4.0
  • Loading branch information
acalcutt authored Jan 9, 2023
1 parent a890382 commit 687bbe1
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 8 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/ct.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down Expand Up @@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_light
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_test
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 687bbe1

Please sign in to comment.