Commit Graph

2969 Commits

Author SHA1 Message Date
Ulysses Souza 5efe28149a
Merge pull request #2585 from thaJeztah/better_worker_selection
Jenkinsfile: update node selection labels
2020-06-03 11:14:49 +02:00
Sebastiaan van Stijn fefa96cd0e
Jenkinsfile: update node selection labels
Make sure we use the LTS nodes, to prevent using machines that
we prepared with cgroups v2 (which is not yet supported by docker v19.03)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-03 10:43:42 +02:00
Ulysses Souza b49d22f053
Merge pull request #2583 from ulyssessouza/post-release-4.2.1
Post release 4.2.1
2020-06-02 17:25:24 +02:00
Ulysses Souza 57a8a0c561 Update version after 4.2.1 release
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-06-02 16:59:17 +02:00
Ulysses Souza 525ff592ee Bump 4.2.1
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-06-02 16:43:27 +02:00
Ulysses Souza 88163c00f2 Bump 4.2.0
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-06-02 16:43:24 +02:00
Ulysses Souza df08c14c87 Bump 3.7.2
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2020-06-02 16:41:51 +02:00
Ulysses Souza a5270865e6
Merge pull request #2578 from aiordache/fix_context_load_without_orch
Make context orchestrator field optional
2020-06-02 15:10:33 +02:00
aiordache 7133916798 add test for context load without orchestrator
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-06-02 10:50:03 +02:00
aiordache 1e11ecec34 Make orchestrator field optional
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-05-30 11:01:22 +02:00
Ulysses Souza 71adba9a1d
Merge pull request #2576 from ulyssessouza/fix-tls-host-protocol
Specify when to use `tls` on Context constructor
2020-05-28 21:37:24 +02:00
Ulysses Souza 3ce2d8959d Specify when to use `tls` on Context constructor
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-05-28 20:53:45 +02:00
Ulysses Souza 9a24df5cdd
Merge pull request #2549 from wpjunior/fix-plugin-feedback
Fix tests to support both log plugin feedbacks
2020-04-22 10:30:02 +02:00
Wilson Júnior 7d92fbdee1
Fix tests to support both log plugin feedbacks
Signed-off-by: Wilson Júnior <wilsonpjunior@gmail.com>
Docker-DCO-1.1-Signed-off-by: Wilson Júnior <wilsonpjunior@gmail.com> (github: wpjunior)
2020-04-21 17:00:48 -03:00
Ulysses Souza 030af62dca
Merge pull request #2514 from thaJeztah/remove_obsolete_versions
Jenkinsfile: remove obsolete engine versions
2020-02-21 16:17:07 +01:00
Ulysses Souza 12fe645aba
Merge pull request #2515 from thaJeztah/use_official_dind_images
Use official docker:dind image instead of custom image
2020-02-21 16:16:36 +01:00
Sebastiaan van Stijn 8ced47dca9
Use official docker:dind image instead of custom image
This replaces the custom dockerswarm/dind image with the official
dind images, which should provide the same functionality.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-17 10:25:56 +01:00
Sebastiaan van Stijn da90bb3259
xfail "docker top" tests, and adjust for alpine image
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-17 10:25:53 +01:00
Sebastiaan van Stijn 7bef5e8676
Update test engine version to 19.03.5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-15 00:00:48 +01:00
Sebastiaan van Stijn 789b6715ca
Jenkinsfile: remove obsolete engine versions
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-15 00:00:41 +01:00
Ulysses Souza a9867c9912
Merge pull request #2508 from ulyssessouza/update-release-4.2.0
Post release 4.2.0 update
2020-02-07 11:24:25 +01:00
Ulysses Souza 7c4194ce5d Post release 4.2.0 update:
- Changelog
- Next Version

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-02-07 01:00:18 +01:00
Ulysses Souza c6a33f25dc
Merge pull request #2495 from aiordache/issue#28_compose_context_target
Implement docker contexts
2020-02-05 15:30:48 +01:00
Anca Iordache 64fdb32ae8 Implement context management, lifecycle and unittests.
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2020-02-05 14:49:42 +01:00
Ulysses Souza f2e09ae632
Merge pull request #2485 from thaJeztah/fix_ImageCollectionTest_test_pull_multiple
Fix ImageCollectionTest.test_pull_multiple flakiness
2020-01-07 17:13:28 +01:00
Ulysses Souza 6010527ac6
Merge pull request #2444 from chris-crone/sync-release-4.1.0
Sync release 4.1.0
2020-01-07 17:12:50 +01:00
Sebastiaan van Stijn 940805dde6
Fix ImageCollectionTest.test_pull_multiple flakiness
The ImageCollectionTest.test_pull_multiple test performs a `docker pull` without
a `:tag` specified) to pull all tags of the given repository (image).

After pulling the image, the image(s) pulled are checked to verify if the list
of images contains the `:latest` tag.

However, the test assumes that all tags of the image are tags for the same
version of the image (same digest), and thus a *single* image is returned, which
is not always the case.

Currently, the `hello-world:latest` and `hello-world:linux` tags point to a
different digest, therefore the `client.images.pull()` returns multiple images:
one image for digest, making the test fail:

    =================================== FAILURES ===================================
    ____________________ ImageCollectionTest.test_pull_multiple ____________________
    tests/integration/models_images_test.py:90: in test_pull_multiple
        assert len(images) == 1
    E   AssertionError: assert 2 == 1
    E    +  where 2 = len([<Image: 'hello-world:linux'>, <Image: 'hello-world:latest'>])

This patch updates the test to not assume a single image is returned, and instead
loop through the list of images and check if any of the images contains the
`:latest` tag.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-06 13:46:23 +01:00
Djordje Lukic a0b9c3d0b3
Merge pull request #2421 from SLdragon/master
Fix win32pipe.WaitNamedPipe throw exception in windows container
2019-11-06 09:29:39 +01:00
Nicolas De Loof 1d8aa3019e Fix CI labels so we run on amd64 nodes
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2019-10-16 14:31:50 +02:00
Till Riedel c285bee1bc obey Hostname Username Port and ProxyCommand settings from .ssh/config
Signed-off-by: Till Riedel <riedel@teco.edu>
2019-10-16 14:31:50 +02:00
Till Riedel eb8c78c3b3 set host key policy for ssh transport to WarningPolicy()
Signed-off-by: Till Riedel <riedel@teco.edu>
2019-10-16 14:31:50 +02:00
Till Riedel 2dc569a232 set logging level of paramiko to warn
Signed-off-by: Till Riedel <riedel@teco.edu>
2019-10-16 14:31:50 +02:00
Christopher Crone efc7e3c4b0 Version bump
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-10-03 16:40:23 +02:00
Christopher Crone c81200a483 Bump 4.1.0
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-10-03 16:39:40 +02:00
Ulysses Souza 8077d80118
Merge pull request #2441 from kolyshkin/pytest-4.3
Bump pytest to 4.3.1
2019-10-02 13:32:06 +02:00
Kir Kolyshkin 44904f696f Bump pytest to 4.3.1
Pytest 4.3.1 includes the fix from

	https://github.com/pytest-dev/pytest/pull/4795

which should fix the following failure:

> INFO: Building docker-sdk-python3:4.0.2...
> sha256:c7a40413c985b6e75df324fae39b1c30cb78a25df71b7892f1a4a15449537fb3
> INFO: Starting docker-py tests...
> Traceback (most recent call last):
>   File "/usr/local/bin/pytest", line 10, in <module>
>     sys.exit(main())
>   File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 61, in main
>     config = _prepareconfig(args, plugins)
>   File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 182, in _prepareconfig
>     config = get_config()
>   File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 156, in get_config
>     pluginmanager.import_plugin(spec)
>   File "/usr/local/lib/python3.6/site-packages/_pytest/config/__init__.py", line 530, in import_plugin
>     __import__(importspec)
>   File "/usr/local/lib/python3.6/site-packages/_pytest/tmpdir.py", line 25, in <module>
>     class TempPathFactory(object):
>   File "/usr/local/lib/python3.6/site-packages/_pytest/tmpdir.py", line 35, in TempPathFactory
>     lambda p: Path(os.path.abspath(six.text_type(p)))
> TypeError: attrib() got an unexpected keyword argument 'convert'
> Sending interrupt signal to process
> Terminated
> script returned exit code 143

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2019-10-01 17:21:38 -07:00
rentu 015f44d8f8 Fix win32pipe.WaitNamedPipe throw exception in windows container.
Signed-off-by: Renlong Tu <rentu@microsoft.com>
2019-08-30 10:19:33 +01:00
Joffrey F 8acd2c3d08
Merge pull request #2420 from thaJeztah/fix_master_builds
Fix broken test due to BUSYBOX -> TEST_IMG rename
2019-08-29 15:21:57 -07:00
Sebastiaan van Stijn 53469e0dd3
Fix broken test due to BUSYBOX -> TEST_IMG rename
The BUSYBOX variable was renamed to TEST_IMG in
54b48a9b7a, however
0ddf428b6c got merged
after that change, but was out of date, and therefore
caused the tests to fail:

```
=================================== FAILURES ===================================
________ ServiceTest.test_create_service_with_network_attachment_config ________
tests/integration/api_service_test.py:379: in test_create_service_with_network_attachment_config
    container_spec = docker.types.ContainerSpec(BUSYBOX, ['true'])
E   NameError: global name 'BUSYBOX' is not defined
```

Fix the test by using the correct variable name.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-30 00:14:20 +02:00
Joffrey F 8fea5738d3
Merge pull request #2333 from hannseman/network-attachment-config
Add NetworkAttachmentConfig for service create/update
2019-08-27 00:21:27 -07:00
Joffrey F 1fc62e6a32
Merge pull request #2408 from thaJeztah/jenkins_update_versions
Jenkinsfile: update API versions and update to Python 3.7
2019-08-27 00:17:59 -07:00
Joffrey F 912824e599
Merge pull request #2352 from funkyfuture/container_list_docs
Amends the docs concerning multiple label filters
2019-08-27 00:17:04 -07:00
Joffrey F 5660730d36
Merge pull request #2383 from thaJeztah/support_mirrors
test/Dockerfile: allow using a mirror for the apt repository
2019-08-27 00:16:00 -07:00
Joffrey F 33b430ab7f
Merge pull request #2399 from fluetm/build-index-url-fix
Correct INDEX_URL logic in build.py _set_auth_headers
2019-08-27 00:14:40 -07:00
Joffrey F 9443decdf6
Merge pull request #2409 from thaJeztah/update_pytest
Update pytest to v4.2.1, use xunit2 for Jenkins compatibility, and small config changes
2019-08-27 00:13:28 -07:00
Joffrey F 70907325a5
Merge pull request #2414 from rmccullagh/patch-1
Fix typo in comment. networks => network
2019-08-27 00:11:48 -07:00
Joffrey F 1c36417d8f
Merge pull request #2401 from fluetm/fix-osxkeychain-issue
Fix for empty auth keys in config.json
2019-08-26 11:11:32 -07:00
Ryan McCullagh 93dc5082de Fix typo in comment. networks => network
Signed-off-by: Ryan McCullagh <ryan@amezmo.com>
2019-08-23 10:38:59 -05:00
Matt Fluet aa13df40b1 Fix for empty auth keys in config.json
Signed-off-by: Matt Fluet <matt.fluet@appian.com>
2019-08-15 18:15:57 -04:00
Joffrey F 845d31dbd2
Merge pull request #2407 from thaJeztah/update_alpine
Update alpine version to 3.10, and rename BUSYBOX variable
2019-08-12 11:14:32 -07:00