-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #42 from ZetaR60/riotdocker_bionic
Update to Ubuntu Bionic
- Loading branch information
Showing
1 changed file
with
3 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ | |
# 3. cd to riot root | ||
# 4. # docker run -i -t -u $UID -v $(pwd):/data/riotbuild riotbuild ./dist/tools/compile_test/compile_test.py | ||
|
||
FROM ubuntu:xenial | ||
FROM ubuntu:bionic | ||
|
||
MAINTAINER Joakim Nohlgård <[email protected]> | ||
|
||
|
@@ -42,6 +42,7 @@ RUN \ | |
build-essential \ | ||
ca-certificates \ | ||
ccache \ | ||
cmake \ | ||
coccinelle \ | ||
curl \ | ||
cppcheck \ | ||
|
@@ -86,6 +87,7 @@ RUN \ | |
apt-get -y --no-install-recommends install \ | ||
llvm \ | ||
clang \ | ||
clang-tools \ | ||
&& echo 'Installing socketCAN' >&2 && \ | ||
apt-get -y --no-install-recommends install \ | ||
libsocketcan-dev:i386 \ | ||
|
@@ -107,11 +109,6 @@ RUN echo 'Installing arm-none-eabi toolchain from arm.com' >&2 && \ | |
|
||
ENV PATH ${PATH}:/opt/gcc-arm-none-eabi-7-2018-q2-update/bin | ||
|
||
# Install CMake 3.10 | ||
RUN wget -q https://cmake.org/files/v3.10/cmake-3.10.0.tar.gz -O- \ | ||
| tar -C /tmp -xz && cd /tmp/cmake-3.10.0/ && ./bootstrap && \ | ||
make && make install && cd && rm -rf /tmp/cmake-3.10.0 | ||
|
||
# Install MIPS binary toolchain | ||
# For updates: https://www.mips.com/develop/tools/codescape-mips-sdk/ (select "Codescape GNU Toolchain") | ||
RUN mkdir -p /opt && \ | ||
|