Update to use Docker Hub Wattsi image

Follows whatwg/wattsi#118.

Author: domenic

Dockerfile

@@ -3,16 +3,12 @@ FROM debian:stable
 ## dependency installation: nginx, wattsi, and other build tools
 ## cleanup freepascal since it is no longer needed after wattsi build
 RUN apt-get update && \
-    apt-get install -y ca-certificates curl git unzip fp-compiler fp-units-fcl fp-units-net libc6-dev nginx python2.7 python-pip && \
-    git clone https://github.com/whatwg/wattsi.git /whatwg/wattsi && \
-    cd /whatwg/wattsi && \
-    /whatwg/wattsi/build.sh && \
-    cp /whatwg/wattsi/bin/wattsi /bin/ && \
-    apt-get purge -y fp-compiler fp-units-fcl fp-units-net && \
-    apt-get autoremove -y && \
+    apt-get install -y ca-certificates curl git unzip nginx python2.7 python-pip && \
     rm -rf /etc/nginx/sites-enabled/* && \
     rm -rf /var/lib/apt/lists/*
 
+COPY --from=whatwg/wattsi:latest /whatwg/wattsi/bin/wattsi /bin/wattsi
+
 ADD . /whatwg/build
 
 ARG html_source_dir

ci-deploy/Dockerfile

@@ -4,15 +4,13 @@ FROM debian:stable
 
 RUN apt-get update && \
     apt-get install -y ca-certificates curl rsync git unzip \
-    fp-compiler fp-units-fcl fp-units-net libc6-dev         \
     default-jre                                             \
     libfontconfig1 libgomp1 libxml2                         \
     python2.7 python-pip                                    \
     fonts-dejavu fonts-droid-fallback fonts-liberation fonts-symbola fonts-unfonts-core
 
 # Dependency lines above are:
 # - General
-# - Wattsi
 # - validator
 # - Prince
 # - Highlighter
@@ -39,11 +37,7 @@ RUN cd /whatwg && \
     rm -rf pdfsizeopt_libexec.tar.gz pdfsizeopt_libexec
 ENV PATH="/whatwg/pdfsizeopt/bin:${PATH}"
 
-ADD wattsi /whatwg/wattsi
-
-RUN cd /whatwg/wattsi && \
-    /whatwg/wattsi/build.sh
-ENV PATH="/whatwg/wattsi/bin:${PATH}"
+COPY --from=whatwg/wattsi:latest /whatwg/wattsi/bin/wattsi /bin/wattsi
 
 ADD html-build /whatwg/html-build
 

ci-deploy/outside-container.sh

@@ -24,8 +24,6 @@ IS_TEST_OF_HTML_BUILD_ITSELF=${IS_TEST_OF_HTML_BUILD_ITSELF:-false}
   git submodule update
 )
 
-git clone --depth 1 https://github.com/whatwg/wattsi.git wattsi
-
 git clone --depth 1 https://github.com/pts/pdfsizeopt.git pdfsizeopt
 
 # Copy the Docker-related stuff into the working (grandparent) directory.