summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Parker-Shemilt <palfrey@tevp.net>2019-12-28 11:42:03 +0000
committerTom Parker-Shemilt <palfrey@tevp.net>2019-12-28 11:42:03 +0000
commitb81fc16224a400cefe789fcbfb0443e25d74b8b9 (patch)
tree8e050ac6ee90a6b6eb69f4bb3bbad9061a2d7a2e
parentcd7dc9125fff1af5c023d19ac13d368a8fd4c6e5 (diff)
Run docker compose in background
-rwxr-xr-x.gitignore1
-rw-r--r--.travis.yml8
2 files changed, 7 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index a31f385..1dc3629 100755
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ config/api.js
config/database.js
public/events/*
!public/events/.gitkeep
+wait-for-it.sh
# Logs
logs
diff --git a/.travis.yml b/.travis.yml
index 6feafff..4bdce21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,13 @@
-language: minimal
+language: shell
+os: linux
services:
- docker
script:
- - docker-compose up --build
+ - docker-compose up --build &
+ - curl https://raw.githubusercontent.com/vishnubob/wait-for-it/9995b721327eac7a88f0dce314ea074d5169634f/wait-for-it.sh -o wait-for-it.sh
+ - chmod +x wait-for-it.sh
+ - ./wait-for-it-sh localhost:3000 --timeout=0
- curl -v http://localhost:3000/
- curl -v http://localhost:3000/new/event/public \ No newline at end of file