Skip to content

Commit 73e8a29

Browse files
author
anandkumarpatel
committed
Merge pull request #342 from CodeNow/SAN-3596-upgrade-docker-latest
San 3596 upgrade docker latest
2 parents 6aec799 + dad9843 commit 73e8a29

File tree

3 files changed

+2
-17
lines changed

3 files changed

+2
-17
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
docker_package_name: docker-engine=1.9.1-0~trusty
2+
docker_package_name: docker-engine=1.10.2-0~trusty

ansible/roles/docker/files/docker-engine

Lines changed: 0 additions & 3 deletions
This file was deleted.

ansible/roles/docker/tasks/main.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,33 +65,21 @@
6565
register: copied_config
6666
tags: genDockerConfig
6767

68-
- name: force docker version
69-
become: true
70-
copy:
71-
src=docker-engine
72-
dest=/etc/apt/preferences.d/docker-engine
73-
owner=root
74-
group=root
75-
mode=0600
76-
7768
- name: apt-get update
7869
become: true
7970
apt:
8071
update_cache=yes
8172

82-
8373
- name: install docker
8474
become: true
8575
when: restart is defined or dock is defined
8676
apt:
87-
pkg="{{ docker_package_name }}"
77+
pkg={{ docker_package_name }}
8878
state=present
8979
force=yes
90-
dpkg_options='force-confold,force-confdef'
9180
update_cache=yes
9281
cache_valid_time=604800
9382

94-
9583
- name: restart docker
9684
when: (copied_config.changed and restart is defined) or dock is defined
9785
command: sudo service docker restart

0 commit comments

Comments
 (0)