Bug 1643504 - Upgrade webrender and wgpu docker images to Debian buster. r=kats

Differential Revision: https://phabricator.services.mozilla.com/D78419

gfx/wr/ci-scripts/docker-image/Dockerfile

@@ -1,4 +1,7 @@
-FROM debian:stretch-20181112
+FROM debian:buster-20200422
+
+# Debian 10 doesn't have openjdk-8, so add the Debian 9 repository, which contains it.
+RUN sed s/buster/stretch/ /etc/apt/sources.list | tee /etc/apt/sources.list.d/stretch.list
 
 COPY setup.sh /root
 RUN cd /root && ./setup.sh

gfx/wr/ci-scripts/docker-image/setup.sh

@@ -33,15 +33,5 @@ apt-get install -y \
     python-yaml \
     software-properties-common
 
-# Get freetype 2.8 with subpixel rendering enabled. The SNAPSHOT_ARCHIVE
-# variable is just to work around servo-tidy's moronic 80-char width limit
-# in shell scripts.
-SNAPSHOT_ARCHIVE=http://snapshot.debian.org/archive/debian/20180213T153535Z
-curl -sSfL -o libfreetype6.deb \
-  "${SNAPSHOT_ARCHIVE}/pool/main/f/freetype/libfreetype6_2.8.1-2_amd64.deb"
-curl -sSfL -o libfreetype6-dev.deb \
-  "${SNAPSHOT_ARCHIVE}/pool/main/f/freetype/libfreetype6-dev_2.8.1-2_amd64.deb"
-apt install -y ./libfreetype6.deb ./libfreetype6-dev.deb
-
 # Other stuff we need
 pip install servo-tidy==0.3.0

taskcluster/ci/docker-image/kind.yml

@@ -225,10 +225,10 @@ jobs:
         symbol: I(flatpak)
     webrender:
         symbol: I(webrender)
-        parent: debian9-base
+        parent: debian10-base
     wgpu:
         symbol: I(wgpu)
-        parent: debian9-base
+        parent: debian10-base
     condprof:
         symbol: I(condprof)
         parent: ubuntu1804-test
@@ -237,7 +237,7 @@ jobs:
         parent: debian10-base
     github-sync:
         symbol: I(github-sync)
-        parent: debian9-base
+        parent: debian10-base
     system-symbols-mac:
         symbol: I(system-symbols-mac)
     system-symbols-win:

taskcluster/docker/github-sync/prepare.sh

@@ -20,7 +20,7 @@ apt-get install -y \
     git \
     g++ \
     libffi-dev \
-    libgit2-dev/stretch-backports \
+    libgit2-dev \
     libssl-dev \
     python3 \
     python3-dev \

taskcluster/docker/webrender/Dockerfile

@@ -6,6 +6,10 @@ VOLUME /builds/worker/checkouts
 VOLUME /builds/worker/workspace
 VOLUME /builds/worker/tooltool-cache
 
+# %include taskcluster/docker/recipes/prepare_openjdk.sh
+COPY topsrcdir/taskcluster/docker/recipes/prepare_openjdk.sh /tmp/prepare_openjdk.sh
+RUN /tmp/prepare_openjdk.sh && rm /tmp/prepare_openjdk.sh
+
 # %include gfx/wr/ci-scripts/docker-image/setup.sh
 ADD topsrcdir/gfx/wr/ci-scripts/docker-image/setup.sh /tmp/wr-setup.sh
 RUN /bin/bash /tmp/wr-setup.sh && rm /tmp/wr-setup.sh