mirror of
https://github.com/servo/servo.git
synced 2025-08-06 22:15:33 +01:00
Upgrade CI to Ubuntu 20.04 LTS
19.10 has been at end-of-life since July. Also switch to an un-dated Docker Hub tag. Built docker images expire after a month, and when rebuilding we install the latest versions of additional packages. We might has well pick up-to-date versions of the base system as well. We do stay within one Ubuntu release, though.
This commit is contained in:
parent
2db7abad2b
commit
07fff6c7c7
1 changed files with 11 additions and 9 deletions
|
@ -1,6 +1,4 @@
|
||||||
# Dummy comment to force an image rebuild for https://github.com/servo/servo/issues/27758
|
FROM ubuntu:20.04
|
||||||
|
|
||||||
FROM ubuntu:eoan-20200608
|
|
||||||
|
|
||||||
ENV \
|
ENV \
|
||||||
#
|
#
|
||||||
|
@ -20,10 +18,9 @@ RUN \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
#
|
#
|
||||||
# Running mach with Python 2
|
# Running mach with Python 2
|
||||||
python \
|
python2 \
|
||||||
python-pip \
|
python2-dev \
|
||||||
python-dev \
|
python-is-python2 \
|
||||||
python-virtualenv \
|
|
||||||
#
|
#
|
||||||
# Running mach with Python 3
|
# Running mach with Python 3
|
||||||
python3 \
|
python3 \
|
||||||
|
@ -38,5 +35,10 @@ RUN \
|
||||||
curl \
|
curl \
|
||||||
# Setting the default locale
|
# Setting the default locale
|
||||||
locales \
|
locales \
|
||||||
locales-all
|
locales-all \
|
||||||
|
&& \
|
||||||
|
#
|
||||||
|
# Python 2 bits that have been removed from Ubuntu packages
|
||||||
|
curl https://bootstrap.pypa.io/get-pip.py -sSf -o get-pip.py && \
|
||||||
|
python2 get-pip.py && \
|
||||||
|
python2 -m pip install virtualenv
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue