commit 6fe463731fbeb89d4dda1b1b54aa221a7b5d99f8
author Zack Williams <zdw@cs.arizona.edu> Thu Jun 29 08:30:21 2017 -0700
committer Zack Williams <zdw@cs.arizona.edu> Fri Jun 30 14:45:24 2017 -0700
tree cca77f02a5545f94e082e5afd36620bae5349a9e
parent 3833383e93da2b303f104bb1f6918810f147b85c

[CORD-1481]
Update Ansible and docker-compose

Change-Id: Ifc48827de42a1677d19b2826c6d1047d96a21bcf

roles/docker/tasks/main.yml

diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index ce0e90b..ba3a6f5 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -21,11 +21,10 @@
   apt_repository:
     repo: "{{ docker_apt_repo }}"
 
-- name: Install docker engine
+- name: Install docker-ce
   become: yes
   apt:
-    name: docker-engine=1.12*
-    force: yes
+    name: "docker-ce=17.06.*"
     update_cache: yes
     cache_valid_time: 3600
 
@@ -51,8 +50,8 @@
   pip:
     name: "{{ item }}"
   with_items:
-    - docker-py
-    - docker-compose==1.9
+    - "docker==2.4.2"
+    - "docker-compose==1.14.0"
 
 - name: Make current user part of the Docker group
   become: yes