docker update to 2017-01-08

PX4 · Jan 9, 2017 · bebfa8c · bebfa8c
1 parent 0b7cf1f
commit bebfa8c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -95,13 +95,6 @@ endif
 
 SRC_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
-# optionally run commmands in PX4 docker
-ifdef PX4_DOCKER
-	PX4_RUN = docker run -it --rm -v $(SRC_DIR):$(SRC_DIR):rw -w $(SRC_DIR) -v /tmp/.X11-unix:/tmp/.X11-unix:ro -v $(HOME)/.ccache:$(HOME)/.ccache:rw -e CCACHE_DIR=$(HOME)/.ccache -e LOCAL_USER_ID=`id -u $(USER)` px4io/px4-dev-nuttx:2017-01-01 /bin/bash -c "$1"
-else
-	PX4_RUN = $1
-endif
-
 # check if replay env variable is set & set build dir accordingly
 ifdef replay
 	BUILD_DIR_SUFFIX := _replay

diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh
@@ -12,4 +12,4 @@ docker run -it --rm -w ${SRC_DIR} \
 	-v ${CCACHE_DIR}:${CCACHE_DIR}:rw \
 	-e CCACHE_DIR=${CCACHE_DIR} \
 	-e LOCAL_USER_ID=`id -u` \
-	px4io/px4-dev-nuttx:2017-01-07 /bin/bash -c "$@"
+	px4io/px4-dev-nuttx:2017-01-08 /bin/bash -c "$@"
diff --git a/circle.yml b/circle.yml
@@ -10,11 +10,16 @@ checkout:
     - git submodule deinit -f .
     - git submodule update --init --recursive --force
 
+dependencies:
+  pre:
+    - sudo pip install cpp-coveralls
+    - sudo apt-get install -y lcov
+
 test:
   override:
     - ./Tools/docker_run.sh 'make tests_coverage'
     # copy test results for circleci
     - mkdir -p $CIRCLE_TEST_REPORTS/junit/ && cp ./build_posix_sitl_default/JUnitTestResults.xml build_unittest/test_detail.xml $CIRCLE_TEST_REPORTS/junit/
     - mkdir -p $CIRCLE_ARTIFACTS && cp -R coverage-html $CIRCLE_ARTIFACTS
     # only post to coveralls if not a fork PR
-    - if [ -z ${CIRCLE_PR_USERNAME}]; then ./Tools/docker_run.sh 'cpp-coveralls -l coverage.info'; fi
+    - if [ -z ${CIRCLE_PR_USERNAME}]; then cpp-coveralls -l coverage.info; fi