diff --git a/ansible/roles/docker/defaults/main.yml b/ansible/roles/docker/defaults/main.yml index 5735c856..c78329ff 100644 --- a/ansible/roles/docker/defaults/main.yml +++ b/ansible/roles/docker/defaults/main.yml @@ -1,2 +1,2 @@ --- -docker_package_name: docker-engine=1.9.1-0~trusty +docker_package_name: docker-engine=1.10.2-0~trusty diff --git a/ansible/roles/docker/files/docker-engine b/ansible/roles/docker/files/docker-engine deleted file mode 100644 index c2f63a90..00000000 --- a/ansible/roles/docker/files/docker-engine +++ /dev/null @@ -1,3 +0,0 @@ -Package: docker-engine -Pin: version 1.9.1* -Pin-Priority: 1001 diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index 26af2910..6fce9e86 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -65,33 +65,21 @@ register: copied_config tags: genDockerConfig -- name: force docker version - become: true - copy: - src=docker-engine - dest=/etc/apt/preferences.d/docker-engine - owner=root - group=root - mode=0600 - - name: apt-get update become: true apt: update_cache=yes - - name: install docker become: true when: restart is defined or dock is defined apt: - pkg="{{ docker_package_name }}" + pkg={{ docker_package_name }} state=present force=yes - dpkg_options='force-confold,force-confdef' update_cache=yes cache_valid_time=604800 - - name: restart docker when: (copied_config.changed and restart is defined) or dock is defined command: sudo service docker restart