diff --git a/docker/main/Makefile.in b/docker/main/Makefile.in index c8c1e367..b10050f8 100644 --- a/docker/main/Makefile.in +++ b/docker/main/Makefile.in @@ -72,11 +72,10 @@ push: sudo docker push $(IMG) # Start the clixon system container and run the test script -# sleep is for waiting for start script to run properly before starting tests # Note tests will kill the daemons started in the start scrips test: docker ./cleanup.sh ; PORT=8080 ./start.sh # kill (ignore error) and the start it - sleep 1; sudo docker exec -it clixon-system bash -c 'cd /usr/local/bin/test && ./all.sh' + sudo docker exec -it clixon-system bash -c 'cd /usr/local/bin/test && ./all.sh' depend: diff --git a/docker/main/startsystem.sh b/docker/main/startsystem.sh index e3c772ef..c9fbbd0e 100755 --- a/docker/main/startsystem.sh +++ b/docker/main/startsystem.sh @@ -40,7 +40,7 @@ # See also Dockerfile of the example # Log msg, see with docker logs -set -eux +set -ux # e but clixon_backend may fail if test is run in parallell >&2 echo "$0" diff --git a/docker/main/startsystem_evhtp.sh b/docker/main/startsystem_evhtp.sh index fd3cf9ba..f3c4cb0f 100755 --- a/docker/main/startsystem_evhtp.sh +++ b/docker/main/startsystem_evhtp.sh @@ -39,7 +39,7 @@ # See also Dockerfile of the example # Log msg, see with docker logs -set -eux +set -ux # e but clixon_backend may fail if test is run in parallell >&2 echo "$0" diff --git a/docker/main/startsystem_fcgi.sh b/docker/main/startsystem_fcgi.sh index 432f3554..329fb9af 100755 --- a/docker/main/startsystem_fcgi.sh +++ b/docker/main/startsystem_fcgi.sh @@ -40,7 +40,7 @@ # See also Dockerfile of the example # Log msg, see with docker logs -set -eux +set -ux # e but clixon_backend may fail if test is run in parallell >&2 echo "$0"