adding c_cpp at ubuntu 20.04 Dockerfile

Author: thirtytwobits

c_cpp/.gitignore

@@ -0,0 +1,2 @@
+*.tar.bz2
+

c_cpp/Dockerfile

@@ -1,28 +1,53 @@
 #
-# Builds the c_cpp/ubuntu-18.04 toolchain container.
+# Builds the c_cpp/ubuntu-20.04 toolchain container.
 #
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 VOLUME /repo
 
 WORKDIR /repo
 
-
-ENV SONAR_SCANNER_VERSION 4.2.0.1873
 ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US:en
 ENV LC_ALL=en_US.UTF-8
+
+# +---------------------------------------------------------------------------+
+# | BASE INSTALL
+# +---------------------------------------------------------------------------+
+COPY provision.sh /
+RUN /provision.sh
+
+# +---------------------------------------------------------------------------+
+# | INSTALL TOOLCHAINS
+# +---------------------------------------------------------------------------+
+ARG GCC_ARM_NONE_EABI_PLATFORM=x86_64-linux
+ARG GCC_ARM_NONE_EABI_VERSION=10-2020-q4-major
+
+WORKDIR /tmp
+ADD https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2?revision=ca0cbf9c-9de2-491c-ac48-898b5bbc0443&la=en&hash=68760A8AE66026BCF99F05AC017A6A50C6FD832A /tmp/gcc-arm-none-eabi-${GCC_ARM_NONE_EABI_VERSION}-${GCC_ARM_NONE_EABI_PLATFORM}.tar.bz2
+RUN tar xjf gcc-arm-none-eabi-${GCC_ARM_NONE_EABI_VERSION}-${GCC_ARM_NONE_EABI_PLATFORM}.tar.bz2 -C /usr/share/
+RUN rm gcc-arm-none-eabi-${GCC_ARM_NONE_EABI_VERSION}-${GCC_ARM_NONE_EABI_PLATFORM}.tar.bz2
+
+ENV PATH="/usr/share/gcc-arm-none-eabi-${GCC_ARM_NONE_EABI_VERSION}/bin:${PATH}"
+
+HEALTHCHECK CMD arm-none-eabi-gcc --version
+
+# +---------------------------------------------------------------------------+
+# | INSTALL SONAR SCANNER
+# +---------------------------------------------------------------------------+
+ENV SONAR_SCANNER_VERSION 4.2.0.1873
 ENV SONAR_SCANNER_HOME=/sonar-scanner-${SONAR_SCANNER_VERSION}-linux
 ENV SONAR_SCANNER_OPTS="-server"
 
 ENV PATH="${SONAR_SCANNER_HOME}/build-wrapper-linux-x86:${PATH}"
 ENV PATH="${SONAR_SCANNER_HOME}/sonar-scanner-${SONAR_SCANNER_VERSION}-linux/bin:${PATH}"
 
-COPY provision.sh /
 COPY sonar_qube.sh /
-
-RUN /provision.sh
 RUN /sonar_qube.sh
+
+# +---------------------------------------------------------------------------+
+# | INSTALL PYTHON AND NPM STUFF
+# +---------------------------------------------------------------------------+
 RUN pip3 install virtualenv
 RUN pip3 install tox
 RUN cd /tmp && npm install -g gh-pages

c_cpp/README.md

@@ -19,9 +19,9 @@ REPOSITORY   TAG      IMAGE ID       CREATED              SIZE
 ```
 
 ```bash
-docker tag 736647481ad3 uavcan/c_cpp:ubuntu-18.04
+docker tag 736647481ad3 uavcan/c_cpp:ubuntu-20.04
 docker login --username=yourhubusername
-docker push uavcan/c_cpp:ubuntu-18.04
+docker push uavcan/c_cpp:ubuntu-20.04
 ```
 
 Use this pattern for tags:
@@ -35,7 +35,7 @@ uavcan/[toolchain]:[build environment]
 To login to an interactive session do:
 
 ```bash
-docker run --rm -it -v ${PWD}:/repo uavcan/c_cpp:ubuntu-18.04
+docker run --rm -it -v ${PWD}:/repo uavcan/c_cpp:ubuntu-20.04
 ```
 
 ## Toolchain Documentation
@@ -71,10 +71,10 @@ services:
   - docker
 
 before_install:
-- docker pull uavcan/c_cpp:ubuntu-18.04
+- docker pull uavcan/c_cpp:ubuntu-20.04
 
 script:
-- docker run --rm -v $TRAVIS_BUILD_DIR:/repo uavcan/c_cpp:ubuntu-18.04 /bin/sh -c mybuild_command
+- docker run --rm -v $TRAVIS_BUILD_DIR:/repo uavcan/c_cpp:ubuntu-20.04 /bin/sh -c mybuild_command
 
 ```
 
@@ -88,7 +88,7 @@ Example pipeline.yml:
     plugins:
       - docker#v3.5.0:
           workdir: /repo
-          image: "uavcan/c_cpp:ubuntu-18.04"
+          image: "uavcan/c_cpp:ubuntu-20.04"
           propagate-environment: true
           mount-ssh-agent: true
 ```

c_cpp/provision.sh

@@ -32,15 +32,13 @@ export ENV LANGUAGE=en_US:en
 export ENV LC_ALL=en_US.UTF-8
 
 apt-get -y install software-properties-common
-add-apt-repository ppa:team-gcc-arm-embedded/ppa -y
 apt-get update
 apt-get -y install apt-utils
 apt-get -y install python3
 apt-get -y install python3-pip
 apt-get -y install python3-venv
 apt-get -y install cmake
 apt-get -y install git
-apt-get -y install gcc-arm-embedded
 apt-get -y install clang
 apt-get -y install clang-format
 apt-get -y install doxygen
@@ -56,6 +54,7 @@ apt-get -y install gcc-multilib
 apt-get -y install g++-multilib
 apt-get -y install qemu
 apt-get -y install ninja-build
+apt-get -y install can-utils
 
 echo "export PATH=$PATH" >> ~/.bashrc
 echo "export LANG=en_US.UTF-8" >> ~/.bashrc