Commit Graph

119 Commits

Author SHA1 Message Date
patchback[bot]
edf1953fd5
Improve API version handling. (#389) (#391)
(cherry picked from commit a44e0736cf)

Co-authored-by: Felix Fontein <felix@fontein.de>
2022-06-20 07:58:38 +02:00
patchback[bot]
23cefae716
Remove trailing space (#375) (#377)
* Remove trailing space

* Update plugins/modules/docker_compose.py

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 9c33aa5d12)

Co-authored-by: Garrit Franke <32395585+garritfra@users.noreply.github.com>
2022-05-27 10:44:30 +02:00
patchback[bot]
0466d43d03
docker_container: fail if there are too many parts in a parsed port (#367) (#371)
* Fail if there are too many parts in a parsed port.

* Add tests.

* Prevent bad parsing.

(cherry picked from commit 401a76ff00)

Co-authored-by: Felix Fontein <felix@fontein.de>
2022-05-22 17:42:05 +02:00
patchback[bot]
31966e90a4
Avoid breakage with Python 3.13. (#354) (#355)
(cherry picked from commit fb55b1d780)

Co-authored-by: Felix Fontein <felix@fontein.de>
2022-05-19 07:07:46 +02:00
Felix Fontein
7a54431495
[stable-1] Add PSF-license.txt file (#352)
* Add PSF-license.txt file. (#350)

(cherry picked from commit 6adc7bddf3)

* Update with actual CPython 3.9.5 license. (#351)

(cherry picked from commit b6f9d853f9)
2022-05-16 09:15:01 +02:00
Felix Fontein
e050e43ce8
[stable-1] docker connection: handle version and docker_args (#341)
* docker connection: handle version and docker_args (#327)

* handle version and docker_args

* Remove breaking change.

* Add changelog fragment.

* Fix unit tests.

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 6679eee41e)

* Fix tests.

Co-authored-by: Brian Coca <bcoca@users.noreply.github.com>
2022-04-25 21:01:02 +02:00
patchback[bot]
f36b6ee7fd
Update docker module documentation for log_options (#317) (#318)
* Update docker module documentation for log_options

Add that log_driver must be specified for log_options to take effect

* Update plugins/modules/docker_container.py

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 69399d736d)

Co-authored-by: addisonshelley <102306748+addisonshelley@users.noreply.github.com>
2022-03-27 16:08:29 +02:00
Felix Fontein
6a8ba02b5b
[stable-1] docker_api connection plugin: adjust to ansible-core 2.13 (#315)
* Adjust docker_api plugin to ansible-core 2.13. (#308)

(cherry picked from commit b353a39ada)

* Remove 2.2.0 additions, adjust changelog URL.
2022-03-24 06:32:21 +01:00
Felix Fontein
30c00d4741
[stable-1] docker connection plugin: fix config docs and update to use config system (#313)
* docker connection plugin: fix config docs and update to use config system (#297)

* fix config docs and update to use config system

 wean off play_context which did not have the correct data in all cases

* moar fixes

* Update plugins/connection/docker.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* updated for backwards compat

* badmergeresolution

* makeitworks

* attempt to fix unit test

* mocking it# No more than 50 chars. #### 50 chars is here: #

* Update plugins/connection/docker.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update plugins/connection/docker.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update plugins/connection/docker.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update plugins/connection/docker.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update plugins/connection/docker.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update plugins/connection/docker.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* nomock

* remove bad paste

* properly load connection to initialize config

* initizlie docker args

* Fix bugs.

* Call _set_conn_data() when needed.

* Cache result of _get_docker_remote_user() now that it is called multiple times per task.

* Fix unit tests.

* list.clear() is Python 3...

* Add changelog.

* Call _set_conn_data() also in _connect().

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 37a3264042)

* Remove 2.2.0 additions.

* Remove unnecessary fragment, adjust URL.

Co-authored-by: Brian Coca <bcoca@users.noreply.github.com>
2022-03-24 06:32:06 +01:00
patchback[bot]
d6121fce86
Fix warning/error extraction. (#305) (#306)
(cherry picked from commit ba5e6f89f3)

Co-authored-by: Felix Fontein <felix@fontein.de>
2022-03-14 21:13:28 +01:00
patchback[bot]
febdace4ee
Try to make more compatible with podman-docker. (#292) (#298)
(cherry picked from commit 9cd46a7d41)

Co-authored-by: Felix Fontein <felix@fontein.de>
2022-02-12 08:29:16 +01:00
patchback[bot]
fd81f1d008
More small docs fixes. (#281) (#282)
(cherry picked from commit fbbc0898ed)

Co-authored-by: Felix Fontein <felix@fontein.de>
2022-01-10 08:27:12 +01:00
patchback[bot]
f4d3188199
Improve documentation (#278) (#279)
* Improve documentation.

* More fixes.

(cherry picked from commit 3d20ba1bc2)

Co-authored-by: Felix Fontein <felix@fontein.de>
2022-01-09 15:12:51 +01:00
patchback[bot]
3465a8371f
Fix comment. (#272) (#273)
(cherry picked from commit d4b7ec0a9a)

Co-authored-by: Felix Fontein <felix@fontein.de>
2022-01-06 15:10:43 +01:00
patchback[bot]
6e907dbde5
Fix unintended breaking change by vendoring distutils.version. (#269) (#270)
(cherry picked from commit 264f5238c7)

Co-authored-by: Felix Fontein <felix@fontein.de>
2022-01-05 22:04:43 +01:00
patchback[bot]
8ac6ad52a1
Added cap_add to the documentation for capabilities for easier search (#265) (#268)
* added cap_add to the documentation for capabilities for easier search comming from docker

* added equivalent syntax for docker cli and compose to capabilities docs

* added equivalent syntax for docker cli and compose to capabilities docs

(cherry picked from commit 15ab747d86)

Co-authored-by: Richard James Acton <richardjacton@pm.me>
2022-01-05 13:35:27 +01:00
patchback[bot]
b57a73e2bf
Prepare for distutils.version being removed in Python 3.12 (#258) (#260)
* Prepare for distutils.version being removed in Python 2.12.

* Fix copy'n'paste error.

* Fix import.

* Re-add Loose prefix.

* Fix Python version typo.

* Improve formulation.

* Move message into own line.

* Fix casing, now that the object is no longer called Version.

(cherry picked from commit 4b235a2607)

Co-authored-by: Felix Fontein <felix@fontein.de>
2021-12-24 12:15:43 +01:00
patchback[bot]
16934ef269
Get rid of distutils.spawn. (#257) (#259)
(cherry picked from commit 93ea131f30)

Co-authored-by: Felix Fontein <felix@fontein.de>
2021-12-24 11:37:00 +01:00
patchback[bot]
6dba5abdbc
Set minimal Docker API version for chdir to 1.35. (#253) (#256)
(cherry picked from commit 5a23c4d336)

Co-authored-by: Felix Fontein <felix@fontein.de>
2021-12-22 17:32:42 +01:00
patchback[bot]
9e3c50a2b9
Minor fixes to nsenter connection plugin (#249) (#251)
* Minor fixes to nsenter connection plugin

- Ensure the nsoption_pid option is retrieved in _connect instead of
  __init__ to prevent a crasher due to initialization order
- Replace the use of --all-namespaces with specific namespaces to
  support compatibility with Busybox nsenter (for example, Alpine)

* minor tidy

* Fix PEP8 violation

* Changelog fragment

* Update changelogs/fragments/249-nsenter-fixes.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Jeff Goldschrafe <jeff.goldschrafe@flatiron.com>
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit d224752cf1)

Co-authored-by: Jeff Goldschrafe <jgoldschrafe@users.noreply.github.com>
2021-12-09 06:01:43 +01:00
patchback[bot]
9f36cf139c
docker_container_exec: improve handling of chdir option (#243) (#247)
* Only pass chdir on when it is provided, and prevent this option from being used for Docker SDK for Python < 3.0.0.

* Also fix docker_api connection plugin.

(cherry picked from commit bed775c4ea)

Co-authored-by: Felix Fontein <felix@fontein.de>
2021-11-30 12:20:47 +01:00
patchback[bot]
f8c04cb990
Fix docs issues. (#232) (#233)
(cherry picked from commit 5233936262)

Co-authored-by: Felix Fontein <felix@fontein.de>
2021-11-09 20:34:18 +01:00
Felix Fontein
a9b238ee81
Emphasize that docker_compose requires docker-compose < 2.0.0. (#217) 2021-10-05 07:30:41 +02:00
Ajpantuso
b5263ccbd0
Initial commit (#208) 2021-09-17 17:00:14 -04:00
Felix Fontein
5d861004db
docker_config and docker_secret: add data_src option (#203)
* Add data_src options to docker_config and docker_secret.

* Add examples.

* Fix test.

* Another fix.
2021-09-12 09:42:03 +02:00
Felix Fontein
8e1c9f890a
docker_containers inventory: fix wrong default mentioned in docs, add fallback example (#194)
* Fix wrong default mentioned in docs.

* Add fallback example.
2021-08-26 08:32:50 +02:00
Ajpantuso
4dfc3ae5d7
docker_compose - Fix idempotency when services have no enabled profiles (#192)
* Initial Commit

* Adding integration tests

* Fixing integration and adding changelog fragment
2021-08-20 13:33:35 +02:00
Felix Fontein
930f9d1bcd
Improve error message on import errors. (#188) 2021-08-02 21:04:25 +02:00
Felix Fontein
6f52747693
docker_container: fix handling of command and entrypoint in a backwards-compatible way (#186)
* Fix handling of command and entrypoint in a backwards-compatible way.

* Fix copy'n'paste error.

* Fix some more.

* Improve documentation.

* Keep command and entrypoint as lists and not as strings.

* Simplify code, since we're already emitting the deprecation warning in this case during parameter processing.

* Change default only in community.docker 3.0.0.

* Update tests/integration/targets/docker_container/tasks/tests/options.yml

Co-authored-by: Brian Scholer <1260690+briantist@users.noreply.github.com>

* Apply suggestion to more places.

Co-authored-by: Brian Scholer <1260690+briantist@users.noreply.github.com>
2021-08-02 19:31:46 +02:00
Jeff Goldschrafe
2a9bc7f74e
Add nsenter connection plugin (#173)
* Add nsenter connection plugin

* Fixes

* oops

* Pass file I/O through nsenter, removing volume mount

* minor logging cleanup for consistency's sake

* Fix pylint flag

* Update plugins/connection/nsenter.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update plugins/connection/nsenter.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update plugins/connection/nsenter.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update plugins/connection/nsenter.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update plugins/connection/nsenter.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Fix note formatting

* Revert string_types change

* Update tests/integration/targets/connection_nsenter/aliases

* Update tests/integration/targets/connection_nsenter/runme.sh

* Apply suggestions from code review

* Update tests/integration/targets/connection_nsenter/runme.sh

* Update tests/integration/targets/connection_nsenter/runme.sh

* Apply suggestions from code review

* Update tests/integration/targets/connection_nsenter/runme.sh

* Update tests/integration/targets/connection_nsenter/aliases

* Update plugins/connection/nsenter.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update plugins/connection/nsenter.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update plugins/connection/nsenter.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update plugins/connection/nsenter.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Remove specific pipelining support

* Update plugins/connection/nsenter.py

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Felix Fontein <felix@fontein.de>
2021-08-02 08:17:53 +02:00
Ajpantuso
03f649f43c
docker_compose - Fix startup errors for docker-compose versions <1.17.0 (#182)
* Initial Commit

* Adding changelog fragment

* Applying review suggestions
2021-07-31 11:37:02 +02:00
Felix Fontein
72fb3a5d1a
Fix check_mode for some _info modules. (#183) 2021-07-28 21:49:15 +02:00
Ajpantuso
b2430f756f
Allowing anonymous volumes via mounts option (#181)
* Initial Commit

* Adding changelog fragment
2021-07-27 17:35:40 +00:00
Felix Fontein
e2785de840
Make sure that 'container' is returned in more circumstances, and improve documentation when it is actually returned (#178)
* Make sure that 'container' is returned in more circumstances, and improve documentation when it is actually returned.

* Fix typos.
2021-07-24 21:01:14 +02:00
Ajpantuso
9b661a6ac2
docker_compose - add env_file option (#174)
* Initial commit

* Adding changelog and fixing docs

* Fixing integration tests

* Restricting minimum docker-compose versions for tests

* Applying initial review suggestions
2021-07-16 19:01:20 +02:00
Lauri Tirkkonen
a0f2091e6a
put example addresses in actual RFC1918 range (#170)
172.1/16, 172.3/16 and 172.4/16 are not in the 172.16/12 range.

https://datatracker.ietf.org/doc/html/rfc1918#section-3
2021-07-01 19:06:18 +02:00
Ajpantuso
072d96ca62
docker_compose - Adding profiles option. (#167)
* Initial commit

* fixing tests

* Adding changelog fragment
2021-06-28 20:54:54 +02:00
Ajpantuso
49cb513244
docker_container - adding publish_all_ports option (#162)
* Initial commit

* Adding changelog fragment

* Updating deprecation notice

* Adding integration test

* Applying second round of review suggestions

* Updating docs and cleaning up integration tests

* Updating test loop logic
2021-06-27 16:51:30 +02:00
Felix Fontein
badcd61a74
Replace ansible.module_utils._text by ansible.module_utils.common.text.converters. (#164) 2021-06-26 13:39:51 +02:00
Ajpantuso
825a4f74d3
docker_plugin - adding alias option and general cleanup (#161)
* Initial Commit

* Adding changelog fragment
2021-06-25 21:45:53 +02:00
Ajpantuso
49c8fd0aa5
docker_host_info - Allow filters which are passed as lists (#160)
* Initial Commit

* Adding integration tests

* Adding example in docs

* Adding changelog fragment

* Applying initial review suggestions
2021-06-22 22:27:38 +02:00
Felix Fontein
af2b3b0493
docker_compose: fix idempotency for stopped services (#159)
* Always use |= instead of = when updating changed status.

* Fix idempotence bug.

* Add changelog fragment.
2021-06-22 12:07:50 +02:00
Felix Fontein
902bcc6193
Pass Docker daemon connection params from inventory to connection plugin (#157)
* Move variable handling to doc fragment, and make them known to module_utils.

* Pass Daemon connection options to connection plugin.

* Add changelog fragment.

* Fix syntax error.

* Forgot 'options:'.
2021-06-22 06:29:56 +02:00
Felix Fontein
d0d5bdb905
docker_container: improve documentation for env w.r.t. automatic type conversions (#158)
* Improve documentation for docker_container's env w.r.t. automatic type conversions.

* Update plugins/modules/docker_container.py

Co-authored-by: Amin Vakil <info@aminvakil.com>

Co-authored-by: Amin Vakil <info@aminvakil.com>
2021-06-21 12:40:53 +02:00
Felix Fontein
b775bac593
docker_image: allow to tag images by name, improve docs (#149)
* Add test to tag image with ID.

* Document that source=local also works with image IDs.

* Improve 'repository' documentation.

* Fix typo.

* Looks like a fix is needed to make this work.

* ...

* Avoid unnecessary re.search() calls.

* Add changelog fragment.

* Improve main description.

* Remove import.
2021-06-07 07:01:10 +02:00
Felix Fontein
c20186901b
Only emit tls_hostname deprecation warning if TLS is actually used (#143)
* Only emit tls_hostname deprecation warning if TLS is actually used.

* Linting.
2021-05-17 13:24:50 +02:00
Shane St Savage
a512e7fb9e
feat: allow unlimited memory_swap in docker_container (#138)
* feat: allow unlimited memory_swap in docker_container

summary: in docker_container, allow `memory_swap: values
`unlimited` and `-1` for unlimited container swap usage.

`--memory-swap=-1` is a valid docker run value allowing
unlimited swap usage. `docker_container` should allow
setting this value via `memory_swap` values `unlimited`
and `-1` as it sometimes must explicitly be set to prevent
docker from attempting to limit swap usage to double the
`--memory` value by default. In rootless docker environments,
attempting to set `memory-swap` usage limits will result in an error
if the user doesn't have the ability to do so. Allowing explicit
unlimited swap usage via docker_container will prevent these errors.

https://docs.docker.com/config/containers/resource_constraints/#--memory-swap-details

* Update tests/integration/targets/docker_container/tasks/tests/options.yml

* Apply suggestions from code review

Co-authored-by: Felix Fontein <felix@fontein.de>
2021-05-10 20:24:04 +02:00
Felix Fontein
3a0d3e15fb
Configure plugin after installing it. (#135) 2021-05-07 07:14:28 +02:00
Felix Fontein
74475d1d9b
docker_swarm_service: fix crash during idempotence check if published_port is not specified (#136)
* Avoid crash during idempotence check if published_port is not specified.

* Add tests.

* Convert lambda to function.
2021-05-05 08:00:22 +02:00
Alexandr N. Zamaraev
859bc29f9e
docker_compose: fix #12 (#119)
* fix #12

* Create 12-correct_pull_wo_starting.yaml

* Update changelogs/fragments/12-correct_pull_wo_starting.yaml

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update changelogs/fragments/12-correct_pull_wo_starting.yaml

Co-authored-by: Amin Vakil <info@aminvakil.com>

* Update docker_compose.py

Co-authored-by: Felix Fontein <felix@fontein.de>
Co-authored-by: Amin Vakil <info@aminvakil.com>
2021-05-04 07:53:38 +02:00