From 93d4f487ef17cf008708792ab4087c90933ade38 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 22 Apr 2017 18:25:47 -0400
Subject: [PATCH] travis-ci update to latest docker

---
 .travis.yml         | 16 +++++++++-------
 Tools/docker_run.sh |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2e7b45eb54..a57302b5e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,16 +56,18 @@ env:
     - secure: "h6oajlW68dWIr+wZhO58Dv6e68dZHrBLVA6lPXZmheFQBW6Xam1HuLGA0LOW6cL9TnrAsOZ8g4goB58eMQnMEijFZKi3mhRwZhd/Xjq/ZGJOWBUrLoQHZUw2dQk5ja5vmUlKEoQnFZjDuMjx8KfX5ZMNy8A3yssWZtJYHD8c+bk="
 
 script:
-  - if [[ "${BUILD_TARGET}" = "qgc_firmware" && "${TRAVIS_BRANCH}" != "coverity" ]]; then
+  - if [[ "${TRAVIS_BRANCH}" == "coverity" ]]; then
+      echo "no script for coverity build";
+    elif [[ "${BUILD_TARGET}" = "qgc_firmware" ]]; then
       ./Tools/docker_run.sh 'make qgc_firmware';
-    elif [[ "${BUILD_TARGET}" = "check_format" && "${TRAVIS_BRANCH}" != "coverity" ]]; then
+    elif [[ "${BUILD_TARGET}" = "check_format" ]]; then
       ./Tools/docker_run.sh 'make check_format';
-    elif [[ "${BUILD_TARGET}" = "tests_linux" && "${TRAVIS_BRANCH}" != "coverity" ]]; then
+    elif [[ "${BUILD_TARGET}" = "tests_linux" ]]; then
       ./Tools/docker_run.sh 'make tests';
-    elif [[ "${BUILD_TARGET}" = "clang-tidy" && "${TRAVIS_BRANCH}" != "coverity" ]]; then
-      PX4_DOCKER_REPO=px4io/px4-dev-clang ./Tools/docker_run.sh 'make clang-tidy-parallel';
-    elif [[ "${BUILD_TARGET}" = "parameters_markdown" && "${TRAVIS_BRANCH}" != "coverity" ]]; then
-      PX4_DOCKER_REPO=px4io/px4-dev-base ./Tools/docker_run.sh 'make parameters_markdown';
+    elif [[ "${BUILD_TARGET}" = "parameters_markdown" ]]; then
+      ./Tools/docker_run.sh 'make parameters_markdown';
+    elif [[ "${BUILD_TARGET}" = "clang-tidy" ]]; then
+      PX4_DOCKER_REPO=px4io/px4-dev-clang:2017-04-22 ./Tools/docker_run.sh 'make clang-tidy-parallel';
     elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
       make tests;
     fi
diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh
index 658b8895c2..78c41b00ad 100755
--- a/Tools/docker_run.sh
+++ b/Tools/docker_run.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 if [ -z "$PX4_DOCKER_REPO" ]; then
-	PX4_DOCKER_REPO=px4io/px4-dev-nuttx:2017-01-28
+	PX4_DOCKER_REPO=px4io/px4-dev-nuttx:2017-04-22
 fi
 
 PWD=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )