Skip to content

Commit

Permalink
Merge pull request #31 from AerisCloud/update/docker
Browse files Browse the repository at this point in the history
Update docker repository for CentOS 7 and Debian
  • Loading branch information
MiLk authored Oct 18, 2017
2 parents 07db53c + 086e0c5 commit db22233
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
15 changes: 11 additions & 4 deletions templates/centos7/docker.repo.j2
Original file line number Diff line number Diff line change
@@ -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
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
4 changes: 2 additions & 2 deletions vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit db22233

Please sign in to comment.