docker-compose: Exit after jobs are done

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/docs/docker-compose/start.sh b/docs/docker-compose/start.sh
index 9c71889af50848a505467e440dd69d02edf48858..25ae832a91bd82da2a447e3bb5d0376278239458 100755 (executable)
--- a/docs/docker-compose/start.sh
+++ b/docs/docker-compose/start.sh
@@ -30,4 +30,9 @@ ssh-keygen -t ed25519 -N '' -f $SSH_PRIVKEY_PATH
 export SSH_PRIVKEY=$(cat $SSH_PRIVKEY_PATH)
 export SSH_PUBKEY=$(cat $SSH_PRIVKEY_PATH.pub)
 
-docker-compose up --build
+trap "docker-compose down" SIGINT
+docker-compose up \
+    --build \
+    --abort-on-container-exit \
+    --exit-code-from teuthology
+docker-compose down
\ No newline at end of file

diff --git a/docs/docker-compose/teuthology.sh b/docs/docker-compose/teuthology.sh
index affaf82366cb26de5d3d6cf9048c60bbc0d06457..ea4e0a2cd88d3fea3362e44d65553bdeb0944724 100755 (executable)
--- a/docs/docker-compose/teuthology.sh
+++ b/docs/docker-compose/teuthology.sh
@@ -22,5 +22,5 @@ teuthology-suite -v \
     /teuthology/custom_conf.yaml
 teuthology-dispatcher -v \
     --log-dir /teuthology/log \
-    --tube testnode
-tail -f /dev/null
\ No newline at end of file
+    --tube testnode \
+    --exit-on-empty-queue
\ No newline at end of file