Commit Graph

1300 Commits

Author SHA1 Message Date
Joffrey F 46eb23b4f3 Basic volume API implementation.
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-15 20:01:55 +02:00
Joffrey F bd6a79fe46 Merge pull request #768 from ColinHuang/master
Remove not exists file in MANIFEST.in
2015-09-15 10:30:52 -07:00
Colin Huang 1306a4c282 Remove not exists file in MANIFEST.in
Signed-off-by: Colin Huang <sidawei@gmail.com>
2015-09-15 10:13:47 +08:00
Joffrey F 1b798a2901 GroupAdd tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-15 01:58:06 +02:00
Joffrey F ee7292a463 Merge pull request #767 from docker/group_add_support
Support group_add param in host config
2015-09-14 16:47:39 -07:00
Joffrey F 0610efbce0 Support group_add param in host config
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-15 01:11:11 +02:00
Maxime Petazzoni e5fbc42dcb Merge pull request #763 from docker/api_splitup
API splitup
2015-09-13 08:47:07 -07:00
Joffrey F 7a6980d479 Move client internals back to Client class. Remove obsolete ClientBase class
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-11 16:19:29 -07:00
Joffrey F 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
Joffrey F a2daf35cf6 Back to dev version 2015-09-10 15:58:52 -07:00
Joffrey F 08a4bcd8dc Merge pull request #762 from docker/1.4.0-release
1.4.0 release
2015-09-10 15:08:34 -07:00
Joffrey F 7e3cdfb3b1 Fixed regression test in py3 environments
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-10 11:37:51 -07:00
Joffrey F 9372ef27f8 Updated changelog
Bumped version to 1.4.0

Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-10 11:07:35 -07:00
Joffrey F 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
Joffrey F 03f54f44e5 Merge pull request #760 from docker/ci-fixes
CI fixes (wip)
2015-09-09 17:35:06 -07:00
Joffrey F 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
Joffrey F 1fb2db4951 Make integration tests more CI-friendly.
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-09 17:06:34 -07:00
Joffrey F cfbc967c84 Merge pull request #757 from docker/756-containerized-integration
Containerized Integration
2015-09-09 14:54:19 -07:00
Joffrey F fa3082b6cd Update integration-dind task 2015-09-09 14:49:58 -07:00
Joffrey F abaf346b49 Make running integration tests with dind possible 2015-09-09 14:49:36 -07:00
Joffrey F 0ef8c0459d Add missing ipc_mode documentation 2015-09-09 10:47:51 -07:00
Joffrey F 2dfab76224 Merge pull request #755 from aanand/add-dnephin-and-mnowster
Add @dnephin and @mnowster as maintainers
2015-09-02 18:01:15 -07:00
Aanand Prasad fb3e5bb276 Add @dnephin and @mnowster as maintainers
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-02 17:32:41 -07:00
Joffrey F 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
Aanand Prasad 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
Joffrey F 1e916a1e83 Test UID validity 2015-08-31 18:35:32 -07:00
Joffrey F add9786955 Use six.text_type 2015-08-31 18:30:13 -07:00
Joffrey F c485bd8dc0 Merge pull request #752 from docker/697-stricter-url-construction
Stricter url construction
2015-08-31 18:24:42 -07:00
Joffrey F 09defa66ba Always send a string for the user param in create_container 2015-08-31 16:06:52 -07:00
Joffrey F 3d884f9a3c Test URL construction 2015-08-31 15:01:40 -07:00
Joffrey F 0f3d7673f3 url-quote user-provided param before inserting in URL. 2015-08-31 14:47:13 -07:00
Joffrey F 33acb9d2e0 Test has been fixed, remove skip decorator 2015-08-31 13:13:46 -07:00
Joffrey F ad608baaaf Merge pull request #747 from aanand/integration-test-fixes
Integration test improvements
2015-08-31 13:07:02 -07:00
Aanand Prasad 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
Joffrey F 9b37120167 Merge pull request #742 from aanand/fix-dockerignore-integration-test
Fix .dockerignore integration test
2015-08-27 11:01:47 -07:00
Joffrey F 63df0b9ab3 Merge branch 'master' of github.com:docker/docker-py 2015-08-26 17:02:55 -07:00
Joffrey F 0282e120ea Merge branch 'aanand-default-cert-path' 2015-08-26 17:02:39 -07:00
Joffrey F e8af8b376d Use cross-platform home directory path 2015-08-26 17:02:24 -07:00
Joffrey F 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
Joffrey F db1a93fd27 Merge pull request #662 from stevenewey/exec_create_user
Exec create user
2015-08-26 15:36:47 -07:00
Joffrey F ddf879cc4c Merge pull request #721 from aanand/pathspec
Better support for .dockerignore
2015-08-26 14:25:09 -07:00
Joffrey F 40a7f37b9d Merge branch 'mnowster-remove-driver-types' 2015-08-26 11:51:30 -07:00
Joffrey F e7a9ae097c Don't remove LogConfig.types shortcut 2015-08-26 11:51:08 -07:00
Aanand Prasad 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
Mazz Mosley 9937a31a88 Test valid no args for log config
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-08-26 16:10:28 +01:00
Aanand Prasad 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
Mazz Mosley 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
Mazz Mosley 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
Joffrey F d60cb3172e Merge branch 'aanand-pytest' 2015-08-25 16:58:16 -07:00
Joffrey F b5f1e64e8f Ensure Makefile still run tests properly / tests are run in container as expected 2015-08-25 16:58:01 -07:00