Skip to content

San 3596 upgrade docker latest #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 8, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/roles/docker/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
docker_package_name: docker-engine=1.9.1-0~trusty
docker_package_name: docker-engine=1.10.2-0~trusty
3 changes: 0 additions & 3 deletions ansible/roles/docker/files/docker-engine

This file was deleted.

14 changes: 1 addition & 13 deletions ansible/roles/docker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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