mirror of
https://github.com/ansible-collections/community.docker.git
synced 2025-12-16 20:08:41 +00:00
Fix Unix socket path. (#736)
This commit is contained in:
parent
56bbef2b44
commit
199d9e50d3
2
changelogs/fragments/host.yml
Normal file
2
changelogs/fragments/host.yml
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
bugfixes:
|
||||||
|
- "Use ``unix:///var/run/docker.sock`` instead of the legacy ``unix://var/run/docker.sock`` as default for ``docker_host`` (https://github.com/ansible-collections/community.docker/pull/736)."
|
||||||
@ -21,7 +21,7 @@ options:
|
|||||||
- If the value is not specified in the task, the value of environment variable E(DOCKER_HOST) will be used
|
- If the value is not specified in the task, the value of environment variable E(DOCKER_HOST) will be used
|
||||||
instead. If the environment variable is not set, the default value will be used.
|
instead. If the environment variable is not set, the default value will be used.
|
||||||
type: str
|
type: str
|
||||||
default: unix://var/run/docker.sock
|
default: unix:///var/run/docker.sock
|
||||||
aliases: [ docker_url ]
|
aliases: [ docker_url ]
|
||||||
tls_hostname:
|
tls_hostname:
|
||||||
description:
|
description:
|
||||||
@ -198,7 +198,7 @@ options:
|
|||||||
- If the value is not specified in the task, the value of environment variable E(DOCKER_HOST) will be used
|
- If the value is not specified in the task, the value of environment variable E(DOCKER_HOST) will be used
|
||||||
instead. If the environment variable is not set, the default value will be used.
|
instead. If the environment variable is not set, the default value will be used.
|
||||||
type: str
|
type: str
|
||||||
default: unix://var/run/docker.sock
|
default: unix:///var/run/docker.sock
|
||||||
aliases: [ docker_url ]
|
aliases: [ docker_url ]
|
||||||
tls_hostname:
|
tls_hostname:
|
||||||
description:
|
description:
|
||||||
|
|||||||
@ -106,7 +106,7 @@ options:
|
|||||||
EXAMPLES = '''
|
EXAMPLES = '''
|
||||||
# Minimal example using local Docker daemon
|
# Minimal example using local Docker daemon
|
||||||
plugin: community.docker.docker_containers
|
plugin: community.docker.docker_containers
|
||||||
docker_host: unix://var/run/docker.sock
|
docker_host: unix:///var/run/docker.sock
|
||||||
|
|
||||||
# Minimal example using remote Docker daemon
|
# Minimal example using remote Docker daemon
|
||||||
plugin: community.docker.docker_containers
|
plugin: community.docker.docker_containers
|
||||||
|
|||||||
@ -34,7 +34,7 @@ DOCUMENTATION = '''
|
|||||||
docker_host:
|
docker_host:
|
||||||
description:
|
description:
|
||||||
- Socket of a Docker swarm manager node (C(tcp), C(unix)).
|
- Socket of a Docker swarm manager node (C(tcp), C(unix)).
|
||||||
- "Use V(unix://var/run/docker.sock) to connect via local socket."
|
- "Use V(unix:///var/run/docker.sock) to connect via local socket."
|
||||||
type: str
|
type: str
|
||||||
required: true
|
required: true
|
||||||
aliases: [ docker_url ]
|
aliases: [ docker_url ]
|
||||||
@ -111,7 +111,7 @@ DOCUMENTATION = '''
|
|||||||
EXAMPLES = '''
|
EXAMPLES = '''
|
||||||
# Minimal example using local docker
|
# Minimal example using local docker
|
||||||
plugin: community.docker.docker_swarm
|
plugin: community.docker.docker_swarm
|
||||||
docker_host: unix://var/run/docker.sock
|
docker_host: unix:///var/run/docker.sock
|
||||||
|
|
||||||
# Minimal example using remote docker
|
# Minimal example using remote docker
|
||||||
plugin: community.docker.docker_swarm
|
plugin: community.docker.docker_swarm
|
||||||
|
|||||||
@ -14,7 +14,7 @@ from ansible.module_utils.common.collections import is_sequence
|
|||||||
from ansible.module_utils.six.moves.urllib.parse import urlparse
|
from ansible.module_utils.six.moves.urllib.parse import urlparse
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_DOCKER_HOST = 'unix://var/run/docker.sock'
|
DEFAULT_DOCKER_HOST = 'unix:///var/run/docker.sock'
|
||||||
DEFAULT_TLS = False
|
DEFAULT_TLS = False
|
||||||
DEFAULT_TLS_VERIFY = False
|
DEFAULT_TLS_VERIFY = False
|
||||||
DEFAULT_TLS_HOSTNAME = 'localhost' # deprecated
|
DEFAULT_TLS_HOSTNAME = 'localhost' # deprecated
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user