From aace703c6534af153aac7e780a42ae4c562a23aa Mon Sep 17 00:00:00 2001
From: Feanil Patel <feanil@edx.org>
Date: Thu, 29 Jun 2017 12:26:10 -0400
Subject: [PATCH] Update to new docker package scheme and PPAs.
---
playbooks/roles/docker-tools/defaults/main.yml | 7 ++++---
playbooks/roles/docker-tools/tasks/main.yml | 9 ++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/playbooks/roles/docker-tools/defaults/main.yml b/playbooks/roles/docker-tools/defaults/main.yml
index ae33d28..28676d2 100644
--- a/playbooks/roles/docker-tools/defaults/main.yml
+++ b/playbooks/roles/docker-tools/defaults/main.yml
@@ -5,9 +5,10 @@ docker_tools_deps_deb_pkgs:
- ca-certificates
- python-pip
-docker_apt_keyserver: "hkp://ha.pool.sks-keyservers.net:80"
-docker_apt_key_id: "58118E89F3A912897C070ADBF76221572C52609D"
-docker_repo: "deb https://apt.dockerproject.org/repo ubuntu-xenial main"
+docker_apt_key_url: "https://download.docker.com/linux/ubuntu/gpg"
+docker_repos:
+ - "deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable"
+ - "deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} edge"
docker_group: "docker"
docker_users: []
diff --git a/playbooks/roles/docker-tools/tasks/main.yml b/playbooks/roles/docker-tools/tasks/main.yml
index 8a0089c..e112a2a 100644
--- a/playbooks/roles/docker-tools/tasks/main.yml
+++ b/playbooks/roles/docker-tools/tasks/main.yml
@@ -29,24 +29,23 @@
- name: add docker apt key
apt_key:
- keyserver: "{{ docker_apt_keyserver }}"
- id: "{{ docker_apt_key_id }}"
+ url: "{{ docker_apt_key_url }}"
tags:
- install
- install:configuration
- name: add docker repo
apt_repository:
- repo: "{{ docker_repo }}"
+ repo: "{{ item }}"
+ with_items: "{{ docker_repos }}"
tags:
- install
- install:configuration
- name: install docker-engine
apt:
- name: "docker-engine"
+ name: "docker-ce"
update_cache: yes
- cache_valid_time: "{{ cache_valid_time }}"
tags:
- install
- install:system-requirements
--
libgit2 0.26.0