Skip to content

Commit

Permalink
Merge pull request #42 from ZetaR60/riotdocker_bionic
Browse files Browse the repository at this point in the history
Update to Ubuntu Bionic
  • Loading branch information
cladmi authored Nov 27, 2018
2 parents d12a6e2 + 72c1dca commit 97c77bd
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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]>

Expand Down Expand Up @@ -42,6 +42,7 @@ RUN \
build-essential \
ca-certificates \
ccache \
cmake \
coccinelle \
curl \
cppcheck \
Expand Down Expand Up @@ -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 \
Expand All @@ -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 && \
Expand Down

0 comments on commit 97c77bd

Please sign in to comment.