From 059f052b6af9a66463108c440873d21b46979d09 Mon Sep 17 00:00:00 2001
From: redsky17 <joedonofry@gmail.com>
Date: Thu, 14 Feb 2019 02:53:18 +0000
Subject: [PATCH] More docker changes
---
.travis.yml | 5 +++--
Dockerfile | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 31abe8f99..fbe1d2a3e 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 6e89faede..534c73d48 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/* && \
--
GitLab