From 040dacd5cdd6dbffb10c18f02d404384de461e84 Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Fri, 5 Feb 2021 16:44:52 +0100
Subject: [PATCH] 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
---
roles/container-engine/docker/defaults/main.yml | 2 ++
roles/container-engine/docker/vars/debian.yml | 2 +-
roles/container-engine/docker/vars/ubuntu.yml | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/roles/container-engine/docker/defaults/main.yml b/roles/container-engine/docker/defaults/main.yml
index 64e9f06b9..c82e5c5b2 100644
--- a/roles/container-engine/docker/defaults/main.yml
+++ b/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
diff --git a/roles/container-engine/docker/vars/debian.yml b/roles/container-engine/docker/vars/debian.yml
index e17262c7d..ef996ec5a 100644
--- a/roles/container-engine/docker/vars/debian.yml
+++ b/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:
diff --git a/roles/container-engine/docker/vars/ubuntu.yml b/roles/container-engine/docker/vars/ubuntu.yml
index 5a3d252a6..5cdc69915 100644
--- a/roles/container-engine/docker/vars/ubuntu.yml
+++ b/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:
--
GitLab