From 29e0793cd02b20970db46adafadb2ba50ffa1aec Mon Sep 17 00:00:00 2001
From: Niklas Riekenbrauck <nikriek@users.noreply.github.com>
Date: Thu, 29 Dec 2016 18:23:22 +0100
Subject: [PATCH 1/2] Update .travis.yml

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d43d61b..6b1f174 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,3 +3,9 @@ node_js:
   - "6"
 services:
   - mongodb
+after_success:
+  - if [ "$TRAVIS_BRANCH" == "master" ]; then
+    docker build -t nikriek/projectsecure-client:latest --build-arg API_URL=$API_URL . ;
+    docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
+    docker push nikriek/projectsecure-client:latest;
+    fi

From 2a29275f39fb620a594eecc1af70896123ed7657 Mon Sep 17 00:00:00 2001
From: Niklas Riekenbrauck <nikriek@users.noreply.github.com>
Date: Thu, 29 Dec 2016 18:33:30 +0100
Subject: [PATCH 2/2] Update .travis.yml

---
 .travis.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 6b1f174..9d19db3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,22 @@
+sudo: required
+
 language: node_js
 node_js:
   - "6"
+
 services:
   - mongodb
+  - docker
+
+env:
+  DOCKER_COMPOSE_VERSION: 1.6.0
+
+before_install:
+  - sudo rm /usr/local/bin/docker-compose
+  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - chmod +x docker-compose
+  - sudo mv docker-compose /usr/local/bin
+  
 after_success:
   - if [ "$TRAVIS_BRANCH" == "master" ]; then
     docker build -t nikriek/projectsecure-client:latest --build-arg API_URL=$API_URL . ;