71e9a8abba
Merge pull request #17634 from stevvooe/avoid-panic-on-flush
...
Avoid panic on write after close in http
Upstream-commit: 3c695d7ed73e9992fba51a9d4bfa745763230c79
Component: engine
2015-11-02 21:11:52 -08:00
c45875750d
Avoid panic on write after close in http
...
By adding a (*WriteFlusher).Close, we limit the Write calls to possibly
deallocated http response buffers to the lifetime of an http request.
Typically, this is seen as a very confusing panic, the cause is usually a
situation where an http.ResponseWriter is held after request completion. We
avoid the panic by disallowing further writes to the response writer after the
request is completed.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: ec2289b2d9ac79fd5e0f69f56f023dfe8ee78bf8
Component: engine
2015-11-02 18:14:43 -08:00
78d86a019c
Merge pull request #17633 from tiborvass/skip-loadimage-error-onrestore
...
Do not stop daemon from booting if io.EOF on loading image
Upstream-commit: 4eac6d4529961e0937a9e1478dd70bdc90e78260
Component: engine
2015-11-02 21:10:27 -05:00
d352f036c3
Do not stop daemon from booting if io.EOF on loading image
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 27c23685993ba4252d2d0f8f7ffa6455fb6235c5
Component: engine
2015-11-02 21:07:28 -05: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
915d3a3c5d
Merge pull request #17635 from MHBauer/volume-backend
...
create generic backend to cut dependency on daemon
Upstream-commit: c6c7d5870c8fcc9c569455e6fe340c5db070a4a5
Component: engine
2015-11-02 20:31:46 -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
114ad6dae4
create generic backend to cut dependency on daemon
...
- create a volume-specific interface that for the methods of daemon
that are used
- remove dependency on daemon package by volume package of server
- like 5087977fc1a4279be55f25e0b8782c9cf9bc65f3
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 836df9c4469db89ba2fecfe512ce67003a61cc1e
Component: engine
2015-11-02 16:29:16 -08:00
2f6185bd11
Merge pull request #17628 from LK4D4/umount_log_err
...
Log error from unmountVolumes on cleanup
Upstream-commit: 79d47c5b96c18c4497c0669c343fa05517ea3caa
Component: engine
2015-11-02 15:38:32 -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
f577142608
Merge pull request #17517 from MHBauer/network-impl
...
create generic backend to cut dependency on daemon
Upstream-commit: 6d5e47a690fe6da233bf4b76a84a728024e3794f
Component: engine
2015-11-02 17:54:28 -05: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
8be7ad093d
Merge pull request #17573 from Microsoft/10662-parsersos
...
Windows: Fix unit tests parsers\os
Upstream-commit: 642a1f67b6ec449110c52e3b57f968c868e91950
Component: engine
2015-11-02 14:31:09 -08:00
9400b9a7bc
Merge pull request #17554 from calavera/warm_ipc_unmounts
...
Turn IPC unmount errors into warnings.
Upstream-commit: 944ea3134d6fd68ff33f9bdd2f5b87d458824079
Component: engine
2015-11-02 14:25:39 -08:00
74bc9966e0
Log error from unmountVolumes on cleanup
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a20fea1823ccfb40d235607e8f7ce7ceff1b5afe
Component: engine
2015-11-02 14:11:42 -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
51dda01ea0
create generic backend to cut dependency on daemon
...
- create a network-specific interface that for the methods of daemon
that are used
- remove dependency on daemon package
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 5087977fc1a4279be55f25e0b8782c9cf9bc65f3
Component: engine
2015-11-02 12:30:10 -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
88f746d118
Merge pull request #17619 from jfrazelle/canonical-update
...
rebased canonical/json off go 1.5.1
Upstream-commit: b95048758a06097469901590e68f40bafb5d1762
Component: engine
2015-11-02 11:42:26 -08:00
dd117ef001
Merge pull request #17620 from vdemeester/unit-test-TESTDIRS
...
Bring TESTDIRS back for unit-tests
Upstream-commit: f962c0715f153b806742cefaa6e9c9adf4e25273
Component: engine
2015-11-02 11:41:19 -08:00
761f97e89e
Windows: Fix unit tests parsers\os
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a40c82804038fdc8b7051aa0b4ba27974c895e36
Component: engine
2015-11-02 11:28:47 -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
f826a1404e
Merge pull request #17594 from mrjana/restart
...
Fix race with host networking causing `invalid argument` errors
Upstream-commit: 6c31a9a50d032f7276c63e23de452eb2cd07335b
Component: engine
2015-11-02 13:46:43 -05:00
b9cfc706d4
Add TESTDIRS back
...
Makes it simpler to test only one package.
Was removed by #17491 .
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4a54ab387f4b11310476414f575fb2502970b65d
Component: engine
2015-11-02 19:44:09 +01:00
9601e97681
rebased canonical/json off go 1.5.1
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 0d881349e88b55a3ea4e15eef1c464b2ca64a441
Component: engine
2015-11-02 10:23:02 -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
4fcd43d6fd
Merge pull request #17605 from runcom/enhance-err-msg
...
graph: enhance err message on failed image restore
Upstream-commit: ca1e2d5782b90b98a4659de77d849014fe2abcc1
Component: engine
2015-11-02 08:49:43 -08:00
106476f022
Vendoring libnetwork
...
Vendoring libnetwork @ 05a5a1510f85977f374a9b9804a116391bab5089
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 10e1b9f02ee633349bc45631dac18cb4cc5baa61
Component: engine
2015-11-02 08:33:52 -08:00
f76efaa2b3
Fix error formatting
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: b087846c0e087fac24681148997582d4eb890fba
Component: engine
2015-11-02 06:51:48 -08:00
94d10a7d35
Merge pull request #17602 from HuKeping/update-history
...
Update logic of history
Upstream-commit: 38d3fc00d3e3f8f8eb87558b0a2f688711125fd3
Component: engine
2015-11-02 13:55:32 +01:00
6d6f3141f1
graph: enhance err message on failed image restore
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: f5fc832b6e786bbcd7dfe98b1ec04b8b8d1935ae
Component: engine
2015-11-02 10:10:23 +01: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
38f4e52734
Moving project to docker/opensource
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: e400125b662e6ea8605e05772ed79ea2781f6d17
Component: engine
2015-11-01 18:39:10 -08:00
4351cce524
Update logic of history
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 5a3236d9e8ee8c0051c0cc758ec359fa089b3291
Component: engine
2015-11-02 10:27:54 +08:00
1714a2463b
Merge pull request #17591 from moxiegirl/remove-old-api
...
Remove old api docs that are no-longer appearing on docs-docker.com
Upstream-commit: e2e2ea401a6e1095064bd8f5731f012cee45797b
Component: engine
2015-11-01 12:30:58 -08:00
4557b0f1c0
Merge pull request #17572 from Microsoft/10662-parserskernel
...
Windows: Fix parsers kernel test
Upstream-commit: 1340d456adf246a6a3482587a24913ade5a635db
Component: engine
2015-11-01 10:37:22 -08:00
136be8ed66
Remove old api docs that are no-longer appearing on docs-docker.com
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: d2382f7b96a58f141a83928f53930e9d946d6d04
Component: engine
2015-11-01 08:22:10 -08:00
7e41e50c2b
Update to hide the 1.10 material
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: e4d86c2c38f4c99660da8ed65a8103e283e07e23
Component: engine
2015-11-01 08:03:08 -08:00
d73f8909a2
Merge pull request #17583 from moxiegirl/link-fixes
...
Fixing broken links
Upstream-commit: d4bf773d2722713fd1b8ee5f15284c05ea306acd
Component: engine
2015-11-01 16:44:15 +01:00
fb773f89ff
Windows: Fix parsers kernel test
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 670fd201dea0396d90127a30d96bb25ae757026f
Component: engine
2015-11-01 07:05:16 -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
f3f473fc03
Fixing broken links
...
Fixing the weight
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 5ce093e94565a5f32df9adf78dcdb6deeda75f79
Component: engine
2015-10-31 19:45:56 -07: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
6675fcdd7e
Merge pull request #17567 from Microsoft/10662-lxcunittest
...
Windows: Fix go test in execdriver\lxc
Upstream-commit: 4468e1e74e225f38b251fbcfdce633b619ea2e7a
Component: engine
2015-10-31 09:40:19 -07:00
08bc723a70
Merge pull request #17568 from Microsoft/10662-journald
...
Windows: Fix journald compile error
Upstream-commit: 8d584da96e71691d2d70c493818c2b056f7553c5
Component: engine
2015-10-31 09:35:39 -07:00
bb88c5713c
Windows: Fix journald compile error
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5452954d89160985d4d896f4241f1838b4114413
Component: engine
2015-10-31 08:31:25 -07:00
6cb48beaf2
Windows: Fix go test in execdriver\lxc
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 30ab497e174cdf788b8e7864c2e2e4019a119978
Component: engine
2015-10-31 08:25:36 -07: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
