mirror of
				https://github.com/geerlingguy/ansible-role-docker.git
				synced 2025-10-24 11:16:46 +02:00 
			
		
		
		
	Merge branch 'geerlingguy:master' into master
This commit is contained in:
		
						commit
						138aa4bd9c
					
				
							
								
								
									
										2
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							| @ -41,7 +41,7 @@ jobs: | ||||
|     strategy: | ||||
|       matrix: | ||||
|         distro: | ||||
|           - centos8 | ||||
|           - rockylinux8 | ||||
|           - centos7 | ||||
|           - ubuntu2004 | ||||
|           - ubuntu1804 | ||||
|  | ||||
							
								
								
									
										6
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @ -32,7 +32,9 @@ jobs: | ||||
|           python-version: '3.x' | ||||
| 
 | ||||
|       - name: Install Ansible. | ||||
|         run: pip3 install ansible-base | ||||
|         run: pip3 install ansible-core | ||||
| 
 | ||||
|       - name: Trigger a new import on Galaxy. | ||||
|         run: ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2) | ||||
|         run: >- | ||||
|           ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} | ||||
|           $(echo ${{ github.repository }} | cut -d/ -f1) $(echo ${{ github.repository }} | cut -d/ -f2) | ||||
|  | ||||
| @ -2,7 +2,7 @@ | ||||
| - name: Check current docker-compose version. | ||||
|   command: "{{ docker_compose_path }} --version" | ||||
|   register: docker_compose_current_version | ||||
|   check_mode: no | ||||
|   check_mode: false | ||||
|   changed_when: false | ||||
|   failed_when: false | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user