From: Maxim Uvarov <maxim.uva...@linaro.org> Signed-off-by: Maxim Uvarov <maxim.uva...@linaro.org> --- /** Email created from pull request 647 (muvarov:master_docker2) ** https://github.com/Linaro/odp/pull/647 ** Patch: https://github.com/Linaro/odp/pull/647.patch ** Base sha: 6886a2ca3d3dd1157302ddee424c36f632903bd0 ** Merge commit sha: f6c5d19f7fb9f83b8a2cbbed692a510146ca7df9 **/ .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml index b2882524d..2b40889c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,7 +77,7 @@ install: script: - if [ "${CC#clang}" != "${CC}" ] ; then LD="" CXX=clang++; fi - if [ -n "${CROSS_ARCH}" ] ; then - docker run -i -t -v `pwd`:/odp -v /lib/modules:/lib/modules -v /usr/src:/usr/src + docker run -i -t -v `pwd`:/odp -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" -e CONF="${CONF}" -e DPDK_SHARED="${DPDK_SHARED}" lngodp/odp_ubuntu_14.04.5 /root/build_${CROSS_ARCH}.sh ; @@ -105,7 +105,7 @@ jobs: compiler: gcc script: - docker run --privileged -i -t - -v `pwd`:/odp -v /lib/modules:/lib/modules -v /usr/src:/usr/src --shm-size 8g + -v `pwd`:/odp --shm-size 8g -e CODECOV_TOKEN="${CODECOV_TOKEN}" -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" -e CONF="${CONF}" @@ -115,7 +115,7 @@ jobs: compiler: gcc script: - docker run --privileged -i -t - -v `pwd`:/odp -v /lib/modules:/lib/modules -v /usr/src:/usr/src --shm-size 8g + -v `pwd`:/odp --shm-size 8g -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" -e CONF="${CONF}" ${DOCKER_NAMESPACE}/travis-odp-lng-x86 /odp/scripts/ci/distcheck.sh @@ -150,7 +150,7 @@ jobs: - stage: "build only" env: Ubuntu14.04_arm64 script: - - docker run -i -t -v `pwd`:/odp -v /lib/modules:/lib/modules -v /usr/src:/usr/src + - docker run -i -t -v `pwd`:/odp lngodp/odp_ubuntu_14.04.5 /root/build_arm64.sh - stage: test compiler: gcc @@ -175,7 +175,7 @@ jobs: env: CROSS_ARCH="i386" script: - docker run --privileged -i -t - -v `pwd`:/odp -v /lib/modules:/lib/modules -v /usr/src:/usr/src + -v `pwd`:/odp -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" -e CONF="${CONF}" lngodp/odp_ubuntu_14.04.5_i386 /root/build_${CROSS_ARCH}.sh ; @@ -184,7 +184,7 @@ jobs: env: CROSS_ARCH="i386" script: - docker run --privileged -i -t - -v `pwd`:/odp -v /lib/modules:/lib/modules -v /usr/src:/usr/src + -v `pwd`:/odp -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" -e CONF="${CONF}" lngodp/odp_ubuntu_14.04.5_i386 /root/build_${CROSS_ARCH}.sh ; @@ -211,7 +211,7 @@ jobs: env: CROSS_ARCH="i386" CONF="--disable-abi-compat" script: - docker run --privileged -i -t - -v `pwd`:/odp -v /lib/modules:/lib/modules -v /usr/src:/usr/src + -v `pwd`:/odp -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" -e CONF="${CONF}" lngodp/odp_ubuntu_14.04.5_i386 /root/build_${CROSS_ARCH}.sh ; @@ -220,7 +220,7 @@ jobs: env: CROSS_ARCH="i386" CONF="--disable-abi-compat" script: - docker run --privileged -i -t - -v `pwd`:/odp -v /lib/modules:/lib/modules -v /usr/src:/usr/src + -v `pwd`:/odp -e CC="${CC}" -e LD="${LD}" -e CXX="${CXX}" -e CONF="${CONF}" lngodp/odp_ubuntu_14.04.5_i386 /root/build_${CROSS_ARCH}.sh ;