From 4e040de75d74fcd6e1ce238d87c8673efda67ccb Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Sat, 26 Nov 2016 23:58:23 -0500 Subject: [PATCH 1/2] circleci-matrix: Display "Waiting for node0 - done" message on a new line --- .circleci-matrix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci-matrix.yml b/.circleci-matrix.yml index 4201e3d..700dde5 100644 --- a/.circleci-matrix.yml +++ b/.circleci-matrix.yml @@ -48,6 +48,7 @@ command: exit_code=$? if [[ $exit_code -eq 0 ]]; then break; elif [[ $exit_code -eq 1 ]]; then echo -n "."; else exit $exit_code;fi done + echo "" echo "Waiting for node0 - done" echo "Copying base image from node0" From 5e29d1e3385c2be97d0aba146ebf21764e813abc Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Sat, 26 Nov 2016 23:57:11 -0500 Subject: [PATCH 2/2] circleci-matrix: less verbose docker push and pull --- .circleci-matrix.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci-matrix.yml b/.circleci-matrix.yml index 700dde5..31c2dc6 100644 --- a/.circleci-matrix.yml +++ b/.circleci-matrix.yml @@ -26,7 +26,7 @@ command: fi echo "Pulling dockcross/base" - time docker pull dockcross/base + time docker pull dockcross/base | cat echo "Pulling dockcross/base - done" time make base.test @@ -69,7 +69,7 @@ command: fi echo "Pulling dockcross/$IMAGE" - time docker pull dockcross/$IMAGE + time docker pull dockcross/$IMAGE | cat echo "Pulling dockcross/$IMAGE - done" echo "Loading base.tar from ~/docker cache" @@ -88,12 +88,12 @@ command: echo "Docker login - done" if [[ $CIRCLE_NODE_INDEX == 0 ]] && [[ ! -f ~/BASE_PUSHED ]]; then echo "Pushing dockcross/base" - time docker push dockcross/base + time docker push dockcross/base | cat echo "Pulling dockcross/base - done" touch ~/BASE_PUSHED fi echo "Pushing dockcross/$IMAGE" - time docker push dockcross/$IMAGE + time docker push dockcross/$IMAGE | cat echo "Pushing dockcross/$IMAGE - done" fi