From aee0c57f7c4cf257e21ab05b32e1594b4c52337c Mon Sep 17 00:00:00 2001
From: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>
Date: Sat, 26 Nov 2022 23:26:23 +0530
Subject: [PATCH] revert: old files unneeded in this PR

Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>
---
 .travis.yml  | 21 +++++++++++++
 Dockerfile   | 87 ++++++++++++++++++++--------------------------------
 package.json |  4 ---
 3 files changed, 55 insertions(+), 57 deletions(-)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..75fbaf2
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,21 @@
+language: node_js
+node_js:
+  - "10"
+env:
+  - CXX=g++-4.8
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++
+  - sudo apt-get install -qq xvfb libgles2-mesa-dev libgbm-dev libxxf86vm-dev
+install:
+  - npm install
+  - wget -O test_data.zip https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/test_data.zip
+  - unzip -q test_data.zip -d test_data
+script:
+  - xvfb-run --server-args="-screen 0 1024x768x24" npm test
diff --git a/Dockerfile b/Dockerfile
index b79f8d2..0e4808e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,45 +6,33 @@ RUN set -ex; \
     export DEBIAN_FRONTEND=noninteractive; \
     apt-get -qq update; \
     apt-get -y --no-install-recommends install \
-      build-essential=12.8ubuntu1 \
-      ca-certificates=20211016~20.04.1 \
-      wget=1.20.3-1ubuntu1 \
-      pkg-config=0.29.1-0ubuntu4 \
-      xvfb=2:1.20.13-1ubuntu1~20.04.3 \
-      libglfw3-dev=3.3.2-1 \
-      libuv1-dev=1.34.2-1ubuntu1.3 \
-      libjpeg-turbo8=2.0.3-0ubuntu1.20.04.3 \
-      libicu66=66.1-2ubuntu2.1 \
-      libcairo2-dev=1.16.0-4ubuntu1 \
-      libpango1.0-dev=1.44.7-2ubuntu4 \
-      libjpeg-dev=8c-2ubuntu8 \
-      libgif-dev=5.1.9-1 \
-      librsvg2-dev=2.48.2-1 \
-      gir1.2-rsvg-2.0=2.48.2-1 \
-      librsvg2-2=2.48.2-1 \
-      librsvg2-common=2.48.2-1 \
-      libcurl4-openssl-dev=7.68.0-1ubuntu2.14 \
-      libpixman-1-dev=0.38.4-0ubuntu1; \
-      apt-get -y --purge autoremove; \
-      apt-get clean; \
-      rm -rf /var/lib/apt/lists/*;
-
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-RUN wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
+      build-essential \
+      ca-certificates \
+      wget \
+      pkg-config \
+      xvfb \
+      libglfw3-dev \
+      libuv1-dev \
+      libjpeg-turbo8 \
+      libicu66 \
+      libcairo2-dev \
+      libpango1.0-dev \
+      libjpeg-dev \
+      libgif-dev \
+      librsvg2-dev \
+      libcurl4-openssl-dev \
+      libpixman-1-dev; \
+    wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
     apt-get install -y nodejs; \
-    npm i -g npm@latest; \
     apt-get -y remove wget; \
     apt-get -y --purge autoremove; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*;
 
 RUN mkdir -p /usr/src/app
-COPY package* /usr/src/app
+COPY package* /usr/src/app/
 
-WORKDIR /usr/src/app
-
-RUN npm install --omit=dev
+RUN cd /usr/src/app && npm ci --omit=dev
 
 FROM ubuntu:focal AS final
 
@@ -59,29 +47,22 @@ RUN set -ex; \
     useradd -r -g node node; \
     apt-get -qq update; \
     apt-get -y --no-install-recommends install \
-      ca-certificates=20211016~20.04.1 \
-      wget=1.20.3-1ubuntu1 \
-      xvfb=2:1.20.13-1ubuntu1~20.04.3 \
-      libglfw3=3.3.2-1 \
-      libuv1=1.34.2-1ubuntu1.3 \
-      libjpeg-turbo8=2.0.3-0ubuntu1.20.04.3 \
-      libicu66=66.1-2ubuntu2.1 \
-      libcairo2=1.16.0-4ubuntu1 \
-      libgif7=5.1.9-1 \
-      libopengl0=1.3.2-1~ubuntu0.20.04.2 \
-      libpixman-1-0=0.38.4-0ubuntu1 \
-      libcurl4=7.68.0-1ubuntu2.14 \
-      librsvg2-2=2.48.2-1 \
-      libpango-1.0-0=1.44.7-2ubuntu4; \
-      apt-get -y --purge autoremove; \
-      apt-get clean; \
-      rm -rf /var/lib/apt/lists/*;
-
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-RUN wget -qO- https://deb.nodesource.com/setup_16.x | bash; \ 
+      ca-certificates \
+      wget \
+      xvfb \
+      libglfw3 \
+      libuv1 \
+      libjpeg-turbo8 \
+      libicu66 \
+      libcairo2 \
+      libgif7 \
+      libopengl0 \
+      libpixman-1-0 \
+      libcurl4 \
+      librsvg2-2 \
+      libpango1.0; \
+    wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
     apt-get install -y nodejs; \
-    npm i -g npm@latest; \
     apt-get -y remove wget; \
     apt-get -y --purge autoremove; \
     apt-get clean; \
diff --git a/package.json b/package.json
index 965c68b..3132a05 100644
--- a/package.json
+++ b/package.json
@@ -71,10 +71,6 @@
   "engines": {
     "node": ">=14.15.0 <17"
   },
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/",
-    "access": "public"
-  },
   "repository": {
     "url": "git+https://github.com/maptiler/tileserver-gl.git",
     "type": "git"