53589e5f0a
Implement methods for managing networks
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-10-14 17:26:50 -07:00
a1393ee8ac
Don't break when volume binds contain unicode characters
...
Also includes a few unit tests for utils.convert_volume_binds
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-10-14 17:26:50 -07:00
4a2db828b4
Support the 'since' option in the 'containers/<id>/logs' endpoint
...
Signed-off-by: Viacheslav Boiko <v.e.boyko@gmail.com>
2015-10-02 06:19:06 +00:00
7ed8eb5da9
Remove skip test
...
It has been reported that the bug in docker has now been fixed so we can
re-instate this test.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-10-01 14:19:34 +01:00
19291ee20d
Fix race condition in integration regression tests
...
`docker port` and inspect do not return ports for containers which are
not running. Because the container command is `true`, sometimes that
exits before the inspect is called.
Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com>
2015-10-01 14:05:50 +01:00
7884ab9fe2
Merge pull request #789 from PierreF/top_ps_args
...
Allow to specify ps_args when listing processes
2015-09-28 14:36:08 -07:00
d0ccc2e261
Support explicit protocol in Client.port
...
User can now specify a protocol in Client.port using the port/proto
syntax. Default port is now TCP instead of UDP (to match the
behavior of `docker port`) when no proto is specified.
Regression test
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-28 12:06:10 -07:00
c1577606be
Added test for "top" function
...
Signed-off-by: Pierre Fersing <pierre.fersing@bleemeo.com>
2015-09-28 11:59:25 +02:00
29b12cf007
_url can take arbitrarily many arguments
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-25 14:25:00 -07:00
d89b2a01f0
cpu_quota and cpu_period unit tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-24 10:08:02 -07:00
48d72f6703
Bump default API version
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-23 11:35:57 -07:00
da2b797323
Improve volume bindings integration test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-22 14:30:03 -07:00
d6a86e1d69
Fix volumes tests for API version >= 1.20
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-22 14:17:19 -07:00
eec0465832
Make volume binds tests work on any host
...
Instead of creating the test directory directly on the host, create it
by starting a container with the directory bind-mounted, so that it
doesn't matter whether the daemon is local, in a VM or remote.
This removes the need to make /tmp a volume in the test container, and
to share it with the dind container.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-22 11:34:49 -07:00
3d6c91b469
Only pull busybox in integration tests if we don't already have it
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-22 14:25:28 +02:00
ef0c373f14
Pin busybox version to use in integration tests
...
Removed obsolete non-streaming build test
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-21 15:34:10 -07:00
8d32631635
Improve volume cleanup logic
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-16 12:55:49 -07:00
acd5e634ff
Generic skip decorator for low API version accessible to all tests
...
Add simpler version comparison functions
Add decorator to enforce minimum version in API methods
Fix utils imports
Add minimum_version decorators on API methods that needed it
GroupAdd test requires API version >= 1.20
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-16 12:55:13 -07:00
05267f63d3
Modify unit tests suite to allow mock routes to optionally be method-aware
...
Added mock API routes for volumes API
Add unit tests and integration tests for volume API
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-16 12:54:26 -07:00
1b798a2901
GroupAdd tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-15 01:58:06 +02:00
e5fbc42dcb
Merge pull request #763 from docker/api_splitup
...
API splitup
2015-09-13 08:47:07 -07:00
c735cc69a0
Split different APIs into several mixins for clarity / easier maintenance
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-11 16:19:29 -07:00
7e3cdfb3b1
Fixed regression test in py3 environments
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-10 11:37:51 -07:00
de5aab87b4
Merge pull request #753 from docker/715-user-int-uid
...
Always send a string for the user param in create_container
2015-09-10 10:37:05 -07:00
b1c2475698
Add hello-world to temp images in pull tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-09 17:10:04 -07:00
1fb2db4951
Make integration tests more CI-friendly.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-09 17:06:34 -07:00
fa3082b6cd
Update integration-dind task
2015-09-09 14:49:58 -07:00
abaf346b49
Make running integration tests with dind possible
2015-09-09 14:49:36 -07:00
7dce129180
Merge pull request #754 from aanand/default-to-tcp-url-on-windows
...
Default to 127.0.0.1:2375 on Windows
2015-09-01 16:36:32 -07:00
1362938f03
Default to 127.0.0.1:2375 on Windows
...
Following the logic of the Docker client.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-01 16:28:05 -07:00
1e916a1e83
Test UID validity
2015-08-31 18:35:32 -07:00
09defa66ba
Always send a string for the user param in create_container
2015-08-31 16:06:52 -07:00
3d884f9a3c
Test URL construction
2015-08-31 15:01:40 -07:00
33acb9d2e0
Test has been fixed, remove skip decorator
2015-08-31 13:13:46 -07:00
ad608baaaf
Merge pull request #747 from aanand/integration-test-fixes
...
Integration test improvements
2015-08-31 13:07:02 -07:00
6c0f7187a8
Integration test improvements
...
- Fix the setup step (the process has changed now that we're using
pytest)
- Skip tests that are unstable
- Make better use of build caching
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-31 12:06:41 -07:00
9b37120167
Merge pull request #742 from aanand/fix-dockerignore-integration-test
...
Fix .dockerignore integration test
2015-08-27 11:01:47 -07:00
63df0b9ab3
Merge branch 'master' of github.com:docker/docker-py
2015-08-26 17:02:55 -07:00
c56c9faacd
Merge branch 'default-cert-path' of https://github.com/aanand/docker-py into aanand-default-cert-path
...
Conflicts:
tests/utils_test.py
2015-08-26 17:00:33 -07:00
db1a93fd27
Merge pull request #662 from stevenewey/exec_create_user
...
Exec create user
2015-08-26 15:36:47 -07:00
ddf879cc4c
Merge pull request #721 from aanand/pathspec
...
Better support for .dockerignore
2015-08-26 14:25:09 -07:00
e7a9ae097c
Don't remove LogConfig.types shortcut
2015-08-26 11:51:08 -07:00
20e142fe78
Better support for .dockerignore
...
- Support all basic pattern forms: file, directory, *, ?, !
- Fix handling of wildcard patterns and subdirectories - `*/a.py` should
match `foo/a.py`, but not `foo/bar/a.py`
- Fix handling of directory patterns with a trailing slash - make sure
they're handled equivalently to those without one
- Fix handling of custom Dockerfiles - make sure they go in the tarball
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-26 19:14:09 +01:00
9937a31a88
Test valid no args for log config
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-08-26 16:10:28 +01:00
ced9b0094f
Fix .dockerignore integration test
...
- There was a typo (".dockerginore"), which meant that the exclusion of
the .dockerignore file itself wasn't being tested.
- Some of the file names were non-descriptive.
- The test was inspecting the output of the build process, rather than
running 'ls' in a new container, which meant it was full of extra
output, and would fail when there was a cache hit.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-26 16:03:21 +01:00
35b30e69df
Remove validation of supported log drivers
...
By having this hardcoded list of log drivers, it is a bottleneck
to us supporting more log drivers.
The daemon already validates if a log driver is valid or not, so rather
than duplicating that validation, let's pass the log_driver along.
This allows support for new/more log drivers as they become supported
in docker without having to wait for both docker-py and docker-compose
to support them.
Keeping the current list of log driver types for backwards compatibility.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-08-26 16:02:03 +01:00
90538cf0a3
Fix log driver integration test
...
By using `json-file` as the use case we can run this without needing
to be on a machine with syslog installed.
Even if syslog was installed, this test was still failing as the
`log_opt` of 'key1' is an invalid option.
This test is slightly different style to the others, it hopefully
includes an example of how to space out tests for increased readability,
we construct our tests in 3 phases(generally) and include a space imbetween
them:
- setup
- perform action
- assertions
Expanded variable names is important for readability/clarity. Also
reduced the number of assertions to focus on the logic we're testing.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-08-26 15:58:57 +01:00
b5f1e64e8f
Ensure Makefile still run tests properly / tests are run in container as expected
2015-08-25 16:58:01 -07:00
f9a540aa77
Merge branch 'pytest' of https://github.com/aanand/docker-py into aanand-pytest
2015-08-25 16:10:47 -07:00
47e0ad6959
Merge pull request #735 from aanand/test-network-mode-version
...
Explicitly test NetworkMode logic in create_host_config
2015-08-25 14:57:59 -07:00
1308049d2f
Merge pull request #736 from aanand/propagate-exceptions-in-tests
...
Stop catching Exception in tests where it isn't expected
2015-08-25 14:56:49 -07:00
d5bcdaf2f8
Use pytest helpers to assert exceptions and deprecated warnings
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-25 16:34:33 +01:00
6e27c2a3d0
Run tests with pytest
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-25 16:34:33 +01:00
4e4c342582
Call Client.create_host_config because the old call is deprecated
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2015-08-25 16:19:51 +01:00
36424ca001
Stop catching Exception in tests where it isn't expected
...
The test runner will report on the exception anyway, so it's redundant.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-25 16:00:42 +01:00
41c21676a2
Explicitly test NetworkMode logic in create_host_config
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-25 14:11:21 +01:00
d9a149f327
Merge pull request #732 from docker/version-dependent-hostconfig
...
Version dependent hostconfig
2015-08-25 14:03:51 +01:00
edebf3756a
Split the entrypoint string to shell-like syntax.
2015-08-25 09:44:47 +08:00
595965ebc4
Adapt tests to new create_host_config usage
2015-08-24 16:25:18 -07:00
3caaa0050b
Added support for cgroup parent
...
Clean up cgroup_parent usage
2015-08-24 14:43:05 -07:00
b7aa1d76eb
Fixed #726 issue where split_port was checking `len(None)`
...
- Fixed #726 by adding a check for None in split_port
- Also switched to using a _raise_invalid_port() function to replace
multiple slightly differing ValueErrors for invalid port
2015-08-19 22:01:44 -05:00
adb2d01861
Added full path parse_host unit test
2015-08-17 14:45:35 -07:00
1c1d7eee5a
Merge branch 'master' into exec_create_user
2015-08-12 18:12:56 +01:00
139850f3f3
Merge pull request #698 from docker/jhowardmsft-14530-netmode
...
`network_mode` now necessary in `host_config`
2015-08-10 10:53:57 -07:00
d400717ff8
Squashed commit of the following:
...
commit 4f053a06c1e9e3f63fd5afde60322f676acbdf45
Merge: 9177380 07a99eahttps://github.com/docker/docker/blob/master/opts/envfile.go#L19-L51
commit ea9bfd95dfafe4023c58ab37f990158f73eb2e0d
Author: Viktor Petersson <vpetersson@wireload.net>
Date: Wed Jul 29 11:41:23 2015 +0100
Replaces CSV module with manual splitting.
commit a001d28ff48309d2b2338aaf27253fdfaa0f6c4b
Author: Viktor Petersson <vpetersson@wireload.net>
Date: Wed Jul 29 11:35:37 2015 +0100
Removes isinstance on filename.
commit 419d5961f6103df9166be3a9baa549276c12223d
Author: Viktor Petersson <vpetersson@wireload.net>
Date: Tue Jul 28 22:39:33 2015 +0100
Reflects @aanand's feedback.
commit e81e3c8ed797ff939843d2485bf15525e85e890d
Author: Viktor Petersson <vpetersson@wireload.net>
Date: Tue Jul 28 15:43:32 2015 +0100
Typo fix.
commit 2898389cada2bfca64bdfa71359aebeb3b5b6d1b
Author: Viktor Petersson <vpetersson@wireload.net>
Date: Tue Jul 28 15:41:08 2015 +0100
Refs #565 . Adds minimal implementation of env_file client-side support.
2015-07-30 14:39:37 +01:00
2b7c31e0f7
Fixed empty_host_config test
2015-07-29 14:23:10 -07:00
daea185a23
nit: parenthesis alignment
2015-07-29 12:43:39 -07:00
8f1a82faeb
Add netmode (required by docker)
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-28 15:18:12 -07:00
8a87001d09
Merge pull request #685 from paulbellamy/master
...
Fix integration tests
2015-07-21 11:01:11 -07:00
42b712d100
Merge pull request #680 from aanand/fix-timestamp-conversion
...
Enforce UTC datetimes in arguments to `events()`
2015-07-21 10:45:29 -07:00
75cc50f0ad
Default to ~/.docker if DOCKER_CERT_PATH is empty
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-21 16:50:44 +01:00
7de1605e9a
Fix integration tests.
...
Forgot to update them in 33e1a58
2015-07-21 12:07:22 +01:00
2c08ad21dd
Merge pull request #674 from estesp/use-docker-host-in-tests
...
Update all client instances in integration tests to use DOCKER_HOST
2015-07-21 11:09:22 +01:00
657420a4d3
Enforce UTC datetimes in arguments to `events()`
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-21 10:49:27 +01:00
33e1a58b60
Stop pinging registries from the client
...
The daemon already pings the registry, so doing it on our end is
redundant and error-prone.
The `insecure_registry` argument to `push()`, `pull()` and `login()` has
been deprecated - in the latter case, it wasn't being used anyway.
The `insecure` argument to `docker.auth.resolve_repository_name()` has
also been deprecated.
`docker.utils.ping_registry()` has been deprecated.
`docker.auth.expand_registry_url()` has been removed.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-20 19:50:18 +01:00
f321eef031
Update all client instances in integration tests to use DOCKER_HOST
...
In testing Docker master with the latest docker-py release, a few new
tests exist which don't set the base_url, which is not the default unix
socket location when Docker's integration tests are running.
Also, there is no guarantee syslog can be reached from a test container
so I wrapped that test with the NOT_ON_HOST skip logic.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-07-14 13:00:35 -04:00
70b921f8a3
Fix handling output from tty-enabled containers.
...
Treat output from TTY-enabled containers as raw streams, rather than
as multiplexed streams. The docker API docs specify that tty-enabled
containers don't multiplex. Also update tests to pass with these
changes, and changed the code used to read raw streams to not
read line-by-line, and to not skip empty lines.
Addresses issue #630
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-07-06 18:20:41 -04:00
7bbec93f64
Add test for root user as default exec_create behaviour
2015-07-02 13:24:51 +01:00
2d7f1cfa1e
Merge pull request #651 from docker/fix_647
...
Fix adapter bug + regression test
2015-06-30 15:19:14 -07:00
ac90a874be
Merge pull request #644 from docker/memory-memswap-hostconfig
...
memory / memswap in hostconfig
2015-06-30 15:06:32 -07:00
9e87884ba8
Fix Unix socket adapter bug with double slash in path + regression test
2015-06-30 23:59:03 +02:00
6a5a256509
Add support for user on exec_create.
2015-06-30 13:23:42 +01:00
237ce20013
Merge branch 'id-resolution-in-check-resource' of https://github.com/posita/docker-py into posita-id-resolution-in-check-resource
2015-06-30 01:46:22 +02:00
30fac5b879
Fix stop timeout bug
2015-06-24 22:58:56 +02:00
a12ba1a96f
Updated tests for mem_limit changes
2015-06-19 02:13:12 +02:00
e05d06bcf2
Merge branch 'allow-any-mode' of https://github.com/aanand/docker-py into aanand-allow-any-mode
2015-06-18 21:10:13 +02:00
6fd391840e
Bumped default API version == 1.19
2015-06-18 20:38:52 +02:00
5fa7576e8c
Add volume_driver param to client.create_container
...
- Add appropriate test which also asserts that volume names can be passed through to drivers.
- Add new param to docs.
Signed-off-by: Luke Marsden <luke@clusterhq.com>
2015-06-18 20:38:21 +02:00
6b9ea106d7
Fixed integration test
2015-06-18 19:58:01 +02:00
1446b8c5ee
Allow binds to be specified as a list of strings
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-12 12:36:59 -04:00
7dd7625391
Allow any mode string to be passed into a volume bind
...
Volume binds now take a "mode" key, whose value can be any string.
"ro" is still supported. It is an error to specify both "ro" and "mode".
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-05 13:25:59 +01:00
947febcbd8
Move image/container ID resolution to @check_resource decorator.
2015-05-20 15:37:40 -07:00
7b2fd8cf5e
Merge pull request #562 from smothiki/mems
...
make memory units compatible with native docker cli
2015-05-20 15:37:22 -07:00
fe12dad21b
Separate check_resource inspect tests
2015-05-20 14:46:51 -07:00
de2f58d818
Fix #602 . Raise ValueError on empty argument to inspect_{container,image}() methods.
2015-05-17 17:39:25 -07:00
329662c53e
Merge pull request #593 from docker/deprecate_start_hostconfig
...
Deprecate start hostconfig
2015-05-08 14:32:42 -07:00
2fd2eebcb0
Added deprecation warning for host config in start
2015-05-08 14:00:58 -07:00
1f74262ab3
unit test
2015-05-08 11:36:14 -07:00
ef452ed4c1
make memory units compatible with native docker cli
...
Signed-off-by: sivaram mothiki <smothiki@engineyard.com>
2015-05-07 20:05:32 -06:00
070cbece0a
Fixes for #586
2015-05-06 17:53:53 -07:00
b9909c68f9
exec_resize is incorrectly passing param as json
2015-04-28 19:50:15 -07:00
f6b816c264
Fix #573
2015-04-28 10:48:09 -07:00
7958110fda
Added unit tests for container limits in build
2015-04-27 16:36:15 -07:00
ae329cb3ac
* Separate file to store constants
...
* Added container_limits param to Client.build
2015-04-27 16:24:42 -07:00
e337a2317e
Updated exec API documentation
2015-04-27 14:11:43 -07:00
e2ad91bdf7
Exec API tests
2015-04-27 13:57:15 -07:00
c2d48652ce
Added check_resource decorator to interrupt command if container or image argument is None
2015-04-24 15:56:35 -07:00
c7948436e5
Added tests for log_config param
2015-04-24 15:10:51 -07:00
6228929a88
Handle ID truncate on client side in containers list (and changed default from True to False)
2015-04-22 18:00:53 -07:00
c328be7deb
revert
2015-04-22 17:45:56 -07:00
d0a49ec3b8
Added integration test
2015-04-22 17:43:36 -07:00
d71bfb1b3d
Improved ulimit tests
2015-04-22 15:45:49 -07:00
803b37bc2e
assertRaises 2.6 compat
2015-04-22 15:19:01 -07:00
84fdd2925d
Add tests for ulimits
2015-04-22 15:13:38 -07:00
c7511481a6
BaseTestCase shims assertIn
2015-04-22 15:11:55 -07:00
a5519022d9
Merge branch 'sam/import-improvements' of https://github.com/ssssam/docker-py into ssssam-sam/import-improvements
...
Conflicts:
docker/client.py
docker/unixconn/unixconn.py
tests/integration_test.py
2015-04-22 11:50:45 -07:00
605fc7e04f
line length
...
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
2015-04-11 07:20:43 -05:00
b33052b393
python 2.6 compatible
...
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
2015-04-11 07:17:28 -05:00
278e801b89
Adding port utils to split port ranges
...
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
2015-04-03 17:23:50 +03:00
2f6579bf59
Use assertRaises in a backward compatible fashion
2015-03-25 16:07:16 -07:00
6e0b5a8d70
Added assertIn shim for py2.6
2015-03-25 16:02:46 -07:00
b097d19f2f
docs and unit test for security_opt
2015-03-25 15:40:14 -07:00
bd72bd13c7
Finish labels implementation, add tests and docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 15:42:10 -07:00
014dba2841
Update default API version to 1.18
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-20 14:49:42 -07:00
7d5c1efbbe
Fix unit tests
2015-03-05 12:16:53 -08:00
acfa99dd10
Auto-detect integration tests
2015-03-05 12:08:41 -08:00
3e0496cc16
detect server version when version="auto"
...
heavily inspired by PR#281
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2015-03-05 08:53:29 +01:00
a86bfffd89
Properly close files and sockets in unit tests
2015-02-28 21:03:15 +01:00
39ee5981b4
Merge pull request #502 from cpuguy83/498_dockerignore_special_names
...
Add special cases for .dockerignore
2015-02-27 11:56:19 -08:00
91985b2397
Merge pull request #509 from docker/lxc_driver_test_compat
...
Lxc driver test compat
2015-02-27 11:48:36 -08:00
0fae821350
Merge pull request #508 from docker/de-i11003
...
Rename test fix to take into account docker/docker#11003
2015-02-27 11:47:57 -08:00
b1a858a14d
Update resolve_authconfig to bring it in line with Docker client
...
Instead of expanding the registry name we're looking for to a full URL,
strip entries in the authconfig down to just the hostname.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-02-27 13:10:20 +00:00
8d2b71fa7e
I suck at python
2015-02-26 17:54:19 -08:00
e255c10f57
Ensure integration tests work with LXC exec driver
2015-02-26 17:39:44 -08:00
21cc9916fd
Rename test fix to take into account docker/docker#11003
2015-02-26 17:16:36 -08:00
ce40730b42
Add special cases for .dockerignore
...
Fixes #498
Allowing `Dockerfile` and `.dockerignore` in the exclusion filter
completely breaks the build on docker < 1.5
In Docker 1.5 these entries are treated as special cases when included
in the .dockerignore and are still sent as part of the context. The
daemon ends up excluding them from any `ADD`, `COPY`, and cache
validation.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-02-24 15:48:51 -05:00
0713488fac
Resolves #497 - add support for dockerfile
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-02-20 21:20:21 -05:00
7f49cf1279
Fix several DOCKER_HOST assumptions in integration_test.py
2015-02-16 16:42:34 -07:00
7084802da2
Fix pep8 error
2015-02-16 10:56:08 -08:00
c02f0ab723
Formatting
2015-02-12 15:54:16 -08:00
1a7e3a2d6d
Merge branch 'add-stats-api-support' of https://github.com/nir0s/docker-py into nir0s-add-stats-api-support
2015-02-12 13:15:59 -08:00
c50795a08a
minor
2015-02-12 10:01:42 +02:00
52702f7da0
removed aggregation for now and added a unit test. also using stream_helper now
2015-02-12 09:48:33 +02:00
cab37b604a
pid_mode integration tests
2015-02-11 12:16:36 -08:00
f402af551d
added initial support for stats retrieval
2015-02-11 22:04:32 +02:00
22dd8d78ea
Merge pull request #480 from ggtools/events
...
Add missing options to the events command
2015-02-11 11:13:52 -08:00
53b1bb41ac
Fix datetime issue with Python 2.6
...
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
2015-02-11 07:25:59 +01:00
a07bd28077
Add missing options to the events command
...
- Add since, until and filters parameters to `Client.events`
- Add missing `events`command in the documentation
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
2015-02-11 07:25:59 +01:00
e379e8ae24
read_only parameter
2015-02-10 16:13:09 -08:00
d0512028be
Merge pull request #482 from docker/rename_container
...
New Client.rename() method
2015-02-10 13:56:29 -08:00
a7f7fbb0fd
rename() tests and docs
2015-02-10 12:55:44 -08:00
f3717f5815
Fix crash when building from remote sources
...
Avoid crashing when the Docker python client is able to load
registry credentials when building using a remote source
Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net>
2015-02-04 16:26:55 +00:00
40770878ad
Additional tests and small improvement to auth.resolve_authconfig
2015-02-01 15:36:56 -08:00
301515ed56
Add Support for Mac Address
...
The new docker api allows specifing mac address for containers. This change is to allow docker py the same functionality.
Signed-off-by: James Harris <james@rancher.com>
2015-01-21 16:08:16 -07:00
aa19d7b660
Fixed TestRestartingContainer
2015-01-13 10:32:28 -08:00
1f8cde8560
Integration tests fixes
2015-01-09 14:22:55 -08:00
43c334656b
Added RO volumes tests
2015-01-08 18:02:03 -08:00
4d3e7eb1cb
Merge branch 'master' of https://github.com/rmohr/docker-py into rmohr-master
2015-01-08 16:23:21 -08:00
09ea71971c
Fix for issue #443
2015-01-08 15:57:44 -08:00
b1d4a5d8d1
Add integration tests for Client.import_image() function
...
Currently TestImportFromStream fails, because something is going wrong
with the HTTP chunked transfer-encoding. This didn't work before,
either (for a different reason).
2015-01-05 12:33:36 +00:00
2f3b87a470
Rewrite Client.import_image() and add less-magical versions
...
Rather than have one function that can do 5 things and attempts to guess
what the user wanted, it's good to have a function for each possible
method of importing an image. Error cases are handled a lot better this
way.
The unit test test_import_image_from_file() was changed to be
test_import_image_from_bytes(), because if we try to import a temporary
file in the test, the 'data' parameter of the 'fake_request' object is
an instance of a funny internal type like <_io.BufferedReader
name='/tmp/tmpc9chux'> and it's very hard to match such a thing with
`mock.assert_called_with()`.
2015-01-05 12:32:56 +00:00
42b91885a2
Rework Unix connection code so that 'chunked' transfers work
...
This allows streaming a system to the 'import' command, rather than
having to read the whole thing into memory before sending it.
Previously both the UnixAdapter and the docker.Client objects would
track the 'base URL' of the Docker daemon (socket path in the case of
local Unix-domain socket connections). The Client object would construct
URLs which contained the path to the socket with the path of the Docker
API call appended. The UnixHTTPConnection instance would then remove the
known socket path from the URL.
This relied on all calls going through the HTTPConnection.request()
function, where the URL could be rewritten. In the case of 'chunked'
HTTP POST requests this doesn't happen, so such calls would request
a path still including the socket path and would receive a 404 error.
The client now constructs URLs containing just the path of the desired API
endpoint, and expects the Unix socket transport to know the path to the
Docker daemon's socket.
2015-01-05 12:05:39 +00:00
2d34c38c4d
Keep unix socket alive with python3
2014-12-21 11:42:41 +01:00
2218dbaa67
Use create_host_config in start (unifying parameter processing)
2014-12-18 18:03:27 -08:00
53d61a77b6
Improved integration tests to run on python3 and close sessions after in tearDown phase
2014-12-18 17:46:41 -08:00
53beba75f4
Merge pull request #427 from abanna/adding_multiple_dockercfg_support
...
adding the ability to login with different dockercfg files.
2014-12-18 10:39:59 -08:00
96f66f7558
Merge pull request #435 from dims/fix-flake8-issues
...
flake8 fails with F821 for unicode under python 3.4.2
2014-12-18 10:33:40 -08:00
d3cf874938
missed a lint error
2014-12-18 10:21:02 -08:00
4cbf4e312c
adding the ability to login with different dockercfg files.
2014-12-18 10:19:40 -08:00
d9fa43a9b7
flake8 fails with F821 for unicode under python 3.4.2
2014-12-18 11:08:37 -05:00
17c1869304
Tidy up stream test harness & fix race conditions
2014-12-18 09:23:21 +00:00
8aded4842b
Retry on connection error
2014-12-17 12:55:49 -08:00
f75afc92a2
Use unicode() typecast instead of u'' literal (3.2 compat). Fixes #408
2014-12-17 12:07:35 -08:00
b1e0ca0bd6
Merge branch 'master' of https://github.com/leth/docker-py into leth-master
...
Conflicts:
tests/test.py
2014-12-17 11:56:58 -08:00
2b5516afab
Re-added integration tests with hostconfig in start
2014-12-17 11:44:52 -08:00
12aad176b9
Re-added start with hostconfig tests
2014-12-17 11:44:52 -08:00
c29a6a2841
Fixed start_container tests
2014-12-17 11:44:52 -08:00
e992a8127d
assertEquals -> assertEqual
2014-12-17 11:44:51 -08:00
66112561f4
Updated integration tests to use new host_config param
2014-12-17 11:44:51 -08:00
19b1379f17
Updated unit tests
...
* Warnings will now raise exceptions in unit tests
* Updated several tests to use host_config
2014-12-17 11:44:51 -08:00
b214406b38
Updated mock API version
2014-12-17 11:44:31 -08:00
f2ba7f9b9d
Merge pull request #429 from dims/master
...
Devices should be separated by colon separated string
2014-12-17 11:32:58 -08:00
3a51d3fe0b
Devices should be separated by colon separated string
...
Totally bad test :( (written by me). The documentation and
code should match now. Many thanks to pranavs18 for spotting
the error and proposing the fix.
2014-12-17 07:35:07 -05:00
578dda64c9
Consume from chunked streams without data loss
...
Data already in local python buffers was lost when stream socket
fileobject was re-created. We now use http.client to handle the chunk
transfer encoding, and we read only the data from each chunk.
This adds a test harness for stream responses which tries to trigger the
lost-buffer behaviour by responding to the HTTP request in full, as
early as possible.
NB: Python's http.client will close the socket fileobj early if there is
no content length or chunked transfer encoding header. If this happens,
requests/urllib3 will reopen it, but we lose some data which was stored
in buffers.
2014-12-16 20:36:08 +00:00
73b15be0c1
Merge pull request #423 from docker/0.6.0-integration
...
Fixed integration tests
2014-12-15 15:01:20 -08:00
bf9e1c84ba
Don't use old test image (deprecated ID scheme)
2014-12-15 14:52:51 -08:00
a4aa1a88f1
Better pull confirmation
2014-12-15 13:53:49 -08:00
4b91a71313
Longer timeout when contacting hub
2014-12-15 12:11:54 -08:00
d8e8400419
Allow for pull as an option to docker build
...
Signed-off-by: Derek Hammer <derek.r.hammer@gmail.com>
2014-12-13 10:31:47 -08:00
a9bc84cece
Enforce passing string as version param in ctor
2014-11-26 23:14:19 +01:00
1a3f3c1304
Fixed integration test
2014-11-03 23:52:03 +01:00
ba7fab1709
Changed assertIn to assertTrue(... in ...) (2.6 support)
2014-11-03 20:49:44 +01:00
c4bb57286a
Merge branch 'filters' of github.com:irachex/docker-py into irachex-filters
...
Conflicts:
docker/utils/__init__.py
docker/utils/utils.py
tests/utils_test.py
2014-11-03 20:07:04 +01:00
213ca7d71d
Merge branch 'feature_logs-tail' of github.com:totem/docker-py into totem-feature_logs-tail
...
Conflicts:
docker/client.py
tests/fake_api.py
2014-10-30 15:07:58 +01:00
92d1c8e77c
Merge pull request #379 from tutumcloud/logs_tail
...
Added tail behaviour to logs command, same as CLI v1.3 (latest)
2014-10-30 14:57:12 +01:00
9b63cc548a
Merge pull request #324 from infoxchange/clear-unixconn-pool
...
Clear UNIX connections pool to avoid ResourceWarnings
2014-10-30 13:49:40 +01:00
1f4597e64f
Merge pull request #360 from proppy/kwargs-from-env
...
utils: add kwargs_from_env
2014-10-29 19:37:50 +01:00
37c8072f60
Merge branch 'pause-unpause' of github.com:phensley/docker-py into phensley-pause-unpause
...
Conflicts:
README.md
tests/integration_test.py
tests/test.py
2014-10-29 19:35:05 +01:00
74e7a67898
utils: add kwargs_from_env
2014-10-29 10:05:49 -07:00
75d8ff16e4
Merge branch 'support-devices' of github.com:dims/docker-py into dims-support-devices
...
Conflicts:
README.md
2014-10-29 17:23:42 +01:00
Aanand Prasad