tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

On a test failure only show the last 100 lines of daemon output. 

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2015-11-02 13:43:29 -05:00
parent 621d1a5167
commit 9286e62449
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
script/build-linux-inner
View File

@ -8,7 +8,7 @@ VENV=/code/.tox/py27
mkdir -p `pwd`/dist mkdir -p `pwd`/dist
chmod 777 `pwd`/dist chmod 777 `pwd`/dist
$VENV/bin/pip install -r requirements-build.txt $VENV/bin/pip install -q -r requirements-build.txt
su -c "$VENV/bin/pyinstaller docker-compose.spec" user su -c "$VENV/bin/pyinstaller docker-compose.spec" user
mv dist/docker-compose $TARGET mv dist/docker-compose $TARGET
$TARGET version $TARGET version

3
script/test-versions
View File

@ -31,7 +31,7 @@ for version in $DOCKER_VERSIONS; do
function on_exit() { function on_exit() {
if [[ "$?" != "0" ]]; then if [[ "$?" != "0" ]]; then
docker logs "$daemon_container" docker logs "$daemon_container" 2>&1 | tail -n 100
fi fi
docker rm -vf "$daemon_container" docker rm -vf "$daemon_container"
} }
@ -45,6 +45,7 @@ for version in $DOCKER_VERSIONS; do
--volume="/var/lib/docker" \ --volume="/var/lib/docker" \
dockerswarm/dind:$version \ dockerswarm/dind:$version \
docker daemon -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \ docker daemon -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
2>&1 | tail -n 10
docker run \ docker run \
--rm \ --rm \