Commit Graph

2028 Commits

Author SHA1 Message Date
Joffrey F c2d114c067 Move LinksTest to appropriate file
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-09 16:12:22 -08:00
Joffrey F 12f1a6957e Merge pull request #1501 from max8899/fix/split_port
fix: Missing exception handling in split_port when no container port
2017-03-09 16:11:53 -08:00
Lei Gong eba20084f6 fix: Missing exception handling in split_port when no container port
"localhost:host_port:" case will raise TypeError exception directly

Catch the "TypeError" and give proper error message

* docker/utils/ports.py

Signed-off-by: Lei Gong <xue177125184@gmail.com>
2017-03-09 16:28:34 +08:00
Joffrey F fa52824363 Merge pull request #1481 from shin-/system_df
Add df method
2017-03-06 11:08:41 -08:00
Joffrey F 11873993eb Merge pull request #1480 from shin-/bump-default-api-version
Bump default API version to 1.26
2017-03-06 11:08:16 -08:00
Joffrey F 830b9edce8 Merge branch 'tmad-container-init' 2017-03-01 14:02:50 -08:00
Joffrey F c0c3cb4497 Docstring fixes for init and init_path
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-01 14:02:35 -08:00
Tomasz Madycki 8c6534d7be Add init_path parameter to container HostConfig
Signed-off-by: Tomasz Madycki <tomasz.madycki@gmail.com>
2017-03-01 14:02:35 -08:00
Tomasz Madycki 13b5f785a7 Add init parameter to container HostConfig
Signed-off-by: Tomasz Madycki <tomasz.madycki@gmail.com>
2017-03-01 14:02:35 -08:00
Joffrey F d59b6b99cc Merge pull request #1479 from shin-/plugin-upgrade
Add upgrade_plugin method
2017-03-01 13:52:46 -08:00
Joffrey F 4273d3f63d Bump default API version to 1.26
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-01 13:52:07 -08:00
Joffrey F cfb14fa78f Add df method
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-01 13:51:39 -08:00
Joffrey F 4a08d04aef Merge pull request #1490 from ripcurld0/change_rm_error_msg
Update assert in test_create_with_restart_policy
2017-03-01 11:54:13 -08:00
Boaz Shuster 5dced6579a Update assert in test_create_with_restart_policy
In https://github.com/docker/docker/pull/30870 a new
error message is displayed if the container is restarting.

To make "test_create_with_restart_policy" pass against the
above change, the test checks that the error message contains
"You cannot remove " instead of
"You cannot remove a running container"

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-03-01 15:36:32 +02:00
Joffrey F c35a6283a0 Merge pull request #1484 from BenDoan/master
removed unused/typoed param from models.containers.list docstring
2017-02-27 13:01:15 -08:00
Ben Doan 820af34940
removed unused/typoed param from models.containers.list docstring
Signed-off-by: Ben Doan <ben@bendoan.me>
2017-02-26 18:41:13 -06:00
Joffrey F 5268a31116 Add Plugin.upgrade to documentation
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-23 18:15:40 -08:00
Joffrey F 48ac772994 Add upgrade_plugin method
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-23 17:27:04 -08:00
Joffrey F f387ae46d7 Merge pull request #1467 from crierr/master
Allow port range like 8000-8010:80
2017-02-22 15:27:42 -08:00
Joffrey F f9f77c4c2f Merge pull request #1473 from Anvil/event-http-headers
Allow events daemon command to read config.json
2017-02-21 12:11:58 -08:00
Joffrey F ae8c716376 Merge pull request #1466 from nkrabshuis/master
Add ability to set 'Hostname' on a Service.
2017-02-21 12:11:39 -08:00
Damien Nadé f36ef399ad Fixed events command related unit tests by passing a timeout value
Signed-off-by: Damien Nadé <github@livna.org>
2017-02-21 18:21:10 +01:00
Damien Nadé b587139d3c Allow events daemon command to read config.json
Signed-off-by: Damien Nadé <github@livna.org>
2017-02-21 17:53:02 +01:00
SeungJin Oh 60e7fd93a8 passing flake8 test
Signed-off-by: SeungJin Oh <crierr@naver.com>
2017-02-20 09:35:07 +09:00
SeungJin Oh 8e47f29720 check NoneType before using
Signed-off-by: SeungJin Oh <crierr@naver.com>
2017-02-20 09:32:36 +09:00
crierr cfc11515bc Allow port range like 8000-8010:80
Signed-off-by: SeungJin Oh <crierr@naver.com>
2017-02-20 02:09:33 +09:00
Nils Krabshuis 9ec31ffa27 Flake8: Fix indent.
Signed-off-by: Nils Krabshuis <nils.krabshuis@redwood.com>
2017-02-19 06:26:16 +01:00
Nils Krabshuis 44c31e47e0 Add ability to set 'Hostname' on a Service.
Signed-off-by: Nils Krabshuis <nils.krabshuis@redwood.com>
2017-02-19 06:18:26 +01:00
Joffrey F b791aa10fa Bump dev version
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-16 16:54:45 -08:00
Joffrey F a90e3e442c Bump version 2.1.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-16 16:54:12 -08:00
Joffrey F 1042b06e50 Add missing secrets doc
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-16 16:53:19 -08:00
Joffrey F e0b6cdfcf6 Merge pull request #1460 from shin-/fix-cache-from
Rename cachefrom -> cache_from
2017-02-16 13:35:58 -08:00
Joffrey F 14caaad657 Merge pull request #1461 from shin-/fix-storage-opt-test
Add xfail mark to storageopt test
2017-02-16 13:35:33 -08:00
Joffrey F 0a97df1abc Rename cachefrom -> cache_from
Fix cache_from integration test
Fix image ID detection in ImageCollection.build

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-15 19:13:24 -08:00
Joffrey F 3a9c83509c Add xfail mark to storageopt test
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-15 19:02:31 -08:00
Joffrey F 4a50784ad4 Merge pull request #1459 from shin-/1300-storageopts
Add support for storage_opt in host_config
2017-02-15 18:12:31 -08:00
Joffrey F afcbeb5e4f Merge pull request #1449 from shin-/secrets-api
Implement secrets API
2017-02-15 18:08:25 -08:00
Joffrey F 469b12a3c5 Merge pull request #1455 from shin-/1117-dockerignore-globstar
Add support for recursive wildcard pattern in .dockerignore
2017-02-15 18:08:09 -08:00
Joffrey F ece3b19782 Add support for storage_opt in host_config
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-15 17:43:24 -08:00
Joffrey F 20c6fe31e0 Add support for recursive wildcard pattern in .dockerignore
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-14 18:29:37 -08:00
Joffrey F e8a86e40cc Add tests for secret API implementation
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-13 17:06:25 -08:00
Joffrey F d1038c422b Add support for secrets in ContainerSpec
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-13 17:05:58 -08:00
Joffrey F 52bae3ca2c Implement secrets API
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-13 17:05:58 -08:00
Joffrey F 35f37a0936 Merge pull request #1432 from shin-/plugins
Plugins API
2017-02-13 13:20:53 -08:00
Joffrey F 2255847b22 Merge pull request #1447 from shin-/update_jenkinsfile
Bump test engine version
2017-02-13 13:19:49 -08:00
Joffrey F e1ad3186ef Add create_plugin implementation
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-09 17:58:05 -08:00
Joffrey F 9ac3666c27 Bump test engine version
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-08 18:08:12 -08:00
Joffrey F 6114024aa3 Merge pull request #1439 from bfirsh/fix-various-volume-bugs
Fix various volume bugs
2017-02-07 17:15:25 -08:00
Ben Firshman f83993de0a
Fix passing volumes to run with no host path
Technically we shouldn't be passing them as binds, but the daemon
doesn't seem to mind.

Fixes #1380

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2017-02-07 19:22:36 +01:00
Ben Firshman 956fe1cac1
Fix volume path passed by run to create_container
Seems like this is pretty much ignored by Docker, so it wasn't
causing any visible issues, except when a volume name was used
instead of a path.

Also, added integration tests.

Ref #1380

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2017-02-07 19:22:35 +01:00