docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,896 Commits 23 Branches 129 Tags 8.4 MiB
Commit Graph

982 Commits

Author SHA1 Message Date
Sebastiaan van Stijn ea4fbd7ddf Update to python 3.7 (buster) and use build-args 
The build arg can be used to either test different versions, but
also makes it easier to "grep" when upgrading versions.

The output format of `gpg2 --list-secret-keys` changed in the version
installed on Buster, so `grep` was replaced with `awk` to address
the new output format;

Debian Jessie:

    gpg2 --no-auto-check-trustdb --list-secret-keys
    /root/.gnupg/secring.gpg
    ------------------------
    sec   1024D/A7B21401 2018-04-25
    uid                  Sakuya Izayoi <sakuya@gensokyo.jp>
    ssb   1024g/C235E4CE 2018-04-25

Debian Buster:

    gpg2 --no-auto-check-trustdb --list-secret-keys
    /root/.gnupg/pubring.kbx
    ------------------------
    sec   dsa1024 2018-04-25 [SCA]
          9781B87DAB042E6FD51388A5464ED987A7B21401
    uid           [ultimate] Sakuya Izayoi <sakuya@gensokyo.jp>
    ssb   elg1024 2018-04-25 [E]

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-03 15:49:26 +02:00
Sebastiaan van Stijn f3961244a0 Update credentials-helpers to v0.6.2 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-10-03 15:49:26 +02:00
Michael Crosby c2ed66552b Remove exec detach test 
Forking off an exec process and detaching isn't a supported method

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-10-03 15:49:26 +02:00
Ulysses Souza 12d73c6d38 Xfail test_attach_stream_and_cancel on TLS 
This test is quite flaky on ssl integration test

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-05-13 22:44:33 -07:00
Joffrey F 87ee18aa39 Change use_config_proxy default value to True to match CLI behavior 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-05-01 20:52:01 -07:00
Joffrey F 836194c64f
Merge pull request #2295 from hannseman/swarm-rotate-token 
Add support for rotate_manager_unlock_key
 2019-05-01 20:36:45 -07:00
Joffrey F 75e0ad017c
Merge pull request #2328 from docker/modernize_test_deps 
Update some test dependencies / default values with newer versions
 2019-05-01 02:48:05 -07:00
Hannes Ljungberg 532c62ee51 Add support for rotate_manager_unlock_key 
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-05-01 11:45:20 +02:00
Joffrey F eba8345c37 Update some test dependencies / default values with newer versions 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-05-01 02:36:19 -07:00
Joffrey F 4d62dd0a64
Merge pull request #2296 from hannseman/swarm-init-response 
Return node id on swarm init
 2019-05-01 02:29:30 -07:00
Joffrey F 9682422718
Merge pull request #2303 from hannseman/swarm-DataPathAddr 
Add support for swarm DataPathAddr
 2019-05-01 02:22:06 -07:00
Joffrey F cc13b82e9f
Merge pull request #2222 from docker/vendor_dockerpycreds 
Make dockerpycreds part of the SDK under docker.credentials
 2019-05-01 01:39:54 -07:00
Hannes Ljungberg 110c6769c9 Add test for join on already joined swarm 
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-05-01 10:24:50 +02:00
Hannes Ljungberg c7b9cae0a0 Add swarm support for data_addr_path 
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-05-01 10:24:50 +02:00
Hannes Ljungberg acd7a8f430 Return node id on swarm init 
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-05-01 10:24:02 +02:00
Joffrey F 1a4881acd9 Improve low_timeout test resilience 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-05-01 01:15:41 -07:00
Joffrey F 34ffc56865 Streaming TTY messages sometimes get truncated. Handle gracefully in demux tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-05-01 00:59:35 -07:00
Joffrey F 62c8bcbbb6 Increase timeout on test with long sleeps 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-05-01 00:47:16 -07:00
Joffrey F a2a2d100e8 Reorder imports 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-05-01 00:35:12 -07:00
Joffrey F 2e67cd1cc7 Improve socket_detached test helper to support future versions of the daemon 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-05-01 00:35:12 -07:00
Joffrey F 073a21c28a Separate into individual tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-05-01 00:20:40 -07:00
Joffrey F b06e437da8 Avoid demux test flakiness 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-04-30 23:47:09 -07:00
Joffrey F a823acc2ca Make dockerpycreds part of the SDK under docker.credentials 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-04-30 23:37:55 -07:00
Joffrey F 0287cd9f2e
Merge pull request #2309 from thaJeztah/remove_init_path_create 
Remove init_path from create
 2019-04-30 23:37:06 -07:00
Joffrey F 1aaa76dc5b
Merge pull request #2297 from hannseman/service-init 
Add support for setting init on services
 2019-04-14 15:07:47 -07:00
Sebastiaan van Stijn 50d475797a
Remove init_path from create 
This option was never functional, and was not intended
to be added to the "container create" API, so let's
remove it, because it has been removed in Docker 17.05,
and was broken in versions before that; see

- https://github.com/moby/moby/issues/32355 --init-path does not seem to work
- https://github.com/moby/moby/pull/32470 remove --init-path from client

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-10 02:42:23 +02:00
Ulysses Souza ef043559c4 Add 'sleep 2' to avoid race condition on attach 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-04-04 14:09:18 +02:00
Ulysses Souza 1b572a4340
Merge pull request #1882 from larkost/1743-container-ports 
add ports to containers
 2019-04-03 11:20:02 +02:00
Hannes Ljungberg 0d5aacc464 Add support for setting init on services 
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-03-28 16:03:48 +01:00
Ulysses Souza d1f7979f24 Refactor and add tests 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-26 17:28:49 +01:00
Karl Kuehn 4890864d65 add ports to containers 
Signed-off-by: Karl Kuehn <kuehn.karl@gmail.com>
 2019-03-26 16:55:45 +01:00
Ulysses Souza b2175c9475 Fix base_url to keep TCP protocol 
This fix lets the responsability of changing the
protocol to `parse_host` afterwards, letting
`base_url` with the original value.

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-26 16:04:06 +01:00
Ulysses Souza 15862eacbf Xfail test_attach_stream_and_cancel on TLS 
This test is quite flaky on ssl integration test

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-26 16:04:06 +01:00
Ian Campbell c1fea8ee4a
Merge pull request #2288 from hannseman/container-run-create-volume_driver 
Move volume_driver to RUN_HOST_CONFIG_KWARGS
 2019-03-25 12:24:54 +00:00
Ian Campbell d38c7246a4
Merge pull request #2287 from hannseman/swarm-default-addr-pool-redux 
Redux added arguments to create a swarm with a custom address pool and subnet size.
 2019-03-25 12:01:15 +00:00
Ian Campbell 5abf671442
Merge pull request #2282 from ulyssessouza/avoid-race-condition-on-autoremove 
Avoid race condition on short execution
 2019-03-25 12:00:28 +00:00
Ulysses Souza 8f42dd1484 Avoid race condition on short execution 
- Add a sleep of 2 seconds to be sure the logs
can be requested before the daemon removes the
container when run with auto_remove=True

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-25 12:42:54 +01:00
Hannes Ljungberg 523371e21d Move volume_driver to RUN_HOST_CONFIG_KWARGS 
Fixes #2271

Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-03-23 20:57:23 +01:00
Barry Shapira d6cc972cd9 Split monolithic integration tests into individual tests. 
The integration tests require restarting the swarm once for each
test.  I had done so manually with self.init_swarm(force_new_cluster=True)
but that wasn't resetting the swarm state correctly.  The usual
test teardown procedure cleans up correctly.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
 2019-03-22 10:40:27 +01:00
Barry Shapira 781dc30ad4 Check API version before setting swarm addr pool. 
Also corrected a documentation error: the default API version from
constants is currently 1.35, not 1.30 as was sometimes listed.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>

Removed accidental whitespace.

Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
 2019-03-22 10:40:27 +01:00
Barry Shapira 5d69a0a62e Added arguments to creeate a swarm with a custom address pool and subnet size. 
Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
 2019-03-22 10:38:13 +01:00
Hannes Ljungberg 7143cf02ab Test port lookup with protocols 
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-03-18 22:15:49 +01:00
Hannes Ljungberg 35714c46b1 Test all split_port with all valid protocols 
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-03-18 22:15:45 +01:00
Hannes Ljungberg d429a823ed Make PlacementPreference build correct context 
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
 2019-01-18 21:50:31 +01:00
Joffrey F a579e9e205 Remove use_config_proxy from exec. Add use_config_proxy docs to DockerClient 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-01-09 14:45:13 -08:00
Sebastiaan van Stijn 219c52141e
Regression 443 test: relax status-code check 
This test was testing for a 500 status, but this status
is actually a bug in the API (as it's due to an invalid
request), and the API should actually return a 400 status.

To make this test handle both situations, relax the test
to accept either a 4xx or 5xx status.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-09 21:23:11 +01:00
Joffrey F 65bebc085a Style fixes and removed some unused code 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-01-09 11:30:58 -08:00
Corentin Henry 2c4a8651a8 By default, disable proxy support 
This is to avoid a breaking change

Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2019-01-09 11:30:58 -08:00
Corentin Henry 0d37390c46 add integration tests for proxy support 
Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2019-01-09 11:30:58 -08:00
Corentin Henry 545adc2a59 add unit tests for ProxyConfig 
Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
 2019-01-09 11:30:58 -08:00