From 61e1a474a80615a90a041dc078eaf55a956baf94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Sat, 8 Dec 2018 01:56:54 +0100
Subject: [PATCH] Merge all docker-compose files

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0042a49a3..6200fc5a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,7 @@ before_install:
 
 install:
   - git submodule update --remote --merge
-  - cd Nitro-Backend && docker-compose up -d & cd ..
-  - cd Nitro-Web && docker-compose up -d & & cd ..
+  - docker-compose -f Nitro-Backend/docker-compose.yml -f Nitro-Web/docker-compose.yml up -d
   - yarn global add cypress
   - yarn global add wait-on