File tree Expand file tree Collapse file tree 4 files changed +12
-6
lines changed Expand file tree Collapse file tree 4 files changed +12
-6
lines changed Original file line number Diff line number Diff line change 1
- FROM ubuntu:17.10
1
+ FROM ubuntu:18.04
2
2
3
3
COPY scripts/cross-apt-packages.sh /scripts/
4
4
RUN sh /scripts/cross-apt-packages.sh
5
5
6
- RUN apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends \
6
+ # Enable source repositories, which are disabled by default on Ubuntu >= 18.04
7
+ RUN sed -i 's/^# deb-src/deb-src/' /etc/apt/sources.list
8
+
9
+ RUN apt-get update && apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends \
7
10
build-essential \
8
11
gcc-multilib \
9
12
libedit-dev \
@@ -15,7 +18,10 @@ RUN apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommend
15
18
nodejs \
16
19
python2.7-dev \
17
20
software-properties-common \
18
- unzip
21
+ unzip \
22
+ # Needed for apt-key to work:
23
+ dirmngr \
24
+ gpg-agent
19
25
20
26
RUN apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7924C5513486
21
27
RUN add-apt-repository -y 'deb http://apt.dilos.org/dilos dilos2-testing main'
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ pushd zircon > /dev/null
10
10
11
11
# Download sources
12
12
git init
13
- git remote add origin https://fuchsia.googlesource. com/zircon
13
+ git remote add origin https://github. com/rust-lang-nursery/mirror-google-fuchsia- zircon
14
14
git fetch --depth=1 origin $ZIRCON
15
15
git reset --hard FETCH_HEAD
16
16
Original file line number Diff line number Diff line change 1
- FROM ubuntu:18.10
1
+ FROM ubuntu:19.04
2
2
3
3
RUN apt-get update && apt-get install -y --no-install-recommends \
4
4
g++ \
Original file line number Diff line number Diff line change 1
- FROM ubuntu:18.10
1
+ FROM ubuntu:19.04
2
2
3
3
RUN apt-get update && apt-get install -y --no-install-recommends \
4
4
g++ \
You can’t perform that action at this time.
0 commit comments