Update thirdparty (#256)

* Update to Ubuntu 20.04

* Update versions of third-party programs

app/thirdparty/getThirdparty.sh

@@ -3,13 +3,13 @@
 # closure compiler
 mkdir -p closure-compiler
 cd closure-compiler
-wget https://repo1.maven.org/maven2/com/google/javascript/closure-compiler/v20200719/closure-compiler-v20200719.jar
+wget https://repo1.maven.org/maven2/com/google/javascript/closure-compiler/v20210406/closure-compiler-v20210406.jar
 jarfile=(*.jar)
 ln -s $jarfile compiler.jar
 cd ..
 
 # PDFJS
-wget -O pdfjs.zip https://github.com/mozilla/pdf.js/releases/download/v2.1.266/pdfjs-2.1.266-dist.zip
+wget -O pdfjs.zip https://github.com/mozilla/pdf.js/releases/download/v2.7.570/pdfjs-2.7.570-dist.zip
 unzip pdfjs.zip -d pdfjs
 
 # tarballjs

research/Dockerfile

@@ -5,7 +5,7 @@
 # docker run -p 8080:8080 webplotdigitizer:dev
 
 # Set the base image to a long-term Ubuntu release
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 # Dockerfile Maintainer
 MAINTAINER William Denney <wdenney@humanpredictions.com>
@@ -20,9 +20,12 @@ RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive \
        dpkg-reconfigure --frontend noninteractive tzdata
 
+ARG GITREPO=https://github.com/ankitrohatgi/WebPlotDigitizer.git
+ARG GITBRANCH=master
 
-RUN git clone https://github.com/ankitrohatgi/WebPlotDigitizer.git \
+RUN git clone $GITREPO \
     && cd WebPlotDigitizer \
+    && git checkout $GITBRANCH \
     && grep -v wine setupUbuntuDev.sh | \
        sed 's/apt install/apt-get install --yes --no-install-recommends/' > setupUbuntuDev-aptfix.sh \
     && chmod +x setupUbuntuDev-aptfix.sh \

setupUbuntuDev.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Setup an Ubuntu 18.04 system for development
+# Setup an Ubuntu 20.04 system for development
 
 # install Ubuntu packages
 sudo apt install \
@@ -9,7 +9,7 @@ sudo apt install \
      wine-stable \
      npm \
      default-jre \
-     golang-go \
+     golang \
      libeigen3-dev
 
 # install global npm packages