From 086e0c5a403836f9ea781fb7f072cdb08cc06707 Mon Sep 17 00:00:00 2001 From: Christophe Robin Date: Wed, 18 Oct 2017 10:46:55 +0900 Subject: [PATCH] Update docker repository for CentOS 7 and Debian --- README.md | 2 +- templates/centos7/docker.repo.j2 | 15 +++++++++++---- vars/main.yml | 4 ++-- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 385996b..57222b0 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ name | ------------------------------------------------------------------------------|----------------------------------------------- [`couchbase`](http://www.couchbase.com/) | `couchbase` [`ceph`](http://ceph.com/) | `ceph` -[`docker`](https://www.docker.com/) | `dockerrepo` +[`docker`](https://www.docker.com/) | `docker-ce-stable` [`elasticsearch`](https://www.elastic.co/products/elasticsearch) | `elasticsearch-2.x` [`endpoint`](https://packages.endpoint.com/) | `endpoint` [`epel`](https://fedoraproject.org/wiki/EPEL) | `epel` diff --git a/templates/centos7/docker.repo.j2 b/templates/centos7/docker.repo.j2 index 82675d8..85419b3 100644 --- a/templates/centos7/docker.repo.j2 +++ b/templates/centos7/docker.repo.j2 @@ -1,6 +1,13 @@ -[dockerrepo] -name=Docker Repository -baseurl=https://yum.dockerproject.org/repo/main/centos/7/ +[docker-ce-stable] +name=Docker CE Stable - $basearch +baseurl=https://download.docker.com/linux/centos/7/$basearch/stable enabled={{item['enabled']|default(0)}} gpgcheck=1 -gpgkey=https://yum.dockerproject.org/gpg \ No newline at end of file +gpgkey=https://download.docker.com/linux/centos/gpg + +[docker-ce-stable-source] +name=Docker CE Stable - Sources +baseurl=https://download.docker.com/linux/centos/7/source/stable +enabled=0 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/centos/gpg diff --git a/vars/main.yml b/vars/main.yml index 8b714ca..d484912 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -21,8 +21,8 @@ repository_list: repo: docker.repo jessie: key: "docker.gpg" - url: "https://apt.dockerproject.org/repo" - pool: "debian-{{ ansible_distribution_release }} main" + url: "https://download.docker.com/linux/debian/" + pool: "{{ ansible_distribution_release }} stable" dotdeb: wheezy: key: "dotdeb.gpg"