Ryan Belgrave
67a29441c4
allow custom ipam options when creating networks
...
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
2016-01-04 18:57:11 -05:00
Joffrey F
ee0788e4ad
Merge pull request #882 from docker/881-hostconfig_doc
...
Add cpu_quota and cpu_period to the HostConfig documentation
2016-01-04 14:52:23 -08:00
Joffrey F
57512760c8
Merge pull request #884 from docker/stop_test_update
...
Don't expect non-zero exit code when stopping a container
2015-12-23 13:09:20 -08:00
Joffrey F
8b322aea2b
Don't expect non-zero exit code when stopping a container
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-12-23 13:01:05 -08:00
Daniel Nephin
3ff27a8f5c
Merge pull request #883 from joshpurvis/jp-since-docs
...
Add docs for since argument in container logs method
2015-12-23 12:41:39 -08:00
Josh Purvis
d388abe3b3
Add docs for argument when retrieving container logs
...
Signed-off-by: Josh Purvis <jpurvis@kwantera.com>
2015-12-23 11:41:59 -05:00
Joffrey F
7724e36e1b
Add cpu_quota and cpu_period to the HostConfig documentation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-12-22 17:43:03 -08:00
Aanand Prasad
9deffc45a1
Merge pull request #863 from thomasboyt/fast-exclude-paths
...
Don't descend into ignored directories when building context
2015-12-16 16:59:12 +00:00
Aanand Prasad
1dae8ef09a
Merge pull request #874 from aanand/fix-index.docker.io
...
Treat 'index.docker.io' repo names as 'docker.io'
2015-12-16 15:08:55 +00:00
Aanand Prasad
25b188440a
Treat 'index.docker.io' repo names as 'docker.io'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-12-10 12:42:54 +00:00
Aanand Prasad
9b890c4540
Refactor resolve_authconfig tests
...
The structure of the fake config dictionary was not reflective of what
actual parsed config looks like.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-12-10 12:42:54 +00:00
Aanand Prasad
caa64b3f6a
Allow overriding of positional args to py.test in tox.ini
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-12-10 12:42:54 +00:00
Joffrey F
59f569a246
Bumped version
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-12-09 17:38:26 -08:00
Joffrey F
b094461845
Merge pull request #871 from thaJeztah/update-maintainers
...
update maintainers file for parsing
2015-12-09 10:47:46 -08:00
Aanand Prasad
6611ffe39d
Merge pull request #867 from sumitsahrawat/network-create-options
...
Allow providing options when creating networks
2015-12-09 16:35:37 +00:00
Sumit Sahrawat
64fdde5ef9
Fix #869 : Add docs for network api
...
Signed-off-by: Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in>
2015-12-10 10:29:11 +05:30
Sumit Sahrawat
2981d013a5
Fix remove_volume return value
...
Signed-off-by: Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in>
2015-12-10 10:29:11 +05:30
Sumit Sahrawat
bd948be7d9
Allow providing options when creating networks
...
Following the spec:
http://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#create-a-network
I have added an Options argument to create_network.
This opens up the possibility of creating isolated containers with no
internet access programmatically. We require such facilities in
https://github.com/jupyter/tmpnb/issues/187 .
Signed-off-by: Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in>
2015-12-10 10:29:11 +05:30
Sebastiaan van Stijn
6853af0a64
update maintainers file for parsing
...
this updates the MAINTAINERS file to the new format,
so that it can be parsed and collected in the docker/opensource
repository.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-09 15:37:37 +01:00
Joffrey F
0f091747ec
Merge pull request #868 from jstewmon/config-stop-signal
...
added stop_signal to create container config
2015-12-08 12:47:31 -08:00
Joffrey F
bb1ab12f54
Merge pull request #865 from dlorenc/master
...
Allow utils.tar to take an existing file object.
2015-12-08 12:19:11 -08:00
Thomas Boyt
a49166abf2
Improve get_paths performance by not descending into ignored directories
...
Signed-off-by: Thomas Boyt <thomas@ledgerx.com>
2015-12-08 11:26:25 -05:00
Aanand Prasad
28864df27b
Merge pull request #854 from lots0logs/840-add-exception-utility-method-for-create-host-config
...
840 add exception utility method for create host config
2015-12-04 16:21:53 +00:00
Dustin Falgout
e0c6ec0343
incorporate feedback
...
Signed-off-by: Dustin Falgout <dustin@falgout.us>
2015-12-04 01:27:44 -06:00
Dustin Falgout
e0365fcbfb
Use new methods to raise exceptions in create_host_config.
...
Added tests for the new methods.
Closes #840
Signed-off-by: Dustin Falgout <dustin@falgout.us>
2015-12-03 17:19:59 -06:00
Dustin Falgout
5f9f3a4145
resolve merge conflict
...
Signed-off-by: Dustin Falgout <dustin@falgout.us>
2015-12-03 17:19:59 -06:00
Daniel Nephin
9ebecb5991
Merge pull request #858 from TomasTomecek/improve-exec-api
...
Improve exec api
2015-12-03 14:16:43 -08:00
Jonathan Stewmon
31b1b53f7f
added stop_signal to create container config
...
Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
2015-12-03 14:31:51 -06:00
Tomas Tomecek
a9a538abaf
allow interactive exec
...
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2015-12-03 11:07:11 +01:00
Tomas Tomecek
2c3af6ca8e
make,integration-dind: try to remove dpy-dind
...
b/c if test fails, dpy-dind is left running and integration-dind target
will refuse to start and you need to manually force-remove the container
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2015-12-02 09:46:29 +01:00
Tomas Tomecek
55b67acb5b
tests,integration: ensure container is removed if start fails
...
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2015-12-02 09:46:02 +01:00
Daniel Nephin
b5fb6d216f
Merge pull request #866 from ticosax/fix-volume-listing
...
fix typo filter param for `volumes`
2015-12-01 11:12:55 -08:00
Daniel Nephin
95ea5afdb1
Merge pull request #864 from ticosax/document-network_mode
...
[doc] network_mode can also take the name of a network as value.
2015-12-01 11:11:38 -08:00
Nicolas Delaby
05fd8dfb41
fix typo filter param for `volumes`
...
https://docs.docker.com/engine/reference/api/docker_remote_api_v1.21/#list-volumes
Signed-off-by: Nicolas Delaby <nicolas.delaby@lock8.me>
2015-12-01 15:06:01 +01:00
Nicolas Delaby
497442169c
network_mode can also take the name of a network as value.
...
Signed-off-by: Nicolas Delaby <nicolas.delaby@lock8.me>
2015-12-01 10:27:30 +01:00
dlorenc
adb3635378
Allow utils.tar to take an existing file object.
...
Signed-off-by: dlorenc <lorenc.d@gmail.com>
2015-11-30 14:51:26 -08:00
Joffrey F
d51d06d209
Merge pull request #862 from docker/1.6.0-release
...
1.6.0 release
2015-11-30 14:05:16 -08:00
Joffrey F
a0c0972267
Update Changelog with one last bugfix
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-30 12:22:01 -08:00
Joffrey F
c0ec5512ae
Merge pull request #861 from docker/860-deprecate-resolve-repo-name
...
Update repo name resolution method
2015-11-30 12:01:54 -08:00
Joffrey F
43b0ea5358
Merge pull request #841 from delfick/proxy_pool_manager_assert_hostname
...
Ensure assert_hostname is set on the pool connection
2015-11-24 13:41:56 -08:00
Joffrey F
00c0baf40f
Add tests for new cases covered by parse_repository_tag
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-24 12:16:00 -08:00
Joffrey F
ee864f2cd9
Bump version
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-23 18:47:58 -08:00
Joffrey F
6d0e2d69d5
Update auth.resolve_repository_name
...
More relaxed version that matches the constraints imposed by the
current version of the docker daemon.
Few unit tests to verify the new cases.
Client.pull was trying to set the tag value when it wasn't supposed
to, fixed now.
utils.parse_repository_tag is simpler and supports @sha... notation
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-23 18:43:02 -08:00
Joffrey F
aec48133a8
Update Changelog
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-23 15:30:14 -08:00
Joffrey F
1ca2bc58f0
Merge pull request #855 from docker/852-independent-integration
...
Move methods/classes used by all integration tests to helpers.py
2015-11-18 16:33:09 -08:00
Joffrey F
73b51400a1
Fix integration-dind-ssl make task
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-18 15:41:32 -08:00
Joffrey F
de617375f1
Move methods/classes used by all integration tests to helpers.py
...
Ensure setup_module is called at session level, making the test
suite not order dependent. Test files can be invoked independently.
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-18 15:40:54 -08:00
Joffrey F
e1eefce7f9
Merge branch 'schu-oom-kill-disable-pr'
2015-11-18 14:48:55 -08:00
Joffrey F
64eac0b71c
Wrong key name in stats test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-11-18 14:47:48 -08:00
Joffrey F
dfcc1d87bf
Merge branch 'oom-kill-disable-pr' of https://github.com/schu/docker-py into schu-oom-kill-disable-pr
2015-11-18 14:35:54 -08:00