Fix environment variable fallbacks for plugins. (#1299) (#1301)

(cherry picked from commit 9377d6733e)
This commit is contained in:
Felix Fontein
2026-08-01 08:44:57 +02:00
committed by GitHub
parent 1c6eaf27d0
commit ea0ba1e6ea
4 changed files with 27 additions and 0 deletions
+3
View File
@@ -0,0 +1,3 @@
bugfixes:
- "docker_api connection plugin - the environment fallbacks for ``docker_host``, ``tls_hostname``, ``api_version``, ``timeout``, ``tls``, and ``validate_certs`` now finally work (https://github.com/ansible-collections/community.docker/issues/1298, https://github.com/ansible-collections/community.docker/pull/1299)."
- "docker_containers inventory plugin - the environment fallbacks for ``docker_host``, ``tls_hostname``, ``api_version``, ``timeout``, ``tls``, and ``validate_certs`` now finally work (https://github.com/ansible-collections/community.docker/issues/1298, https://github.com/ansible-collections/community.docker/pull/1299)."
+1
View File
@@ -20,6 +20,7 @@ notes:
with Python's C(SSLSocket)s. See U(https://github.com/ansible-collections/community.docker/issues/605) for more information.
extends_documentation_fragment:
- community.docker.docker.api_documentation
- community.docker.docker._api_environment_documentation
- community.docker.docker.var_names
options:
remote_user:
+22
View File
@@ -406,3 +406,25 @@ notes:
- This module does B(not) use the L(Docker SDK for Python,https://docker-py.readthedocs.io/en/stable/) to
communicate with the Docker daemon. It directly calls the Docker CLI program.
'''
_API_ENVIRONMENT_DOCUMENTATION = r"""
options:
docker_host:
env:
- name: DOCKER_HOST
tls_hostname:
env:
- name: DOCKER_TLS_HOSTNAME
api_version:
env:
- name: DOCKER_API_VERSION
timeout:
env:
- name: DOCKER_TIMEOUT
tls:
env:
- name: DOCKER_TLS
validate_certs:
env:
- name: DOCKER_TLS_VERIFY
"""
+1
View File
@@ -21,6 +21,7 @@ author:
extends_documentation_fragment:
- ansible.builtin.constructed
- community.docker.docker.api_documentation
- community.docker.docker._api_environment_documentation
- community.library_inventory_filtering_v1.inventory_filter
description:
- Reads inventories from the Docker API.