Skip to content

Commit

Permalink
Update docker image for Servo dependencies. (#24673)
Browse files Browse the repository at this point in the history
Bump the base image to Ubuntu 20.04.
  • Loading branch information
jdm authored Jul 24, 2020
1 parent 2b2864e commit f50b529
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .taskcluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ tasks:
owner: ${owner}
source: ${event.repository.clone_url}
payload:
image: webplatformtests/wpt:0.42
image: webplatformtests/wpt:0.46
maxRunTime: 7200
artifacts:
public/results:
Expand Down
1 change: 0 additions & 1 deletion tools/ci/tc/decision.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ def build_full_command(event, task):
~/start.sh \
%(repo_url)s \
%(fetch_ref)s;
sudo add-apt-repository ppa:deadsnakes/ppa
%(install_str)s
cd web-platform-tests;
./tools/ci/run_tc.py %(options_str)s -- %(task_cmd)s;
Expand Down
7 changes: 6 additions & 1 deletion tools/ci/tc/tasks/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ components:
workerType: ci
schedulerId: taskcluster-github
deadline: "24 hours"
image: webplatformtests/wpt:0.42
image: webplatformtests/wpt:0.46
maxRunTime: 7200
artifacts:
public/results:
Expand Down Expand Up @@ -392,6 +392,9 @@ tasks:
- trigger-pr
- tox-python3
command: ./tools/ci/ci_tools_unittest.sh
install:
- python3.6
- python3.6-dev
env:
HYPOTHESIS_PROFILE: ci
schedule-if:
Expand Down Expand Up @@ -444,6 +447,8 @@ tasks:
command: ./tools/ci/ci_tools_integration_test.sh
install:
- libnss3-tools
- python3.6
- python3.6-dev
options:
oom-killer: true
browser:
Expand Down
20 changes: 17 additions & 3 deletions tools/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:20.04

# No interactive frontend during docker build
ENV DEBIAN_FRONTEND=noninteractive \
Expand All @@ -10,12 +10,14 @@ RUN apt-get -qqy update \
bridge-utils \
bzip2 \
ca-certificates \
curl \
dbus-x11 \
earlyoom \
fluxbox \
gdebi \
git \
gstreamer1.0-plugins-bad \
gstreamer1.0-gl \
libosmesa6-dev \
libvirt-daemon-system \
libvirt-clients \
Expand All @@ -24,17 +26,29 @@ RUN apt-get -qqy update \
locales \
openjdk-8-jre-headless \
pulseaudio \
python \
python-pip \
python2 \
python2-dev \
python3 \
python3-dev \
python3-pip \
software-properties-common \
qemu-kvm \
tzdata \
sudo \
unzip \
wget \
xvfb

# python3.6 is not available by default in new versions of Ubuntu.
RUN apt-add-repository -y ppa:deadsnakes/ppa

# Ensure that scripts referencing `/usr/bin/env python` work.
RUN apt install python-is-python2

# The python-pip package no longer exists in new versions of Ubuntu.
RUN curl https://bootstrap.pypa.io/get-pip.py --output get-pip.py
RUN python2 get-pip.py

# Installing just the deps of firefox and chrome is moderately tricky, so
# just install the default versions of them, and some extra deps we happen
# to know that chrome requires
Expand Down

0 comments on commit f50b529

Please sign in to comment.