docker: use GCC7 on Ubuntu 16.04

mavlink · Oct 22, 2019 · 80a80f8 · 80a80f8
1 parent 07cd40a
commit 80a80f8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
         stage('Ubuntu 16.04 Debug') {
           agent {
             docker {
-              image 'mavsdk/mavsdk-ubuntu-16.04:2019-07-14'
+              image 'mavsdk/mavsdk-ubuntu-16.04:2019-10-22'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -40,7 +40,7 @@ pipeline {
         stage('Ubuntu 16.04 Release') {
           agent {
             docker {
-              image 'mavsdk/mavsdk-ubuntu-16.04:2019-07-14'
+              image 'mavsdk/mavsdk-ubuntu-16.04:2019-10-22'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -70,7 +70,7 @@ pipeline {
         stage('Ubuntu 18.04 Debug') {
           agent {
             docker {
-              image 'mavsdk/mavsdk-ubuntu-18.04:2019-07-14'
+              image 'mavsdk/mavsdk-ubuntu-18.04:2019-10-22'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -100,7 +100,7 @@ pipeline {
         stage('Ubuntu 18.04 Release') {
           agent {
             docker {
-              image 'mavsdk/mavsdk-ubuntu-18.04:2019-07-14'
+              image 'mavsdk/mavsdk-ubuntu-18.04:2019-10-22'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -130,7 +130,7 @@ pipeline {
         stage('Ubuntu 18.04 Debug PX4 SITL') {
           agent {
             docker {
-              image 'mavsdk/mavsdk-ubuntu-18.04-px4-sitl:2019-07-14'
+              image 'mavsdk/mavsdk-ubuntu-18.04-px4-sitl:2019-10-22'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -158,7 +158,7 @@ pipeline {
         stage('Fedora 29 Debug') {
           agent {
             docker {
-              image 'mavsdk/mavsdk-fedora-29:2019-07-14'
+              image 'mavsdk/mavsdk-fedora-29:2019-10-22'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -188,7 +188,7 @@ pipeline {
         stage('Fedora 29 Release') {
           agent {
             docker {
-              image 'mavsdk/mavsdk-fedora-29:2019-07-14'
+              image 'mavsdk/mavsdk-fedora-29:2019-10-22'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -218,7 +218,7 @@ pipeline {
         stage('Fedora 30 Debug') {
           agent {
             docker {
-              image 'mavsdk/mavsdk-fedora-30:2019-07-14'
+              image 'mavsdk/mavsdk-fedora-30:2019-10-22'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -248,7 +248,7 @@ pipeline {
         stage('Fedora 30 Release') {
           agent {
             docker {
-              image 'mavsdk/mavsdk-fedora-30:2019-07-14'
+              image 'mavsdk/mavsdk-fedora-30:2019-10-22'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -344,7 +344,7 @@ pipeline {
         stage('check style') {
           agent {
             docker {
-              image 'mavsdk/mavsdk-ubuntu-16.04:2019-07-14'
+              image 'mavsdk/mavsdk-ubuntu-16.04:2019-10-22'
               args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
             }
           }
@@ -368,7 +368,7 @@ pipeline {
     stage('Generate Docs') {
       agent {
         docker {
-          image 'mavsdk/mavsdk-ubuntu-16.04:2019-07-14'
+          image 'mavsdk/mavsdk-ubuntu-16.04:2019-10-22'
           args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
         }
       }

diff --git a/docker/Dockerfile-Ubuntu-16.04 b/docker/Dockerfile-Ubuntu-16.04
@@ -46,6 +46,12 @@ RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
     && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/* \
     && update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-6.0 1000
 
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test \
+    && apt-get update \
+    && apt-get install -y gcc-7 g++-7 \
+    && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/* \
+    && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 --slave /usr/bin/g++ g++ /usr/bin/g++-7
+
 RUN gem install --no-document fpm;
 
 RUN wget -qO- https://github.com/ncopa/su-exec/archive/dddd1567b7c76365e1e0aac561287975020a8fad.tar.gz | tar xvz && \