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
885e606af9
Merge pull request #17601 from moxiegirl/moving-project
...
Moving project to docker/opensource
Upstream-commit: c6fd886db3de7378615d09e749030a70a7c85b07
Component: engine
2015-11-02 12:44:41 +10: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
660c9c7223
Merge pull request #17590 from moxiegirl/fix-122-link
...
Update to hide the 1.10 material
Upstream-commit: e2a879bedd79ad929d8362aa8f9014f32b8cd02e
Component: engine
2015-11-01 17:06:44 +01: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
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
4f1bd73407
Merge pull request #17541 from aboch/uc
...
Modify IPAMConfig structure json tags
Upstream-commit: 8d7d51190d43ca61b5af855374044f51d6a9fa9d
Component: engine
2015-10-30 14:01:13 -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
80a227297f
Windows: Refactor execdriver.Command
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9d14866d7173e974b9eff34e251b16083647f056
Component: engine
2015-10-30 13:53:00 -07:00
4bf986fcb9
Modify IPAMConfig structure json tags
...
- So that it complies with docker convention for inspect
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: d795bc7d53db4b9e9194d0570d65e22d39f58384
Component: engine
2015-10-30 12:57:49 -07:00
aaae8eab38
Force IPC mount to unmount on daemon shutdown/init
...
Instead of using `MNT_DETACH` to unmount the container's mqueue/shm
mounts, force it... but only on daemon init and shutdown.
This makes sure that these IPC mounts are cleaned up even when the
daemon is killed.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 78bd17e805b7514505455b10f2fd90962505a3ff
Component: engine
2015-10-30 15:41:48 -04:00
fd1dd585d7
Merge pull request #17536 from aboch/uc
...
Modify Network structures json tags
Upstream-commit: a154b95d06869ab6d76059114a18b3e672e73603
Component: engine
2015-10-30 15:28:38 -04:00
3e20fd363b
fix a race in json logger reader
...
The json decoder starts to decode immediately an inotify event is
received.
But at the time the inotify event is trigged, the json log
entry might haven't been fully written to the disk.
In this case the decoder will return an "io.UnexpectedEOF" error, but
there is still data remaining in the decoder's buffer. And the data
should be passed to the decoder when the next inotify event is
triggered.
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: e41eae8b42052d07432405cca113ffcf8cf49c06
Component: engine
2015-10-31 02:28:23 +08:00
d8b5557338
Modify Network structure json tags
...
- So that they comply with docker inspect convention
Which is allowing camel case for json field names
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: b2d0b75018c5be5c671a15950546a79cda307cf2
Component: engine
2015-10-30 11:23:59 -07:00
884d36120f
Windows: Allows --isolation on docker build
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d5c85897f43b1956f874c6c93d10c30b5b82a726
Component: engine
2015-10-30 11:14:38 -07:00
03bd2aa8e5
Merge pull request #17530 from Microsoft/jjh/windowsmasterbuild
...
Build broken on master (awslogs)
Upstream-commit: 0aa3bff482bc5a1f330667fb1174dbae5490af34
Component: engine
2015-10-30 10:39:48 -07:00
d73613b841
Merge pull request #17514 from mavenugo/ugr
...
Fixing a case of dangling endpoint during ungraceful daemon restart
Upstream-commit: 17a8fbeaebf1991fa8d97adb3f217edbecd651ea
Component: engine
2015-10-30 13:38:27 -04:00
73a0603e8b
Don't set mem soft limit if not specifiecd
...
You cannot do this for individual cgroups for all the containers. Only
set the reservation if the user requested it. The error you will
receive is an EINTVAL when you try to set a large limit like we were in
the memory limit.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: ecb87ed0a5128a3d9ab3b0a620463b7b56e82bab
Component: engine
2015-10-30 10:34:01 -07:00
e7fcbd2f49
Merge pull request #17523 from Evalle/17326-fix-ubuntu-installation-instructions
...
Fix ubuntu installation instructions page
Upstream-commit: aa832d019725160481b90204c317dd50f13e16c4
Component: engine
2015-10-30 10:10:04 -07:00
7e19db1fbc
Merge pull request #17447 from ehaydenr/master
...
Update kill.md
Upstream-commit: f714118439394a8e2af8121bb3538e007549843b
Component: engine
2015-10-30 10:07:44 -07:00
