Skip to content

Commit

Permalink
Merge pull request #2 from locationlabs/support_1604
Browse files Browse the repository at this point in the history
Support 16.04
  • Loading branch information
ostacey committed May 24, 2016
2 parents 58f637c + 270cb6a commit 44768ca
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions tasks/docker-engine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

- name: Add Docker Engine Repository
apt_repository:
repo: 'deb https://apt.dockerproject.org/repo ubuntu-trusty main'
repo: 'deb https://apt.dockerproject.org/repo ubuntu-{{ ansible_distribution_release }} main'
update_cache: yes


Expand All @@ -26,7 +26,7 @@
# versions, but not the most recent versions.

- name: Install Docker Engine
apt: name="docker-engine={{ docker_version }}-0~trusty" state=present
apt: name="docker-engine={{ docker_version }}-0~{{ ansible_distribution_release }}" state=present
register: docker_engine_install

# If this was the first time Docker was installed, when we gathered facts about
Expand Down
2 changes: 1 addition & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# tasks file for docker.ubuntu
- name: Fail if not a new release of Ubuntu
fail: msg="{{ ansible_distribution_version }} is not an acceptable version of Ubuntu for this role"
when: "ansible_distribution_version not in ['12.04', '13.04', '13.10', '14.04']"
when: "ansible_distribution_version not in ['12.04', '13.04', '13.10', '14.04', '16.04']"

# https://docs.docker.com/installation/ubuntulinux/
- name: Install trusty kernel onto 12.04
Expand Down

0 comments on commit 44768ca

Please sign in to comment.