mirror of
				https://github.com/geerlingguy/ansible-role-docker.git
				synced 2025-10-24 11:16:46 +02:00 
			
		
		
		
	update: seperate the docker_obsolete_packages to their ansible_os_family based files in vars
This commit is contained in:
		
							parent
							
								
									c030c45954
								
							
						
					
					
						commit
						f8fc149b99
					
				
							
								
								
									
										15
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								README.md
									
									
									
									
									
								
							| @ -31,7 +31,7 @@ You can control whether the package is installed, uninstalled, or at the latest | |||||||
| 
 | 
 | ||||||
| ```yaml | ```yaml | ||||||
| # Used only for Debian/Ubuntu | # Used only for Debian/Ubuntu | ||||||
| docker_obsolete_packages_debian: | docker_obsolete_packages: | ||||||
|   - docker |   - docker | ||||||
|   - docker.io |   - docker.io | ||||||
|   - docker-engine |   - docker-engine | ||||||
| @ -41,19 +41,6 @@ docker_obsolete_packages_debian: | |||||||
|   - podman-docker |   - podman-docker | ||||||
|   - containerd |   - containerd | ||||||
|   - runc |   - runc | ||||||
| 
 |  | ||||||
| # Used only for Fedora/CentOS/Rocky |  | ||||||
| docker_obsolete_packages_redhat: |  | ||||||
|   - docker |  | ||||||
|   - docker-client |  | ||||||
|   - docker-client-latest |  | ||||||
|   - docker-common |  | ||||||
|   - docker-latest |  | ||||||
|   - docker-latest-logrotate |  | ||||||
|   - docker-logrotate |  | ||||||
|   - docker-selinux |  | ||||||
|   - docker-engine-selinux |  | ||||||
|   - docker-engine |  | ||||||
| ``` | ``` | ||||||
| 
 | 
 | ||||||
| A list of packages to be uninstalled prior to running this role. See Docker's installation instructions for an up-to-date list of old packages that should be removed: | A list of packages to be uninstalled prior to running this role. See Docker's installation instructions for an up-to-date list of old packages that should be removed: | ||||||
|  | |||||||
| @ -21,17 +21,6 @@ docker_obsolete_packages_debian: | |||||||
|   - containerd |   - containerd | ||||||
|   - runc |   - runc | ||||||
| 
 | 
 | ||||||
| # Used only for Fedora/CentOS/Rocky |  | ||||||
| docker_obsolete_packages_redhat: |  | ||||||
|   - docker |  | ||||||
|   - docker-client |  | ||||||
|   - docker-client-latest |  | ||||||
|   - docker-common |  | ||||||
|   - docker-latest |  | ||||||
|   - docker-latest-logrotate |  | ||||||
|   - docker-logrotate |  | ||||||
|   - docker-engine |  | ||||||
| 
 |  | ||||||
| # Service options. | # Service options. | ||||||
| docker_service_manage: true | docker_service_manage: true | ||||||
| docker_service_state: started | docker_service_state: started | ||||||
|  | |||||||
| @ -20,7 +20,7 @@ | |||||||
| - # See https://docs.docker.com/engine/install/debian/#uninstall-old-versions | - # See https://docs.docker.com/engine/install/debian/#uninstall-old-versions | ||||||
|   name: Ensure old versions of Docker are not installed. |   name: Ensure old versions of Docker are not installed. | ||||||
|   ansible.builtin.package: |   ansible.builtin.package: | ||||||
|     name: "{{ docker_obsolete_packages_debian }}" |     name: "{{ docker_obsolete_packages }}" | ||||||
|     state: absent |     state: absent | ||||||
| 
 | 
 | ||||||
| - name: Ensure dependencies are installed. | - name: Ensure dependencies are installed. | ||||||
|  | |||||||
| @ -3,7 +3,7 @@ | |||||||
| # or  https://docs.docker.com/engine/install/centos/#uninstall-old-versions | # or  https://docs.docker.com/engine/install/centos/#uninstall-old-versions | ||||||
| - name: Ensure old versions of Docker are not installed. | - name: Ensure old versions of Docker are not installed. | ||||||
|   ansible.builtin.package: |   ansible.builtin.package: | ||||||
|     name: "{{ docker_obsolete_packages_redhat }}" |     name: "{{ docker_obsolete_packages }}" | ||||||
|     state: absent |     state: absent | ||||||
| 
 | 
 | ||||||
| - name: Add Docker GPG key. | - name: Add Docker GPG key. | ||||||
|  | |||||||
							
								
								
									
										11
									
								
								vars/Debian.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								vars/Debian.yml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,11 @@ | |||||||
|  | # Used only for Debian/Ubuntu | ||||||
|  | docker_obsolete_packages: | ||||||
|  |   - docker | ||||||
|  |   - docker.io | ||||||
|  |   - docker-engine | ||||||
|  |   - docker-doc | ||||||
|  |   - docker-compose | ||||||
|  |   - docker-compose-v2 | ||||||
|  |   - podman-docker | ||||||
|  |   - containerd | ||||||
|  |   - runc | ||||||
							
								
								
									
										10
									
								
								vars/RedHat.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								vars/RedHat.yml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,10 @@ | |||||||
|  | # Used only for Fedora/CentOS/Rocky | ||||||
|  | docker_obsolete_packages: | ||||||
|  |   - docker | ||||||
|  |   - docker-client | ||||||
|  |   - docker-client-latest | ||||||
|  |   - docker-common | ||||||
|  |   - docker-latest | ||||||
|  |   - docker-latest-logrotate | ||||||
|  |   - docker-logrotate | ||||||
|  |   - docker-engine | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user