Skip to content
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

(resolve conflict in dbichko's fork) set debian repository based on major version only #8

Merged
merged 1 commit into from
Jun 9, 2017
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
1 change: 0 additions & 1 deletion files/repos/Debian-8.0

This file was deleted.

13 changes: 8 additions & 5 deletions tasks/os/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@
id: "{{ docker_gpg_key }}"
keyserver: "{{ key_server }}"

- name: ensure repo is present
copy:
src: "repos/{{ ansible_distribution }}-{{ ansible_distribution_version }}"
dest: /etc/apt/sources.list.d/docker.list
- name: ensure docker repo is present
apt_repository:
repo: deb https://apt.dockerproject.org/repo debian-jessie main
state: present
filename: docker
update_cache: true

- name: ensure docker is installed
apt:
name: docker-engine
state: present
update_cache: yes
update_cache: true
cache_valid_time: 3600