Skip to content

Commit

Permalink
Merge branch 'geerlingguy:master' into master
Browse files Browse the repository at this point in the history
sorobon authored Nov 30, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents b18ecfb + 8ff4a24 commit e889bca
Showing 4 changed files with 9 additions and 3 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -60,12 +60,12 @@ The main Docker repo URL, common between Debian and RHEL systems.
docker_apt_repository: "deb [arch={{ docker_apt_arch }}] {{ docker_repo_url }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"
docker_apt_ignore_key_error: True
docker_apt_gpg_key: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg"
docker_apt_filename: ""
docker_apt_filename: "docker"

(Used only for Debian/Ubuntu.) You can switch the channel to `nightly` if you want to use the Nightly release.

You can change `docker_apt_gpg_key` to a different url if you are behind a firewall or provide a trustworthy mirror.
Usually in combination with changing `docker_apt_repository` as well.
Usually in combination with changing `docker_apt_repository` as well. `docker_apt_filename` controls the name of the source list file created in `sources.list.d`. If you are upgrading from an older (<7.0.0) version of this role, you should change this to the name of the existing file (e.g. `download_docker_com_linux_debian` on Debian) to avoid conflicting lists.

docker_yum_repo_url: "{{ docker_repo_url }}/{{ (ansible_distribution == 'Fedora') | ternary('fedora','centos') }}/docker-{{ docker_edition }}.repo"docker_edition }}.repo
docker_yum_repo_enable_nightly: '0'
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ docker_apt_ansible_distribution: "{{ 'ubuntu' if ansible_distribution in ['Pop!_
docker_apt_arch: "{{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }}"
docker_apt_repository: "deb [arch={{ docker_apt_arch }} signed-by=/etc/apt/trusted.gpg.d/docker.asc] {{ docker_repo_url }}/{{ docker_apt_ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"

Check warning on line 41 in defaults/main.yml

GitHub Actions / Lint

41:201 [line-length] line too long (237 > 200 characters)

Check warning on line 41 in defaults/main.yml

GitHub Actions / Lint

41:201 [line-length] line too long (237 > 200 characters)

Check warning on line 41 in defaults/main.yml

GitHub Actions / Lint

41:201 [line-length] line too long (237 > 200 characters)

Check warning on line 41 in defaults/main.yml

GitHub Actions / Lint

41:201 [line-length] line too long (237 > 200 characters)

Check warning on line 41 in defaults/main.yml

GitHub Actions / Lint

41:201 [line-length] line too long (237 > 200 characters)

Check warning on line 41 in defaults/main.yml

GitHub Actions / Lint

41:201 [line-length] line too long (237 > 200 characters)

Check warning on line 41 in defaults/main.yml

GitHub Actions / Lint

41:201 [line-length] line too long (237 > 200 characters)

Check warning on line 41 in defaults/main.yml

GitHub Actions / Lint

41:201 [line-length] line too long (237 > 200 characters)

Check warning on line 41 in defaults/main.yml

GitHub Actions / Lint

41:201 [line-length] line too long (237 > 200 characters)

Check warning on line 41 in defaults/main.yml

GitHub Actions / Lint

41:201 [line-length] line too long (237 > 200 characters)

Check warning on line 41 in defaults/main.yml

GitHub Actions / Lint

41:201 [line-length] line too long (237 > 200 characters)
docker_apt_ignore_key_error: true
docker_apt_gpg_key: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg"
docker_apt_gpg_key: "{{ docker_repo_url }}/{{ docker_apt_ansible_distribution | lower }}/gpg"
docker_apt_gpg_key_checksum: "sha256:1500c1f56fa9e26b9b8f42452a553675796ade0807cdce11975eb98170b3a570"
docker_apt_filename: "docker"

1 change: 1 addition & 0 deletions tasks/setup-Debian.yml
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
package:
name:
- docker
- docker.io
- docker-engine
state: absent

5 changes: 5 additions & 0 deletions tasks/setup-RedHat.yml
Original file line number Diff line number Diff line change
@@ -44,6 +44,11 @@

- name: Configure containerd on RHEL 8.
block:
- name: Ensure runc is not installed.
package:
name: runc
state: absent

- name: Ensure container-selinux is installed.
package:
name: container-selinux

0 comments on commit e889bca

Please sign in to comment.