OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ci: update dist-various-2 to ubuntu 18.04

Browse Source
This commit is contained in:
Pietro Albini 2019-05-09 11:17:03 +02:00
parent 9f83961584
commit d4f071af23
No known key found for this signature in database
GPG Key ID: 3E06ABE80BAAF19C
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ci/docker/dist-various-2/Dockerfile
View File

@ -1,9 +1,12 @@
FROM ubuntu:17.10 FROM ubuntu:18.04
COPY scripts/cross-apt-packages.sh /scripts/ COPY scripts/cross-apt-packages.sh /scripts/
RUN sh /scripts/cross-apt-packages.sh 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 \ build-essential \
gcc-multilib \ gcc-multilib \
libedit-dev \ libedit-dev \
@ -15,7 +18,10 @@ RUN apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommend
nodejs \ nodejs \
python2.7-dev \ python2.7-dev \
software-properties-common \ 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 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' RUN add-apt-repository -y 'deb http://apt.dilos.org/dilos dilos2-testing main'