Update docker util script and travis to use new base container

[qmk_firmware.git] / util / travis_test.sh

diff --git a/util/travis_test.sh b/util/travis_test.sh
index 6c48f898ce5a2295bd9e452b08e20ef38facce55..e6a50ac1658e7a889d14ca2e4bb9fc503efc0b55 100644 (file)
--- a/util/travis_test.sh
+++ b/util/travis_test.sh
@@ -19,4 +19,11 @@ if [ "$BRANCH" != "master" ] && [ "$NUM_IMPACTING_CHANGES" == "0" ]; then
     exit 0
 fi
 
+# if docker is installed - call make within the qmk docker image
+if command -v docker >/dev/null; then
+  function make() {
+    docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
+  }
+fi
+
 make test:all