diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2019-05-09 11:17:03 +0200 |
|---|---|---|
| committer | Pietro Albini <pietro@pietroalbini.org> | 2019-05-09 11:17:03 +0200 |
| commit | d4f071af23018bab33e7f33617573704323e6daa (patch) | |
| tree | f81ce3c95b55d6aaaf952f74da6fed71996709b9 | |
| parent | 9f8396158457943b63bb39534b9ef86868f7cfac (diff) | |
| download | rust-d4f071af23018bab33e7f33617573704323e6daa.tar.gz rust-d4f071af23018bab33e7f33617573704323e6daa.zip | |
ci: update dist-various-2 to ubuntu 18.04
| -rw-r--r-- | src/ci/docker/dist-various-2/Dockerfile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/ci/docker/dist-various-2/Dockerfile b/src/ci/docker/dist-various-2/Dockerfile index c0f3326524d..1d6a0269c5b 100644 --- a/src/ci/docker/dist-various-2/Dockerfile +++ b/src/ci/docker/dist-various-2/Dockerfile @@ -1,9 +1,12 @@ -FROM ubuntu:17.10 +FROM ubuntu:18.04 COPY scripts/cross-apt-packages.sh /scripts/ RUN sh /scripts/cross-apt-packages.sh -RUN apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends \ +# Enable source repositories, which are disabled by default on Ubuntu >= 18.04 +RUN sed -i 's/^# deb-src/deb-src/' /etc/apt/sources.list + +RUN apt-get update && apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends \ build-essential \ gcc-multilib \ libedit-dev \ @@ -15,7 +18,10 @@ RUN apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommend nodejs \ python2.7-dev \ software-properties-common \ - unzip + unzip \ + # Needed for apt-key to work: + dirmngr \ + gpg-agent RUN apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7924C5513486 RUN add-apt-repository -y 'deb http://apt.dilos.org/dilos dilos2-testing main' |