diff options
| author | Richard Hansen <rhansen@rhansen.org> | 2016-01-23 02:38:33 -0500 |
|---|---|---|
| committer | Richard Hansen <rhansen@rhansen.org> | 2016-01-31 16:12:58 -0500 |
| commit | 58106a0fd16b119f20e4837194c4d7aab3ab89b4 (patch) | |
| tree | 84d83d76ca6dced132cc301e615332bdbfd6bda1 | |
| parent | b21fdda7459d3b7a1d405a9f133581bf87355303 (diff) | |
| download | gitlab-58106a0fd16b119f20e4837194c4d7aab3ab89b4.tar.gz | |
check if docker container is up when waiting for gitlab
There's no point in waiting for GitLab to come up if the docker
container died.
| -rwxr-xr-x | tools/build_test_env.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/build_test_env.sh b/tools/build_test_env.sh index 56f5716..3810758 100755 --- a/tools/build_test_env.sh +++ b/tools/build_test_env.sh @@ -75,7 +75,9 @@ OK="echo -e ${GREEN}OK${NC}" log "Waiting for gitlab to come online... " I=0 while :; do - sleep 5 + sleep 1 + docker top gitlab-test >/dev/null 2>&1 || fatal "docker failed to start" + sleep 4 curl -s http://localhost:8080/users/sign_in 2>/dev/null \ | grep -q "GitLab Community Edition" && break let I=I+5 |