From 744362a4d7a492ab6a047f9b63d4fcfa85521464 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Thu, 3 Jan 2019 22:37:48 -0200
Subject: [PATCH] Link docker-compose to docker-compose.travis

---
 .travis.yml               | 2 +-
 docker-compose.travis.yml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 90191674c..d92b68c35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ before_install:
 
 install:
   - docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT --target production -t humanconnection/nitro-web .
-  - docker-compose -f docker-compose.travis.yml up -d
+  - docker-compose -f docker-compose.yml -f docker-compose.travis.yml up -d
   - git clone https://github.com/Human-Connection/Nitro-Backend.git ../Nitro-Backend
   - git -C "../Nitro-Backend" checkout $TRAVIS_BRANCH || echo "Branch \`$TRAVIS_BRANCH\` does not exist, falling back to \`master\`"
   - docker-compose -f ../Nitro-Backend/docker-compose.yml -f ../Nitro-Backend/docker-compose.travis.yml up -d
diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml
index ab752a230..80942a27a 100644
--- a/docker-compose.travis.yml
+++ b/docker-compose.travis.yml
@@ -2,7 +2,6 @@ version: "3.7"
 
 services:
   backend:
-    image: humanconnection/nitro-web:builder
     build:
       context: .
       target: builder
\ No newline at end of file