diff --git a/.travis.yml b/.travis.yml index 31abe8f9995a58c6e4063e5c99f6ac44d15d4691..fbe1d2a3ed0270a23bdc2ecf266030cc189d90ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,12 +40,13 @@ script: # Build the lib and run the test suite against synapse. - | if [ $TRAVIS_OS_NAME == linux ]; then + docker build -t nheko-reborn/mtxclient . docker run -v `pwd`:/build --net=host \ -e CXX_VERSION=${CXX_VERSION} \ -e CC_VERSION=${CC_VERSION} \ -e COVERAGE=${COVERAGE} \ -e TRAVIS_OS_NAME=${TRAVIS_OS_NAME} \ - mujx/mtxclient-dev:0.1.0 \ + nheko-reborn/mtxclient \ /bin/bash -c "./.ci/script.sh" fi @@ -60,7 +61,7 @@ after_success: - | if [ $COVERAGE == ON ]; then docker run -v `pwd`:/build \ - --net=host mujx/mtxclient-dev:0.1.0 \ + --net=host nheko-reborn/mtxclient \ /bin/bash -c "make -C build -j1 test_coverage && ./.ci/coverage.sh" && \ bash <(curl -s https://codecov.io/bash) -f "!*tests*" || echo "Codecov failed" fi diff --git a/Dockerfile b/Dockerfile index 6e89faedef9717d91d6fc4024083d491d3f61f3c..534c73d48064ef16460cc6a905c31f389f5e64b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,7 +78,7 @@ RUN \ cd json && \ cmake . && \ make && \ - make install + make install && \ #curl -L https://github.com/nlohmann/json/releases/download/v3.2.0/json.hpp -o /usr/local/include/json.hpp && \ rm -rf /build/* && \ rm -rf /var/lib/apt/lists/* && \