#1 Adjust docker and docker-compose installation

defaults/main.yml

@@ -2,3 +2,4 @@ docker_pip_packages:
   - 'docker'
   - 'docker-compose'
 docker_subnet: '172.17.0.0/24'
+docker_compose_version: '1.17.1'

tasks/install.yml

@@ -3,25 +3,30 @@
 
 - name: "Apt Key"
   apt_key:
-    keyserver: 'p80.pool.sks-keyservers.net'
-    id: '58118E89F3A912897C070ADBF76221572C52609D'
+    url: 'https://download.docker.com/linux/ubuntu/gpg'
     state: 'present'
 
 - name: "Apt Repository"
   apt_repository:
-    repo: 'deb https://apt.dockerproject.org/repo ubuntu-{{ ansible_distribution_release }} main'
+    repo: 'deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable'
     state: 'present'
     mode: '644'
 
 - name: "Install Docker Engine"
   apt:
-    pkg: 'docker-engine'
+    pkg: 'docker-ce'
     state: 'installed'
     update_cache: yes
   notify:
     - "Add Docker to Boot-List"
     - "Start Docker"
 
+- name: "Download Docker Compose"
+  get_url:
+    url: 'https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-{{ ansible_system }}-{{ ansible_architecture }}'
+    dest: '/usr/local/bin/docker-compose'
+    mode: '755'
+
 - name: "Configure delayed startup of Docker engine"
   lineinfile:
     dest: '/etc/init/docker.conf'
@@ -37,10 +42,11 @@
     group: 'root'
     mode: '600'
 
-- name: "Install Python Dependencies"
-  pip:
-    name: '{{ item }}'
-  with_items: '{{ docker_pip_packages }}'
+#TODO: Do we really need that for Ansible? Conflict with binary?
+#- name: "Install Python Dependencies"
+#  pip:
+#    name: '{{ item }}'
+#  with_items: '{{ docker_pip_packages }}'
 
 - name: "Ensure group 82"
   group: