Commit Graph

2253 Commits

Author SHA1 Message Date
13125ff6b4 Merge pull request #17700 from calavera/remove_lxc
Remove LXC support.
Upstream-commit: 2519f465501657c24ecd13b8e53964b6c2f1a78d
Component: engine
2015-11-05 15:22:37 -08:00
f427a47755 Remove exec-driver global daemon option.
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 157b66ad390902ef6f5b51b3f76d5177eacac81b
Component: engine
2015-11-05 17:09:58 -05:00
ef88e7ace2 Remove LXC support.
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3b5fac462d21ca164b3778647420016315289034
Component: engine
2015-11-05 17:09:57 -05:00
50aae3f0be Merge pull request #17207 from azurezk/assert_docker_cli_help_test
update docker_cli_help_test.go
Upstream-commit: 22ef779db97362bbb8122933e32d87d92c7a0489
Component: engine
2015-11-05 15:15:52 +01:00
e3dc181362 Merge pull request #14012 from sallyom/exitCodes
Change 'docker run' exit codes to distinguish docker/contained errors
Upstream-commit: 236913f4e825d747b091e8eda07b48f8d62a41a9
Component: engine
2015-11-05 00:50:08 +01:00
63911eff34 Merge pull request #17673 from LK4D4/elim_str_comparison
Do not rely on string comparison in truncindex
Upstream-commit: 9c1006c8bf2efc71659ec3b5412ce987661decca
Component: engine
2015-11-04 15:39:19 -08:00
f66555fbae Change 'docker run' exit codes to distinguish docker/contained errors
The purpose of this PR is for users to distinguish Docker errors from
contained command errors.
This PR modifies 'docker run' exit codes to follow the chroot standard
for exit codes.
Exit status:
125 if 'docker run' itself fails
126 if contained command cannot be invoked
127 if contained command cannot be found
the exit status otherwise

Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 41de7a18d8f231568977e66bb58a6a02545d49d9
Component: engine
2015-11-04 15:18:50 -05:00
d016054c79 Merge pull request #17184 from cpuguy83/fix_external_volume_tests
Fix bug in volume driver test implementation
Upstream-commit: 37849ce1fbba7dd32110d78c0d7db0074afd67e9
Component: engine
2015-11-04 12:08:11 -08:00
b92bac632d Do not rely on string comparison in truncindex
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: d4a8d09d1a7ced5c711fcc7a939986d22a0554eb
Component: engine
2015-11-04 11:34:05 -08:00
a7c60eca63 Fix network settings inspect tests
Makes sure the containers are actually running when inspecting so the
ip info is actually populated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 3564895e84278311ecafaab923f5f753aba32aba
Component: engine
2015-11-03 12:12:19 -05:00
d2a6a4c389 update docker_cli_help_test.go
Signed-off-by: Kun Zhang <zkazure@gmail.com>
Upstream-commit: 8845259f49c8176cb0944e594dff5eda25646e2f
Component: engine
2015-11-03 18:24:47 +08:00
3e428b6f0a Merge pull request #17637 from aaronlehmann/network-test-name-typo
Fix typo in name of integration test TestInspectApiMultipeNetworks
Upstream-commit: c90125dc8aef413a21792804748754abb2785229
Component: engine
2015-11-02 20:42:36 -05:00
8b4073166b Fix typo in name of integration test TestInspectApiMultipeNetworks
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 701e5dfe8aa4d3d964e375911a334674c5e5480a
Component: engine
2015-11-02 17:30:16 -08:00
371255bc1d Merge pull request #17626 from mavenugo/ith
IT for ungraceful daemon restart with multiple host-mode containers
Upstream-commit: 65cbf37bf7cfb824d6b090c78fd1d3e48af9e8d2
Component: engine
2015-11-02 15:38:14 -08:00
e8b4f63208 Merge pull request #17557 from aaronlehmann/update-distribution
Vendor updated version of docker/distribution
Upstream-commit: 6964f4235035c5e94f6a0c35149783e910fed313
Component: engine
2015-11-02 14:37:04 -08:00
51f09a359c IT for ungraceful daemon restart with multiple host-mode containers
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: b323e3df8bcb52607e57d5f49dcb7a93edafa84a
Component: engine
2015-11-02 14:00:11 -08:00
bf1b372cbc Vendor updated version of docker/distribution
This updates the vendored docker/distribution to the current master
branch.

Note the following changes:

- The manifest package was split into manifest/schema1. Most references
  to the manifest package in the engine needed to be updated to use
  schema1 instead.

- Validation functions in api/v2 were replaced by the
  distribution/reference package. The engine code has been updated to
  use the reference package for validation where necessary. A future PR
  will change the engine to use the types defined in
  distribution/reference more comprehensively.

- The reference package explicitly allows double _ characters in
  repository names. registry_test.go was updated for this.

- TestPullFailsWithAlteredManifest was corrupting the manifest JSON, now
  that the schema1 package unmarshals the correct payload. The test is
  being changed to modify the JSON without affecting its length, which
  allows the pull to succeed to the point where digest validation
  happens.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 257c59251bd9a03aea4f3188a8160c54f37950ae
Component: engine
2015-11-02 12:40:18 -08:00
f62844e779 Merge pull request #17558 from aboch/nw
Fix bug in initializeNetwork()
Upstream-commit: beeec6d103cadb037ccd5f9bc4c6647ae74a6b45
Component: engine
2015-11-02 12:15:41 -08:00
0094681e85 Merge pull request #17598 from zelahi/16756-dockercli-createtest
Added c.Assert statements to docker_api_create_test.go
Upstream-commit: 920ab75bd5969fc4d387c530043115974fae8c79
Component: engine
2015-11-02 11:43:20 -08:00
e2a063d0d8 Fix bug in initializeNetwork()
- On `docker run --net <network id> ...`
  the bug would cause the container to attempt
  to connect to the network two times
- Also made sure endpoint creation rollback will
  be executed on failures in `func (container *Container) connectToNetwork()`

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 45e71a79840887b7974387bedba0544015ab4e3b
Component: engine
2015-11-02 11:20:15 -08:00
ed19776156 Merge pull request #17542 from estesp/restart-root-dir-cleanup
Fix integration-cli daemon restart with user namespaces enabled
Upstream-commit: 6563b7d2e8a5c1ebef978e2ad8a1f7971b385abc
Component: engine
2015-11-02 09:50:12 -08:00
6bc6afa199 Added c.Assert statements to docker_api_create_test.go
removed the if/else statements and added c.Assert statements for docker_api_create_test.go.

Removed check.commentf in c.Assert statements

Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
Upstream-commit: 6694326d5d23ab866d1fccf1f9cbcedfd8a31e85
Component: engine
2015-11-01 19:54:19 -08:00
c0bdea2939 Merge pull request #16903 from cxxly/16756-refactor-docker_cli_netmode_test
refactor docker_cli_netmode_test .go with Assert statement
Upstream-commit: 29c9717cac9d8da8c6327d742deb514fc7ab152b
Component: engine
2015-11-01 11:07:54 +01:00
eb4a438be7 Fix integration-cli daemon restart with user namespaces enabled
The `d.root` dir is resolved to the full path to the graph dir after the
daemon starts, but on restart, should be set back to the parent (without
the "<uid>.<gid>" ending) so that it uses/resolves to the same graphdir
on restart.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 0c57b9f5b3cb72df47578a3f0e505db2bec5ccf1
Component: engine
2015-10-31 14:39:33 -04:00
1dd04a954b Merge pull request #16579 from coolljt0725/fix_attach_paused_container
Add show error when attach to a paused container
Upstream-commit: 5719d010665377c0696e36b894e742399deb30ed
Component: engine
2015-10-31 07:43:22 -07:00
8aced90277 Merge pull request #17524 from mountkin/fix-teardown
dont try to remove builtin networks in teardown
Upstream-commit: cccb6bce7d76672a41e683d19063a4c12a0ced08
Component: engine
2015-10-30 20:59:57 -04:00
30dea50165 IT for daemon restarts when container connected to multiple networks
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: e16e794805ec1e578951f271af7993d9619a4ede
Component: engine
2015-10-30 16:25:25 -07:00
057d34fa0f Fix network inspect for default networks.
- Keep old fields in NetworkSetting to respect the deprecation policy.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f301c5765a0d7f4b6866cedfdface6f87874ff53
Component: engine
2015-10-30 16:55:21 -04:00
1384f6d7a7 Merge pull request #17518 from WeiZhang555/integration-test-bug
bug fix for test cases
Upstream-commit: 05534b6f8007e1f614cccdf9467e07a8cc38ae3d
Component: engine
2015-10-30 16:56:35 +01:00
57ba704963 dont try to remove builtin networks in teardown
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 5970e94072b922b4c5e4ef12fb1b11391ba36d6b
Component: engine
2015-10-30 23:05:33 +08:00
0adc841955 Merge pull request #17385 from aditirajagopal/16756-upgrade_commit_test
Checkers on integration-cli/docker_cli_commit_test
Upstream-commit: 2c6351a4a51d1090658c55b33fbbec28c635c97b
Component: engine
2015-10-30 10:36:41 -04:00
f0f0d423c9 Merge pull request #17427 from zelahi/16756-dockercli-killtest
modified docker_cli_kill_test.go to use c.Asserts 
Upstream-commit: 0598ff46ac0d4e485ff8109f9d287990d5d54256
Component: engine
2015-10-30 12:56:52 +01:00
3b3b529e21 Merge pull request #17425 from wenchma/16756-docker_cli_attach_unix_test
Using checkers assert for integration-cli/docker_cli_attach_unix_test.go
Upstream-commit: 77488b90c5dbc4d3e5237aa856fdd042ff8d9f42
Component: engine
2015-10-30 12:41:14 +01:00
f93a5200e3 bug fix for test cases
Fix bug that `isNwPresent` can't distinguish network names with same
prefix.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 8f53edae3bd628e00f052182a3a5e84ee578f018
Component: engine
2015-10-30 15:13:35 +08:00
82ce818530 Checkers on integration-cli/docker_cli_commit_test
Applying #16756 to integration-cli/docker_cli_commit_test.go

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Upstream-commit: 483abbb313a35696a9c1b7ff72407b0a0118a22b
Component: engine
2015-10-29 21:47:54 -05:00
d7b7b49b51 Merge pull request #17499 from jfrazelle/fix-lxc-tests
lxc does not support exec
Upstream-commit: 2eaa25d3554dbe9f6d5c4f66a97c8eb83a463880
Component: engine
2015-10-29 15:08:13 -07:00
f8757c11b0 Merge pull request #17490 from aboch/pm
Libnetwork vendoring & overlay networking fixes
Upstream-commit: 7f7950aa187e551bdc4d6128523207c2b8343250
Component: engine
2015-10-29 13:45:19 -07:00
27424c56e7 Merge pull request #17460 from dmcgowan/fix-rmi-force-tag
Fix rmi -f removing multiple tags
Upstream-commit: cdfd9846f480b54dc6207b578c29ecfe2cdeed34
Component: engine
2015-10-29 13:01:06 -07:00
6cae6d09ea lxc does not support exec
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: aaa134ea0e12781c7e1f19562544826274263a4b
Component: engine
2015-10-29 11:51:59 -07:00
a94cd37485 Execute buildPortMapInfo after Endpoint.Join()
- As the retrieved info may not be available at
  Endpoint creation time for certain network drivers
- Also retrieve the MAC address from Endpoint.Info().Iface()

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: e03daebb48221bae84bfc48b0f9b652ced6d93f3
Component: engine
2015-10-29 11:47:30 -07:00
09de1db703 Merge pull request #17488 from jfrazelle/skip-windows-test
cant run volume on windows w remote daemon host
Upstream-commit: 8d62f243c725c6eba43ca59ef17407e43004a238
Component: engine
2015-10-29 13:37:39 -04:00
7fc5a670bb cant run volume on windows
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 1a6a860c143487b96b8a6221768a73ed4cef6d7b
Component: engine
2015-10-29 08:55:48 -07:00
c41fca36c1 Using checkers assert for integration-cli/docker_cli_attach_unix_test.go
Fixes part of #16756

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: f4abc6406e5837cee33763b6784b89578045d4db
Component: engine
2015-10-29 21:38:00 +08:00
58647231c1 fix experimental tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 44da86172aeb750d0ac46c000e32e51a12411ecd
Component: engine
2015-10-28 21:14:45 -07:00
8ca5c39620 Add show error when attach to a paused container
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: de1d611990a80cf4a38ec501469c08c1aeee2d60
Component: engine
2015-10-28 21:00:09 -04:00
4cf9c8be78 Fix rmi -f removing multiple tags
When an image has multiple tags and rmi is called with force on a tag, only the single tag should be removed.
The current behavior is broken and removes all tags and the image.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 48e7f7963e142a0a45b583c5e65015d896c59433
Component: engine
2015-10-28 16:07:02 -07:00
870fa4ea2c modified docker_cli_kill_test.go to use c.Asserts
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
Upstream-commit: d0762a60e01339235917007fd48722ce5390ed71
Component: engine
2015-10-27 21:18:26 -07:00
238006044d Merge pull request #17423 from cpuguy83/so_sensitive
Revert "dockerversion placeholder for library-import"
Upstream-commit: b227d19cae34d6d0ce92b72a53f02330b0be5992
Component: engine
2015-10-27 18:32:18 -07:00
cc55863497 Revert "dockerversion placeholder for library-import"
This reverts commit d5cd032a86617249eadd7142227c5355ba9164b4.

Commit caused issues on systems with case-insensitive filesystems.
Revert for now

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b78ca243d9fc25d81c1b50008ee69f3e71e940f6
Component: engine
2015-10-27 21:23:53 -04:00
fbb5f4e19f Merge pull request #17393 from tiborvass/carry-17360
Carry Fix docker inspect container only reports last assigned information
Upstream-commit: 9ab71b68af5b340373411e26e679c6e7506ce167
Component: engine
2015-10-27 17:00:41 -07:00