From e108c0d913762067d290cab98ce75984783505f7 Mon Sep 17 00:00:00 2001 From: Mickael Razzouk Date: Tue, 5 Nov 2024 14:16:49 +0100 Subject: [PATCH] add docker_apt_key_env variable to docker role feat: In some cases, having the option to set enviroment variables to the get_url module can be useful to pass http proxy config. Closes-Bug: #2086700 Change-Id: I788cc3893369a531ad216d80aebcab141137cef3 --- .../notes/add-docker-apt-key-env-1fa084e207f068f7.yaml | 6 ++++++ roles/docker/defaults/main.yml | 3 +++ roles/docker/tasks/repo-Debian.yml | 1 + 3 files changed, 10 insertions(+) create mode 100644 releasenotes/notes/add-docker-apt-key-env-1fa084e207f068f7.yaml diff --git a/releasenotes/notes/add-docker-apt-key-env-1fa084e207f068f7.yaml b/releasenotes/notes/add-docker-apt-key-env-1fa084e207f068f7.yaml new file mode 100644 index 0000000..66ef6dd --- /dev/null +++ b/releasenotes/notes/add-docker-apt-key-env-1fa084e207f068f7.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + With the ``docker_apt_key_env`` variable it is now possible to set + enviroment variables for the get_url module to pass http proxy config. + `LP#2086700 `__ diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index a0185a7..2481900 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -11,6 +11,9 @@ docker_apt_key_file: "gpg" docker_apt_package: "docker-ce" docker_apt_package_pin: "" +# Set environment variables when fetching gpg keys, to use a proxy for example +docker_apt_key_env: {} + # Docker Yum repository configuration. docker_yum_url: "https://download.docker.com/linux/centos" docker_yum_baseurl: "{{ docker_yum_url }}/$releasever/$basearch/stable" diff --git a/roles/docker/tasks/repo-Debian.yml b/roles/docker/tasks/repo-Debian.yml index 8023769..2246a67 100644 --- a/roles/docker/tasks/repo-Debian.yml +++ b/roles/docker/tasks/repo-Debian.yml @@ -30,6 +30,7 @@ mode: "0644" force: true become: true + environment: "{{ docker_apt_key_env }}" - name: Install docker apt pin copy: