From 573067c54aa039a5efa9f66de7d8fef74da648f6 Mon Sep 17 00:00:00 2001
From: Hector Castro <43639+hectcastro@users.noreply.github.com>
Date: Fri, 29 May 2020 16:38:32 -0400
Subject: [PATCH] Fix failures in making external storage accessible to RWD
 (#3326)

This upgrade addresses an issue with the prior version of azavea.docker
that led to different versions of the Docker daemon and Docker CLI to be
installed.

In addition, this change set removes an override to explicitly use the
AUFS storage driver in development. Instead, we let the Docker installer
chose the best default for the host operating system.
---
 deployment/ansible/group_vars/development | 2 +-
 deployment/ansible/roles.yml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployment/ansible/group_vars/development b/deployment/ansible/group_vars/development
index b0c626dd5..7743aba81 100644
--- a/deployment/ansible/group_vars/development
+++ b/deployment/ansible/group_vars/development
@@ -32,7 +32,7 @@ srat_catchment_api_key: "{{ lookup('env', 'MMW_SRAT_CATCHMENT_API_KEY') }}"
 
 tilecache_bucket_name: "{{ lookup('env', 'MMW_TILECACHE_BUCKET') | default('', true) }}"
 
-docker_options: "-H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock --storage-driver=aufs"
+docker_options: "-H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock"
 
 aws_profile: "mmw-stg"
 
diff --git a/deployment/ansible/roles.yml b/deployment/ansible/roles.yml
index 19c838f21..97a217db1 100644
--- a/deployment/ansible/roles.yml
+++ b/deployment/ansible/roles.yml
@@ -29,4 +29,4 @@
 - src: azavea.java
   version: 0.6.2
 - src: azavea.docker
-  version: 4.0.0
+  version: 6.0.0