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
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
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
7f7650a345
Merge pull request #17537 from mountkin/fix-logger-race
...
fix a race in json logger reader
Upstream-commit: ed6e3cf7043e7454e10e390bc1a33343e3615c5d
Component: engine
2015-10-30 23:00:17 -07:00
7e5c1a1c97
Merge pull request #17545 from LK4D4/writehs_encode
...
Use json.Encoder for container.writeHostConfig
Upstream-commit: f87082f08e6b91a33e251215040350faa0d78d71
Component: engine
2015-10-30 21:11:15 -04: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
81f43f078c
Merge pull request #17548 from mavenugo/ugr
...
Vendoring libnetwork to fix #17526 & #17527
Upstream-commit: 2e466bafda752c3f51adc6ad7e862d65f4c43deb
Component: engine
2015-10-30 17:13:40 -07:00
4811fae37b
Merge pull request #17529 from Microsoft/10662-builderisolation
...
Windows: [TP4] Allows --isolation on docker build
Upstream-commit: 09cb1f112134670561d33533ecee85aceedfb31c
Component: engine
2015-10-30 17:10:04 -07:00
8ea851aea2
Merge pull request #17547 from LK4D4/unn_stat
...
Remove unnecessary Stat check from readHostConfig
Upstream-commit: 6d8aff07ac18f0a2469bf5ce3e47ddb7d0539f60
Component: engine
2015-10-30 16:56:11 -07:00
bf96bafac5
Merge pull request #17549 from donhcd/fixPre122Stats
...
fix pre-1.21 docker stats
Upstream-commit: 9bf20c68474c7f982100d2529f61eecc1732f4c5
Component: engine
2015-10-30 16:45:41 -07: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
c715fd640d
fixing ungraceful daemon restart case where nw connect is not persisted
...
For graceful restart case it was done when the container was brought
down. But for ungraceful cases, the persistence is missing for nw
connect
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 401632c7568408ee9689adc1da855cfb1409e906
Component: engine
2015-10-30 16:24:02 -07:00
cc98d1ba33
Vendoring in libnetwork to fix an ungraceful restart case
...
Also picked up a minor typo fix
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 2361edbcea22113aea639a3d74edb35791fd8aef
Component: engine
2015-10-30 16:24:02 -07:00
85edd54e9f
Merge pull request #17538 from calavera/deprecated_bridge_interface
...
Fix network inspect for default networks.
Upstream-commit: 33f54297865984bba0a37cefb110af70cc0135b4
Component: engine
2015-10-30 16:03:51 -07:00
493276a67c
fix pre-1.22 docker stats
...
This fixes a bug introduced in #15786 :
* if a pre-v1.20 client requested docker stats, the daemon
would return both an API-compatible JSON blob *and* an API-incompatible JSON
blob: see https://gist.github.com/donhcd/338a5b3681cd6a071629
Signed-off-by: Donald Huang <don.hcd@gmail.com >
Upstream-commit: d2c04f844b8258d712da4b8feac25df7590b037c
Component: engine
2015-10-30 22:28:03 +00:00
7e8d2a05a2
Merge pull request #16779 from Microsoft/10662-execdrivercommand
...
Windows: Refactor execdriver.Command
Upstream-commit: 0c991f3d68227a57225552e0c5237a72e5177da2
Component: engine
2015-10-30 14:59:59 -07:00
2631995b0b
Remove unnecessary Stat check from readHostConfig
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 36a69bbc6050c5916f7267679ff7d61b5dfc5b8e
Component: engine
2015-10-30 14:54:09 -07:00
7823447431
Use json.Encoder for container.writeHostConfig
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: cf1a6c08fa03aa7020f8f5b414bb9349a9c8371a
Component: engine
2015-10-30 14:45:35 -07:00
ed2cf39b31
Merge pull request #17539 from cpuguy83/cleaner_ipc_unmount_handling
...
Force IPC mount to unmount on daemon shutdown/init
Upstream-commit: 23a0fe9627e6056826c7c3bf55cb0c1bfdde52bc
Component: engine
2015-10-30 14:40:42 -07:00
08c7b5a9fb
Merge pull request #17528 from LK4D4/todisk_encode
...
Use json.Encoder for container.toDisk
Upstream-commit: 85d7bbf7aab301026741693f034b799b01f58394
Component: engine
2015-10-30 14:36:42 -07:00
5d5868d289
Merge pull request #17531 from crosbymichael/no-set-reservation
...
Don't set mem soft limit if not specifiecd
Upstream-commit: 74362e8392bc60081c6083ab022ca5c6e6496134
Component: engine
2015-10-30 17:01:36 -04:00
