Change to use the docker-engine

tasks/Debian.yml

@@ -1,15 +1,26 @@
----
-- name: Add specific key
-  apt_key: id={{docker_repo_key}} keyserver=keyserver.ubuntu.com state=present
 
-- name: Install https apt transport package
-  apt: pkg=apt-transport-https state=present update_cache=yes
+- name: Add specific key
+  apt_key: keyserver={{docker_repo_key_server}} id={{docker_repo_key}}
 
 - name: Add docker repo
-  apt_repository: repo='deb {{ docker_repo }} docker main' state=present
+  apt_repository: repo='deb {{docker_repo}} ubuntu-{{ansible_distribution_release}} main' state=present
+
+- name: Update apt
+  apt: update_cache=yes
+
+- name: Purge the old repo if it exists
+  apt: name=lxc-docker* purge=yes 
+  ignore_errors: yes
+
+- name: Verify that apt is pulling from the right repository
+  command: apt-cache policy docker-engine
+
+- name: Install the recommended package
+  apt: name=linux-image-extra-{{ansible_kernel}} state=present
+  when: docker_install_recommended_package
 
-- name: Install lxc-docker package
-  apt: pkg=lxc-docker state=present update_cache=yes
+- name: Install Docker
+  apt: name=docker-engine state=present update_cache=yes
 
 # consider separate role here
 - name: Change ufw forward policy to ACCEPT

tasks/RedHat.yml

@@ -1,7 +1,7 @@
 
 - name: Install Docker Repository
   template: src=docker-repo.j2 dest=/etc/yum.repos.d/docker.repo
- 
+
 - name: Install Docker Engine
   yum: name=docker-engine state=present
 

tasks/init.yml

@@ -24,7 +24,7 @@
   when: systemd_check.stat.exists == true
   notify: 
     - Restart Docker
-  
+
 - name: Docker systemd file
   template: src=docker-service.j2 dest=/lib/systemd/system/docker.service backup=yes
   when: systemd_check.stat.exists == true

tasks/main.yml

@@ -7,11 +7,17 @@
   when: docker_create_group
   tags:
     - config
-
+
+- name: Create the docker group and add your user
+  command: usermod -aG docker {{ansible_ssh_user}}
+  when: docker_create_group
+  tags:
+    - config
+
 - include: Debian.yml
   when: ansible_os_family == "Debian"
-  
+
 - include: RedHat.yml
   when: ansible_os_family == "RedHat"
 
-- include: init.yml
+# - include: init.yml

vars/Debian.yml

@@ -1,3 +1,5 @@
 # replace with gist variant
-docker_repo_key: "36A1D7869245C8950F966E92D8576A8BA88D21E9"
-docker_repo: "https://get.docker.io/ubuntu"
+docker_repo_key_server: "hkp://p80.pool.sks-keyservers.net:80"
+docker_repo_key: "58118E89F3A912897C070ADBF76221572C52609D"
+docker_repo: "https://apt.dockerproject.org/repo"
+docker_install_recommended_package: True