Browse Source

roles/docker: Make repokey fingerprint overrideable (#7247)

This makes the docker role work the same as the containerd role.
Being able to override this is needed when you have your own debian
repository. E.g. when performing an airgapped installation
pull/7264/head
Arian van Putten 3 years ago
committed by GitHub
parent
commit
040dacd5cd
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
  1. 2
      roles/container-engine/docker/defaults/main.yml
  2. 2
      roles/container-engine/docker/vars/debian.yml
  3. 2
      roles/container-engine/docker/vars/ubuntu.yml

2
roles/container-engine/docker/defaults/main.yml

@ -28,9 +28,11 @@ docker_rh_repo_gpgkey: 'https://download.docker.com/linux/centos/gpg'
# Ubuntu docker-ce repo
docker_ubuntu_repo_base_url: "https://download.docker.com/linux/ubuntu"
docker_ubuntu_repo_gpgkey: 'https://download.docker.com/linux/ubuntu/gpg'
docker_ubuntu_repo_repokey: '9DC858229FC7DD38854AE2D88D81803C0EBFCD88'
# Debian docker-ce repo
docker_debian_repo_base_url: "https://download.docker.com/linux/debian"
docker_debian_repo_gpgkey: 'https://download.docker.com/linux/debian/gpg'
docker_debian_repo_repokey: '9DC858229FC7DD38854AE2D88D81803C0EBFCD88'
docker_bin_dir: "/usr/bin"
# flag to enable/disable docker cleanup

2
roles/container-engine/docker/vars/debian.yml

@ -23,7 +23,7 @@ docker_package_info:
docker_repo_key_info:
url: '{{ docker_debian_repo_gpgkey }}'
repo_keys:
- 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
- '{{ docker_debian_repo_repokey }}'
docker_repo_info:
repos:

2
roles/container-engine/docker/vars/ubuntu.yml

@ -23,7 +23,7 @@ docker_package_info:
docker_repo_key_info:
url: '{{ docker_ubuntu_repo_gpgkey }}'
repo_keys:
- 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
- '{{ docker_ubuntu_repo_repokey }}'
docker_repo_info:
repos:

Loading…
Cancel
Save