mirror of
				https://github.com/geerlingguy/ansible-role-docker.git
				synced 2025-11-01 01:19:32 +01:00 
			
		
		
		
	PR #47 follow-up: Add tests for Ubuntu 18.04 Bionic, Fedora 27, and fix boolean case.
This commit is contained in:
		
							parent
							
								
									0e4bd56a14
								
							
						
					
					
						commit
						7b0f422f32
					
				@ -3,9 +3,10 @@ services: docker
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
env:
 | 
					env:
 | 
				
			||||||
  - distro: centos7
 | 
					  - distro: centos7
 | 
				
			||||||
 | 
					  - distro: ubuntu1804
 | 
				
			||||||
  - distro: ubuntu1604
 | 
					  - distro: ubuntu1604
 | 
				
			||||||
  - distro: ubuntu1404
 | 
					  - distro: debian9
 | 
				
			||||||
  - distro: debian8
 | 
					  - distro: fedora27
 | 
				
			||||||
 | 
					
 | 
				
			||||||
script:
 | 
					script:
 | 
				
			||||||
  # Configure test script so we can run extra tests after playbook is run.
 | 
					  # Configure test script so we can run extra tests after playbook is run.
 | 
				
			||||||
 | 
				
			|||||||
@ -31,6 +31,7 @@ Docker Compose installation options.
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    docker_apt_release_channel: stable
 | 
					    docker_apt_release_channel: stable
 | 
				
			||||||
    docker_apt_repository: "deb https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"
 | 
					    docker_apt_repository: "deb https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"
 | 
				
			||||||
 | 
					    docker_apt_ignore_key_error: True
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(Used only for Debian/Ubuntu.) You can switch the channel to `edge` if you want to use the Edge release.
 | 
					(Used only for Debian/Ubuntu.) You can switch the channel to `edge` if you want to use the Edge release.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -13,9 +13,9 @@ docker_compose_path: /usr/local/bin/docker-compose
 | 
				
			|||||||
# Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed.
 | 
					# Used only for Debian/Ubuntu. Switch 'stable' to 'edge' if needed.
 | 
				
			||||||
docker_apt_release_channel: stable
 | 
					docker_apt_release_channel: stable
 | 
				
			||||||
docker_apt_repository: "deb https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"
 | 
					docker_apt_repository: "deb https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"
 | 
				
			||||||
docker_apt_ignore_key_error: true
 | 
					docker_apt_ignore_key_error: True
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Used only for RedHat/CentOS/Fedora
 | 
					# 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_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_edge: 0
 | 
				
			||||||
docker_yum_repo_enable_test: 0
 | 
					docker_yum_repo_enable_test: 0
 | 
				
			||||||
 | 
				
			|||||||
@ -12,6 +12,9 @@ galaxy_info:
 | 
				
			|||||||
    versions:
 | 
					    versions:
 | 
				
			||||||
    - 6
 | 
					    - 6
 | 
				
			||||||
    - 7
 | 
					    - 7
 | 
				
			||||||
 | 
					  - name: Fedora
 | 
				
			||||||
 | 
					    versions:
 | 
				
			||||||
 | 
					    - all
 | 
				
			||||||
  - name: Debian
 | 
					  - name: Debian
 | 
				
			||||||
    versions:
 | 
					    versions:
 | 
				
			||||||
    - jessie
 | 
					    - jessie
 | 
				
			||||||
@ -19,6 +22,7 @@ galaxy_info:
 | 
				
			|||||||
    versions:
 | 
					    versions:
 | 
				
			||||||
    - trusty
 | 
					    - trusty
 | 
				
			||||||
    - xenial
 | 
					    - xenial
 | 
				
			||||||
 | 
					    - bionic
 | 
				
			||||||
  galaxy_tags:
 | 
					  galaxy_tags:
 | 
				
			||||||
    - web
 | 
					    - web
 | 
				
			||||||
    - system
 | 
					    - system
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user