From 57fa3660c9ba8d83c1cd370d15422f5ceb5f1ca4 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 9 Jun 2020 13:35:40 +0000 Subject: [PATCH] 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 | 5 ++++- gfx/wr/ci-scripts/docker-image/setup.sh | 10 ---------- taskcluster/ci/docker-image/kind.yml | 6 +++--- taskcluster/docker/github-sync/prepare.sh | 2 +- taskcluster/docker/webrender/Dockerfile | 4 ++++ 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/gfx/wr/ci-scripts/docker-image/Dockerfile b/gfx/wr/ci-scripts/docker-image/Dockerfile index b890b8415c36..c187172f5db8 100644 --- a/gfx/wr/ci-scripts/docker-image/Dockerfile +++ b/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 diff --git a/gfx/wr/ci-scripts/docker-image/setup.sh b/gfx/wr/ci-scripts/docker-image/setup.sh index 92a07f289870..4a20147f3b0c 100755 --- a/gfx/wr/ci-scripts/docker-image/setup.sh +++ b/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 diff --git a/taskcluster/ci/docker-image/kind.yml b/taskcluster/ci/docker-image/kind.yml index 642e9e431da4..76d58a86a912 100644 --- a/taskcluster/ci/docker-image/kind.yml +++ b/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: diff --git a/taskcluster/docker/github-sync/prepare.sh b/taskcluster/docker/github-sync/prepare.sh index 7bb3fa9f0c52..8efdec2e2753 100755 --- a/taskcluster/docker/github-sync/prepare.sh +++ b/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 \ diff --git a/taskcluster/docker/webrender/Dockerfile b/taskcluster/docker/webrender/Dockerfile index 03343900a098..f26b9b7e82fe 100644 --- a/taskcluster/docker/webrender/Dockerfile +++ b/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