From c417813df916789fa29a83c3e31f196777e718d3 Mon Sep 17 00:00:00 2001
From: Steve Kamerman <stevekamerman@gmail.com>
Date: Sun, 22 Apr 2018 16:03:43 -0400
Subject: [PATCH 1/3] Fixed out-of-scope variable

---
 test/conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/conftest.py b/test/conftest.py
index 43f83bb..54c3b08 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -257,7 +257,7 @@ def get_nginx_conf_from_container(container):
     strm, stat = container.get_archive('/etc/nginx/conf.d/default.conf')
     with tarfile.open(fileobj=StringIO(strm.read())) as tf:
         conffile = tf.extractfile('default.conf')
-    return conffile.read()
+        return conffile.read()
 
 
 def docker_compose_up(compose_file='docker-compose.yml'):

From 9be2624d094a16b9a1d648888f29264713da48fd Mon Sep 17 00:00:00 2001
From: Steve Kamerman <stevekamerman@gmail.com>
Date: Sun, 22 Apr 2018 16:08:29 -0400
Subject: [PATCH 2/3] Increased dependency versions to get around pip internal
 problem

---
 test/conftest.py                          | 4 ++--
 test/requirements/python-requirements.txt | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/conftest.py b/test/conftest.py
index 54c3b08..6bd172a 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -469,5 +469,5 @@ try:
 except docker.errors.ImageNotFound:
     pytest.exit("The docker image 'jwilder/nginx-proxy:test' is missing")
 
-if docker.__version__ != "2.0.2":
-    pytest.exit("This test suite is meant to work with the python docker module v2.0.2")
+if docker.__version__ != "2.1.0":
+    pytest.exit("This test suite is meant to work with the python docker module v2.1.0")
diff --git a/test/requirements/python-requirements.txt b/test/requirements/python-requirements.txt
index e868e14..ba95455 100644
--- a/test/requirements/python-requirements.txt
+++ b/test/requirements/python-requirements.txt
@@ -1,5 +1,5 @@
 backoff==1.3.2
-docker-compose==1.11.1
-docker==2.0.2
+docker-compose==1.11.2
+docker==2.1.0
 pytest==3.0.5
-requests==2.11.1
\ No newline at end of file
+requests==2.11.1

From af266c0b83e1b769fd9d90a3fa34a982fec051b2 Mon Sep 17 00:00:00 2001
From: Steve Kamerman <stevekamerman@gmail.com>
Date: Sun, 22 Apr 2018 16:43:00 -0400
Subject: [PATCH 3/3] Remove old docker.list to avoid getting unstable Docker
 version

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 268e275..7a1c66f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,8 @@ env:
   - TEST_TARGET: test-alpine
 
 before_install:
-  - sudo apt-get remove docker docker-engine
+  - sudo apt-get -y remove docker docker-engine docker-ce
+  - sudo rm /etc/apt/sources.list.d/docker.list
   - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
   - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
   - sudo apt-get update