Commit Graph

157 Commits

Author SHA1 Message Date
Felix Fontein
4aa9c55dd6 Until Docker SDK for Python is fixed, add constraints on urllib3 and requests. 2023-05-04 07:24:16 +02:00
patchback[bot]
ae0d53811a
Do extra docs validation; explicitly disallow semantic markup in docs (#607) (#608)
* Do extra docs validation. Explicitly disallow semantic markup in docs.

* Forgot to add new requirement.

* Improve test.

* TEMP - make CI fail.

* Revert "TEMP - make CI fail."

This reverts commit d381f1a431.

* Remove unnecessary import.

* Make sure ANSIBLE_COLLECTIONS_PATH is set.

* Make sure sanity tests from older Ansible versions don't complain.

(cherry picked from commit 9e1a0a6fb8)

Co-authored-by: Felix Fontein <felix@fontein.de>
2023-04-16 19:04:45 +02:00
patchback[bot]
88fb666d41
More true/false normalization. (#597) (#598)
(cherry picked from commit d0a3e587a5)

Co-authored-by: Felix Fontein <felix@fontein.de>
2023-03-06 22:36:33 +01:00
Felix Fontein
94227e2575
docker_prune: correctly return 'changed' result (#593) (#594)
* Correctly return 'changed' status.

* Extend tests.

* Fix typo.

(cherry picked from commit 08bfcf7e5f)
2023-02-24 21:24:39 +01:00
Felix Fontein
8e99d0c4da
Remove unnecessary test imports. (#583) (#584)
(cherry picked from commit 449b91d489)
2023-02-12 21:29:50 +01:00
Felix Fontein
ec4c17efef
CI: Make tests work with Docker API version 1.42 (#576) (#577)
* Make tests work with API version 1.42.

* Make sure anonymous volume is separated from container a bit earlier.

* Another try.

(cherry picked from commit 3a1bfc4be2)
2023-02-04 22:31:15 +01:00
Felix Fontein
e418fe59d8
Looks like BuilderSize was never documented and eventually got removed. Replace with something that is documented (https://docs.docker.com/engine/api/v1.42/#tag/System/operation/SystemDataUsage). (#569) (#571)
(cherry picked from commit d57b26269a)
2023-02-03 12:48:26 +01:00
patchback[bot]
41b1337d8e
[PR #563/c0d9ca67 backport][stable-2] Fix CI (#565)
* Restrict to old enough paramiko on RHEL 8 or other systems using Python 3.6. (#563)

(cherry picked from commit c0d9ca67c4)

* Make sure paramiko is installed on localhost as well.

* Revert "Make sure paramiko is installed on localhost as well."

This reverts commit f36406c2db.

* Fix check.

* ...

Co-authored-by: Felix Fontein <felix@fontein.de>
2023-01-22 19:06:56 +01:00
Felix Fontein
5ffba04ef0 Don't uninstall docker. 2023-01-14 11:16:57 +01:00
Felix Fontein
e7aa5dcdec CI: improve Docker setup (#550)
* Cache has already been updated a few lines before.

* When skipping Docker cleanup, create flag to avoid the expensive part of the setup (including package manager cache update) to be run again.

(cherry picked from commit 134d32cae6)
2023-01-13 21:05:54 +01:00
Felix Fontein
0ffa3cc1d2
docker_plugin: do not crash when plugin doesn't exist (#553) (#556)
* Do not crash when plugin doesn't exist.

* Improve style.

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

Co-authored-by: Brian Scholer <1260690+briantist@users.noreply.github.com>
(cherry picked from commit c7cbec0163)
2023-01-13 21:00:34 +01:00
patchback[bot]
098a77fe4c
Handle ansible_default_ipv4 not there in tests. (#514) (#515)
(cherry picked from commit 6e04e1f172)

Co-authored-by: Felix Fontein <felix@fontein.de>
2022-12-01 00:11:38 +01:00
Felix Fontein
3da9aa3b9c
[stable-2] Make current_container_facts work with newer Docker versions and latest ansible-test container changes (#512)
* Make current_container_facts work with newer Docker versions and latest ansible-test container changes (#510)

* Add more debug output.

* Add basic integration test.

* Split into lines.

* Fix docker detection, add podman detection.

ci_complete

* Improve regular expression.

* Document that this module is trying its best, but might not be perfect.

* Update comment.

(cherry picked from commit c2d84efccb)

* Remove new feature (podman support).
2022-11-30 23:01:30 +01:00
Felix Fontein
94e0acf523
Add tests for build.args. (#457) 2022-08-16 13:47:12 +02:00
Felix Fontein
bd62f82ca5
Fix docker_container tty test. (#444) 2022-08-11 22:08:34 +02:00
patchback[bot]
4d0f00db3c
Adjust to b1dd2af4ca. (#423) (#425)
(cherry picked from commit c00b4ec9be)

Co-authored-by: Felix Fontein <felix@fontein.de>
2022-07-12 17:12:48 +02:00
patchback[bot]
ff242fab8e
Fix tests on Ubuntu 22.04 (#419) (#420)
* Try to fix tests on Ubuntu 22.04.

* Let Ansible handle the apt repo install.

(cherry picked from commit f6d4cad46e)

Co-authored-by: Felix Fontein <felix@fontein.de>
2022-07-08 07:23:15 +02:00
Felix Fontein
57e19ca596 Revert "Remove deprecations from docker_container, bump collection version to 3.0.0 (#399)"
This reverts commit 49ce0a3cb1.
2022-07-02 14:18:48 +02:00
Felix Fontein
49ce0a3cb1
Remove deprecations from docker_container, bump collection version to 3.0.0 (#399)
* Remove deprecated features in docker_container.

* Bump collection version to 3.0.0.

* Remove 'published_ports: all' tests.
2022-07-01 19:16:22 +02:00
Felix Fontein
f41d7ac1b8
Move common utility code to plugins.module_utils.util (#390)
* Move common utility code to plugins.module_utils.util.

* Also adjust plugins.

* Fix import.
2022-06-20 18:39:13 +02:00
Felix Fontein
b3b543dd8d
requests drops support for older Python. (#380) 2022-06-11 18:14:18 +00:00
Felix Fontein
2080c63f05
Try to fix tests. (#374)
ci_complete
2022-05-24 12:49:22 +02:00
Rodrigo Candido Gryzinski
497c2fda91
Add image_label_mismatch parameter to docker_container (#370)
* Add image_label_mismatch to docker_container

* Apply suggestions from code review

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

* Test image_label_mismatch error message

* Add change fragment for image_label_mismatch

* Break long line in docker_container.py for pep-8 compliance

* pep8 compliance

* Update changelogs/fragments/370-add-image-label-mismatch.yml

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

* fix: add expected_labels to parameters_map in docker_container

* Apply suggestions from code review

* Apply suggestions from code review

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

Co-authored-by: Felix Fontein <felix@fontein.de>
2022-05-24 08:35:33 +02:00
Felix Fontein
b32d40f714
Try pull with digest in tests. (#366) 2022-05-23 12:21:23 +02:00
Felix Fontein
401a76ff00
docker_container: fail if there are too many parts in a parsed port (#367)
* Fail if there are too many parts in a parsed port.

* Add tests.

* Prevent bad parsing.
2022-05-22 17:20:05 +02:00
Felix Fontein
ab2d33aa99
CI: Replace the container used in the nsenter tests (#368)
* Replace the container used in the nsenter tests.

* Improve connection tests.g

* Use quay.io/ansible/ansible-runner:devel instead.
2022-05-21 16:53:09 +02:00
Felix Fontein
cfc6fb9d40
Add RHEL 9.0, Ubuntu 22.04 and Fedora 36 to CI (#358)
* Add RHEL 9.0 to CI.

* Add RHEL 9 specific files.

* Add Ubuntu 22.04 and Fedora 36 to CI.

* Another try.

* Adjust kernel memory tests.

* Add more details.

* RHEL 9 doesn't support setting memory swappiness.

* Fix docker_swarm_service tests.

The 'less' case should always have been changed, but it probably was always skipped
due to a too old Docker SDK for Python or a too old Docker daemon.

* More checks / improve checks.
2022-05-20 16:27:13 +02:00
Felix Fontein
9c7415e0e7
certifi dropped Python 2 support. (#356) 2022-05-19 07:17:28 +02:00
Felix Fontein
3a7c5551d7
Avoid extra '/' in CI names to avoid breakin coverage. (#349)
ci_coverage
2022-05-14 12:07:08 +02:00
Felix Fontein
155a8b4ba9
Run some tests with the latest PyPi version of Docker SDK for Python (#348)
* Run some tests with the latest PyPi version of Docker SDK for Python.

* Use new enough Python so we can actually install the latest Docker SDK for Python.

* Ansibilize

* Fix test.

* Fix two stupid errors by myself.
2022-05-13 22:06:51 +02:00
Sasha Jenner
560bf1d3a3
docker_config integration tests for template_driver (#347)
* template_driver integration tests

* adding comment

* naming swarm default

* Apply suggestions from code review

* Only run tests for new enough Docker SDK for Python and Docker API version.

Co-authored-by: Sasha Jenner <sasha.jenner@cba.com.au>
Co-authored-by: Felix Fontein <felix@fontein.de>
2022-05-13 13:46:12 +02:00
Brian Coca
6679eee41e
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>
2022-04-25 20:35:33 +02:00
Felix Fontein
e12a487e6a
Add EE support, support GHA in current_container_facts (#336)
* Try adding EE support.

* Use GHA instead of AZP for EE tests.

* Update changelog fragment, extend tests.

* Disable current_container_facts test.

* Increase verbosity.

* 2.9 compatibility.

* Use docker instead of podman for building EE and running tests in it.

* Output some more information (helpful for debugging).

* Fix GHA handling for current_container_facts.

* Try to fix permissions.
2022-04-18 22:54:00 +02:00
Felix Fontein
ca2e46131f
Switch from antsibull to antsibull-docs. (#334) 2022-04-10 10:44:16 +02:00
Felix Fontein
b362bdfd88
Remove 'warn:' that's removed in ansible-core 2.14. (#328) 2022-04-01 22:46:58 +02:00
Felix Fontein
6f0e1149fd
Replace antsibull-lint collection-docs with antsibull-docs lint-collection-docs. (#322) 2022-03-30 07:55:50 +02:00
Felix Fontein
f3bfaa2458
Add stable-2.13 to CI, thin out older version matrix. (#320)
* Add stable-2.13 to CI, thin out older version matrix.

* Thin out a bit more.
2022-03-29 06:25:40 +02:00
Brian Coca
37a3264042
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>
2022-03-21 19:19:14 +01:00
Felix Fontein
48391d6755
Extend docker_compose tests, add Alpine to CI (#304)
* Add test where project is started with project_src only (#303).

* Work around bug in docker_compose.

* Add Alpine in CI.
2022-03-14 09:34:08 +00:00
Felix Fontein
d49008f066
CI: Add ArchLinux, Debian Bullseye and CentOS Stream 8 (#301)
* Add ArchLinux, Debian Bullseye and CentOS Stream 8 to CI.

* Fixes.
2022-02-18 23:04:17 +01:00
Felix Fontein
078afc9769
Don't mask return value. (#299) 2022-02-14 20:50:36 +01:00
András Maróy
3ad49824db
Implement cap_add and cap_drop handling for docker_swarm_service (#294)
* Implement `cap_add` and `cap_drop` handling for `docker_swarm_service`

* Fix typos in changelog fragment

* Add missing `version_added` docstrings to `docker_swarm_service`

* Check api version too in `docker_swarm_service` capability tests

* Fix API version checking in tests for docker_swarm_service

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

* Add `cap_add` and `cap_drop` to sample output for `docker_swarm_service`

* Use proper diff checking for `docker_swarm_service` capabilities

Co-authored-by: Felix Fontein <felix@fontein.de>
2022-02-12 08:30:44 +01:00
András Maróy
1d062dad5c
Implement rolling_versions for docker_config (#295) 2022-02-12 08:30:09 +01:00
András Maróy
b481fa4801
Add support for rotating docker secrets (#293)
* Add parameters for rolling updates to `docker_secret`

* Extract `remove_secrets` to its own function in `docker_secret`

* Store existing secrets in a list instead of a single secret

With this change `docker_secret` now supports the case where we store
multiple versions of a secret with the `_v123` postfix.

`absent` state implicitly handles removing these this way.

* When using `rolling_versions` don't automatically remove current secret

To make rolling updates actually work instead of failing on trying to
remove a secret that is attached to a service, use the
`versions_to_keep` parameter to remove old versions of the secret after
creating the new one. This way the secret with the new data is created
with a different name and can be attached to the service by its ID
without having to delete the previous one first which would fail if it
is already attached to a service.

* Add version numbers to newly created secrets

Attach the incremental version number to the secret name as a `_v123`
postfix where `123` is replaced with an incremental counter starting
from 1.
A label with the numeric version is also attached to the secret to ease
calculating the new version number upon change with the name
`ansible_version`.

* Return `secret_name` for docker secrets as well

* Add integration test for rolling secrets

* Update `docker_secret` documentation as per review comments

* Correctly return `docker_secret` version number as int

* Use template string for naming `docker_secrets` instead of concatenation

* Return the correct secret name on deletion failure

* Simplify `docker_secret` creation

* Add missing comma for `docker_secret` schema

* Only remove old docker secrets if `rolling_versions` is set

* Add check in `docker_secret` version parsing to handle NaNs

* Add newly created `docker_secret` to internal secret list to avoid additional deletions

* Add changelog fragment for `docker_secret` `rolling_versions` feature

* Update changelogs/fragments/270-rolling-secrets.yml

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

Co-authored-by: Felix Fontein <felix@fontein.de>
2022-02-12 08:29:49 +01:00
Felix Fontein
946f1a7322
Try to fix CentOS 8 in CI - at least a bit. (#287) 2022-01-31 20:56:31 +01:00
Felix Fontein
f94ba4cef3
Restrict PyNaCL to 1.4.x on RHEL8 when using Python 3.6 (#275)
* Restrict PyNaCL to 1.4.x on RHEL8 when using Python 3.6.

* Fix typo.
2022-01-08 14:53:21 +01:00
Felix Fontein
40576e317b
docker_container_exec: allow to specify environment (#254)
* Allow to specify environment parameters for docker_container_exec.

* Add changelog fragment.

* sorted -> list.
2021-12-22 16:56:22 +00:00
Felix Fontein
02596835b1
Add detach parameter. (#255) 2021-12-22 17:37:08 +01:00
Felix Fontein
abd057f447
Fix collection dependency installation in CI. (#239) 2021-11-18 21:14:54 +01:00
Felix Fontein
3961ad3763
Replace Bash codecov uploader by new Python codecov uploader. (#235)
ci_coverage
2021-11-13 11:47:33 +01:00