From: James Gregg Date: Wed, 16 Jan 2019 21:11:40 +0000 (-0700) Subject: Add docker-ce edge channel option for Ubuntu 18.04 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=da33cb58544e319f17ce6171d68fc498a54e715b;p=ansible%2Froles%2Fdocker-install.git Add docker-ce edge channel option for Ubuntu 18.04 Change-Id: I7072404fe6d35646f05d88ce4a132def35a43604 Signed-off-by: James Gregg --- diff --git a/defaults/main.yml b/defaults/main.yml index 82f5e38..57267f0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -2,5 +2,6 @@ docker_service_enable: true mtu: 1500 docker_ce_name: docker-ce +docker_repo_channel: stable ubuntu_docker_version: latest centos_docker_version: latest diff --git a/tasks/main.yml b/tasks/main.yml index fad079a..13eec28 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -23,6 +23,14 @@ - ansible_distribution == 'Ubuntu' - ubuntu_docker_version != 'latest' +- name: "Checking for Docker repo channel" + set_fact: + docker_repo_channel: 'edge' + when: + - ansible_distribution == 'Ubuntu' + - ansible_distribution_version == '18.04' + - host_arch == 'armhf' + - name: Install Docker (RedHat) block: - name: Install Docker requirements @@ -60,7 +68,7 @@ state: present - name: Add Docker apt-repository apt_repository: - repo: 'deb [arch={{host_arch}}] https://download.docker.com/linux/ubuntu {{ansible_distribution_release}} stable' + repo: 'deb [arch={{host_arch}}] https://download.docker.com/linux/ubuntu {{ansible_distribution_release}} {{docker_repo_channel}}' state: present - name: Install Docker CE apt: