From 4dab8d76c486b358b7e86ca4e9a9b09e51766e97 Mon Sep 17 00:00:00 2001
From: Felix Faerber <ffaerber@gmail.com>
Date: Thu, 23 Nov 2017 15:40:37 +0100
Subject: [PATCH] ci

---
 .travis.yml     | 25 +++++++++++++++++++++++--
 travis-build.sh |  4 ----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 654281e..e409334 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,28 @@
 sudo: required
+dist: trusty
 
-services:
- - docker
+install:
+  # Update docker-engine using Ubuntu 'trusty' apt repo
+  - >
+    curl -sSL "https://get.docker.com/gpg" |
+     sudo -E apt-key add -
+  - >
+    echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" |
+     sudo tee -a /etc/apt/sources.list
+  - sudo apt-get update
+  - >
+    sudo apt-get -o Dpkg::Options::="--force-confdef" \
+     -o Dpkg::Options::="--force-confold" --assume-yes install docker-engine
+  - docker version
+  # Update docker-compose via pip
+  - sudo pip install docker-compose
+  - docker-compose version
+
+before_script:
+  - docker-compose up --build -d
+
+after_script:
+  - docker-compose down
 
 env:
   matrix:
diff --git a/travis-build.sh b/travis-build.sh
index 612e53f..3f590f1 100755
--- a/travis-build.sh
+++ b/travis-build.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 set -e
 
-echo "Updating Docker engine"
-sudo service docker stop
-sudo apt-cache madison docker-ce
-sudo apt-get install docker-ce=17.11.0~ce-0~ubuntu
 docker version
 
 if [ "$ARCH" != "amd64" ]; then