infrastructure/ansible-role-docker
1
0
Fork 0
mirror of https://github.com/Maks1mS/ansible-role-docker.git synced 2025-10-08 21:53:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Felix Herzog
2020-03-06 11:50:35 +01:00
parent 6e18f1ba3f f934d49473
commit 0e79e207db
15 changed files with 84 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@@ -23,8 +23,8 @@ docker_apt_gpg_key: https://download.docker.com/linux/ubuntu/gpg
# Used only for RedHat/CentOS/Fedora.
docker_yum_repo_url: https://download.docker.com/linux/{{ (ansible_distribution == "Fedora") | ternary("fedora","centos") }}/docker-{{ docker_edition }}.repo
docker_yum_repo_enable_edge: 0
docker_yum_repo_enable_test: 0
docker_yum_repo_enable_edge: '0'
docker_yum_repo_enable_test: '0'
docker_yum_gpg_key: https://download.docker.com/linux/centos/gpg
# A list of users who will be added to the docker group.