From da0f4184540e0a196599a2ed5b61945c99e66cae Mon Sep 17 00:00:00 2001 From: Matthew Blue Date: Sat, 30 Jun 2018 15:47:32 -0400 Subject: [PATCH 1/2] Update to Ubuntu Bionic --- Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d4532e0..7ccc58e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -42,6 +42,7 @@ RUN \ build-essential \ ca-certificates \ ccache \ + cmake \ coccinelle \ curl \ cppcheck \ @@ -107,11 +108,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 && \ From 72c1dcaa5cf2bc2b21a73f699a931b4e40f3fc96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Thu, 8 Nov 2018 12:48:00 +0100 Subject: [PATCH 2/2] bionic: add `clang-tools` for `scan-build` In ubuntu bionic, `scan-build` has been moved to the `clang-tools` package. dpkg-query -S /usr/bin/scan-build clang-tools: /usr/bin/scan-build --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 7ccc58e4..ddc393fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -87,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 \