build: trim trailing whitespace from dockerignore entries

Cherry-picked from docker/docker-py@3ee3a24 Co-authored-by: Clément Loiselet <[email protected]>
ansible-collections · Jul 31, 2022 · 8db83bb · 8db83bb
1 parent c6f7908
commit 8db83bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/changelogs/fragments/docker-py-changes-1.yml b/changelogs/fragments/docker-py-changes-1.yml
@@ -2,6 +2,7 @@ bugfixes:
   - "modules and plugins communicating directly with the Docker daemon - fix parsing of IPv6 addresses with a port in ``docker_host``. This is only a change relatively to older community.docker 3.0.0 pre-releases, or with respect to Docker SDK for Python < 6.0.0. Docker SDK for Python 6.0.0 also includes this bugfix (https://github.com/ansible-collections/community.docker/pull/434)."
   - "modules and plugins communicating directly with the Docker daemon - fix ``ProxyCommand`` handling for SSH connections when not using ``use_ssh_client=true``. This is only a change relatively to older community.docker 3.0.0 pre-releases, or with respect to Docker SDK for Python < 6.0.0. Docker SDK for Python 6.0.0 also includes this change (https://github.com/ansible-collections/community.docker/pull/434)."
   - "modules and plugins communicating directly with the Docker daemon - do not create a subshell for SSH connections when using ``use_ssh_client=true``. This is only a change relatively to older community.docker 3.0.0 pre-releases, or with respect to Docker SDK for Python < 6.0.0. Docker SDK for Python 6.0.0 also includes this change (https://github.com/ansible-collections/community.docker/pull/434)."
+  - "docker_image - when composing the build context, trim trailing whitespace from ``.dockerignore`` entries. This is only a change relatively to older community.docker 3.0.0 pre-releases, or with respect to Docker SDK for Python < 6.0.0. Docker SDK for Python 6.0.0 also includes this change (https://github.com/ansible-collections/community.docker/pull/434)."
 minor_changes:
   - "modules and plugins communicating directly with the Docker daemon - improve default TLS version selection for Python 3.6 and newer. This is only a change relatively to older community.docker 3.0.0 pre-releases, or with respect to Docker SDK for Python < 6.0.0. Docker SDK for Python 6.0.0 also includes this bugfix (https://github.com/ansible-collections/community.docker/pull/434)."
 security_fixes:

diff --git a/plugins/module_utils/_api/utils/build.py b/plugins/module_utils/_api/utils/build.py
@@ -244,6 +244,9 @@ def __init__(self, pattern_str):
     @classmethod
     def normalize(cls, p):
 
+        # Remove trailing spaces
+        p = p.strip()
+
         # Leading and trailing slashes are not relevant. Yes,
         # "foo.py/" must exclude the "foo.py" regular file. "."
         # components are not relevant either, even if the whole