From 61094b06fdd7ff391d7c1d4402539d8b5d690d20 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@users.noreply.github.com>
Date: Thu, 3 Nov 2016 17:19:53 -0700
Subject: [PATCH] Do we need trusty in Travis? (#3737)

* do we need trusty?

* add docker as a dependency for boulder??
---
 .travis.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 373e16174..733b45f52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,6 @@ cache:
     directories:
         - $HOME/.cache/pip
 
-# This makes sure we get a host with docker-compose present.
-dist: trusty
-
 before_install:
   - 'dpkg -s libaugeas0'
 
@@ -21,30 +18,34 @@ matrix:
   include:
     - python: "2.7"
       env: TOXENV=cover BOULDER_INTEGRATION=1
-      sudo: true
+      sudo: required
       after_failure:
         - sudo cat /var/log/mysql/error.log
         - ps aux | grep mysql
+      services: docker
     - python: "2.7"
       env: TOXENV=lint
     - python: "2.7"
       env: TOXENV=py27-oldest BOULDER_INTEGRATION=1
-      sudo: true
+      sudo: required
       after_failure:
         - sudo cat /var/log/mysql/error.log
         - ps aux | grep mysql
+      services: docker
     - python: "2.6"
       env: TOXENV=py26 BOULDER_INTEGRATION=1
-      sudo: true
+      sudo: required
       after_failure:
         - sudo cat /var/log/mysql/error.log
         - ps aux | grep mysql
+      services: docker
     - python: "2.6"
       env: TOXENV=py26-oldest BOULDER_INTEGRATION=1
-      sudo: true
+      sudo: required
       after_failure:
         - sudo cat /var/log/mysql/error.log
         - ps aux | grep mysql
+      services: docker
     - sudo: required
       env: TOXENV=nginx_compat
       services: docker