d177b20750
Merge pull request #13493 from jlhawn/volume_unmount_fix
...
Fix container unmount networkMounts
Upstream-commit: 2029257e3cfd524b5fec0288eef039f182e460f7
Component: engine
2015-05-27 08:44:11 -07:00
49dc08b2f2
Fix unregister stats on when rm running container
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b3e8ab3021d2021202e14b912e7fdbfede4c7c20
Component: engine
2015-05-26 22:22:03 -04:00
aee141571b
Fix container unmount networkMounts
...
UnmountVolumes used to also unmount 'specialMounts' but it no longer does after
a recent refactor of volumes. This patch corrects this behavior to include
unmounting of `networkMounts` which replaces `specialMounts` (now dead code).
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 04f99a6ca8232e43169b9a0706e435c551c798a3
Component: engine
2015-05-26 17:38:26 -07:00
d9b5b5714d
Merge pull request #13491 from jfrazelle/revert-exec-privileged
...
Revert "Add docker exec run a command in privileged mode"
Upstream-commit: b50e7809254c1d3cc9bd2b94be0c87b68576ed2a
Component: engine
2015-05-26 16:41:50 -07:00
46ea5fe0ee
Merge pull request #13487 from calavera/volume_load_regression_test
...
Add regression test to make sure we can load old containers with volumes.
Upstream-commit: 838e1a89472bac5c8307431de477d511dc78b95b
Component: engine
2015-05-26 19:40:08 -04:00
dc2caf8054
Merge pull request #13444 from runcom/fix-race-stats
...
Fix race in stats cli and native driver
Upstream-commit: 0d445685b8d628a938790e50517f3fb949b300e0
Component: engine
2015-05-26 15:34:50 -07:00
ef63a3dd48
Add regression test to make sure we can load old containers with volumes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ea0e15ba6244a539db646d947aaf9cafe88603f6
Component: engine
2015-05-26 15:28:58 -07:00
cd81890817
Merge pull request #13492 from calavera/donot_force_syscall_unmount_on_cleanup
...
Do not force `syscall.Unmount` on container cleanup.
Upstream-commit: bd18d8625090c62605fa34fb8ccf703c6f59ec9e
Component: engine
2015-05-26 15:23:16 -07:00
f26677f4cf
Do not force syscall.Unmount on container cleanup.
...
This is not necessary and it's a regression from the old behavior.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: f78dce152c3c67bf262648028ff7932ca461b6fd
Component: engine
2015-05-26 14:28:26 -07:00
96fc5c8d8e
Merge pull request #13489 from cpuguy83/cleanup_rm_funcs
...
Cleanup container rm funcs
Upstream-commit: de318d8c1d980066db8e94825d0529698095536c
Component: engine
2015-05-26 14:24:02 -07:00
d89704cf56
Revert "Add docker exec run a command in privileged mode"
...
This reverts commit 72a500e9e5929b038816d8bd18d462a19e571c99.
Signed-off-by: Jessica Frazelle <princess@docker.com >
Conflicts:
daemon/execdriver/native/exec.go
integration-cli/docker_cli_exec_test.go
runconfig/exec.go
Upstream-commit: 40b71adee390e9c06471b89ed845132b4ec80177
Component: engine
2015-05-26 14:12:16 -07:00
5066df6b7c
Merge pull request #13440 from LK4D4/fix_bridge_none
...
Fix network with -b none
Upstream-commit: 47e727d1fcef00c270851ecc3e5efa7d7b65240d
Component: engine
2015-05-26 14:08:21 -07:00
2b42c2c199
Cleanup container rm funcs
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f8628ba89104385071e811d0b21293d7cd2e8e01
Component: engine
2015-05-26 15:38:52 -04:00
7991258f62
Merge pull request #13479 from Microsoft/10662-fixcontaineragain
...
Windows: Fix up container again
Upstream-commit: fc679bebb9546a10c0f0a5b134f63cd58cd38b26
Component: engine
2015-05-26 10:49:48 -07:00
aff149351d
Windows: Fix volume_windows compile
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1dc0499b64179e18b902e34d5c97ff72327d9d59
Component: engine
2015-05-26 09:43:21 -07:00
a749f0fc90
Windows: Fix up container again
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5d207de5092f4532a1696939fdb64a85d370fb01
Component: engine
2015-05-26 09:33:55 -07:00
e0098fdbb0
Add lock before accessing native driver active containers
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 9e425d56d0ec7d3343dd309500a7fe6e36648f2b
Component: engine
2015-05-26 13:55:02 +02:00
722bcfc109
Fix race in stats cli and native driver
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 77280a87b70d3b2b629cd30ea93464287f346fa1
Component: engine
2015-05-26 13:55:02 +02:00
c2098b0ab5
Preinitialize MountPoints to avoid assigning to a nil map
...
Fixes #13435
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: 59214a0737560a8a2386884dc438b4b003d407ba
Component: engine
2015-05-25 19:37:57 -07:00
7623ba5e39
Fix network with -b none
...
* Don't AllocateNetwork when network is disabled
* Don't createNetwork in execdriver when network is disabled
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 3cb14df68c1a59981907fec3bccab80a1d0dda59
Component: engine
2015-05-24 08:26:59 -07:00
710f67f354
Merge pull request #13424 from mavenugo/vendorin
...
Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
Upstream-commit: f83073d3eb23a3f3c22bef9401090df5da53cc2f
Component: engine
2015-05-23 21:08:58 -07:00
0d8ca6abd9
Merge pull request #13161 from calavera/plugin_discovery
...
Proposal: Volume refactor and external volume plugins
Upstream-commit: bce3e761c0a78ca55cefa9c6d040c1bc9138c1fb
Component: engine
2015-05-23 18:44:18 -07:00
2f63354a90
Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
...
This version brings in upto-date important bug-fixes from libnetwork
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: a3d22c764cfc3e175cdfb992f3b2314f23540236
Component: engine
2015-05-23 18:42:34 -07:00
98c6584c01
Merge pull request #13403 from hqhq/hq_fix_ipcmode_check
...
Don't check running container at create time
Upstream-commit: 89582f978189e68a87b01574c4f0f09b61c8c0f6
Component: engine
2015-05-23 08:32:51 -07:00
fd9e9a6b5b
Propagate unmount events to the external volume drivers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: d592778f4a75d36745aaffaf73c0775ecd420545
Component: engine
2015-05-22 16:43:34 -07:00
4bdf86ad9b
Don't check running container at create time
...
We should let user create container even if the container he wants
join is not running, that check should be done at start time.
In this case, the running check is done by getIpcContainer() when
we start container.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 84aae5a22605f8849e7335157afeca471b563a29
Component: engine
2015-05-23 07:15:14 +08:00
39e76a661b
Allow named volumes for external drivers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3bf0ca31cf61e445554326ba405cc32c7ef64189
Component: engine
2015-05-21 20:34:17 -07:00
778241cd3a
Make API volume-driver dependent on 'experimental'
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 2653c7c16cf87029c7e2e35427fbd1c83a0c96ba
Component: engine
2015-05-21 20:34:17 -07:00
3dacf0ed87
Disable -v overloading
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
(cherry picked from commit ec5a362fb93358244305067419589f602fd33807)
Upstream-commit: 7da5a7eb6637222a313e9d6e7fbcd5dd472154e3
Component: engine
2015-05-21 20:34:17 -07:00
89782c55eb
Volumes refactor and external plugin implementation.
...
Signed by all authors:
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
Signed-off-by: Jeff Lindsay <progrium@gmail.com >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Signed-off-by: Luke Marsden <luke@clusterhq.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 81fa9feb0cdc0773eff99d7393c16271e84aac08
Component: engine
2015-05-21 20:34:17 -07:00
ab1e39f7d4
Merge pull request #12766 from Microsoft/10662-graphdriverrefactor
...
Windows: graphdriver refactor
Upstream-commit: 88275e94d62896383b54209b5a8691ed3cffe122
Component: engine
2015-05-21 21:28:24 -04:00
a0524deeed
Merge pull request #12964 from Microsoft/10662-emptywindowsexecdriver
...
Windows: Empty Windows Exec Driver
Upstream-commit: 2be757f8696a2df6b02b153db15ea4f6d756c02a
Component: engine
2015-05-21 15:30:21 -07:00
aee8d65658
Add missing return error check
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: a9bc05a2f8e0978f47473b07b43d79692cf498bc
Component: engine
2015-05-21 17:03:43 +08:00
986a53d09e
Make docker ps --size show virtual size really work
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: d0de2b1e2f0939b25c83183f450c71b8309d1d32
Component: engine
2015-05-21 08:57:11 +08:00
0a8a3b1dc5
Merge pull request #13338 from icecrime/13023_experimental_env_var
...
Add DOCKER_EXPERIMENTAL environment variable
Upstream-commit: 19790c46dc7fbd489bbd4ccd6f138663312e7579
Component: engine
2015-05-20 13:04:28 -07:00
045dd55a7d
Add DOCKER_EXPERIMENTAL environment variable
...
The DOCKER_EXPERIMENTAL environment variable drives the activation of
the 'experimental' build tag.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: ca6722f1c5e4e2017a71e33579d91ac0d9ea2a25
Component: engine
2015-05-20 12:21:17 -07:00
f301559fd5
Windows: Empty Windows Exec Driver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8db09ff6290fb2d4aea121c2850940b9bc480ce9
Component: engine
2015-05-20 08:54:04 -07:00
e6982a9c9b
Windows: graphdriver refactor
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4e8b2509fd60bf1ab771db618301650b988b549b
Component: engine
2015-05-20 08:51:27 -07:00
03f7a130a4
Merge pull request #13325 from LK4D4/cleanup_mounts
...
Fix Put without Get in overlay
Upstream-commit: d29dc0b608f106ed589d25117abbbba3f5157bfe
Component: engine
2015-05-20 03:11:58 +02:00
6f37ffc9e3
Removed dead code from docker after libnetwork integration
...
As part of this some generic packages like iptables, etchosts and resolvconf
have also been moved to libnetwork. Even though they can still be
consumed in a generic fashion they will reside and be maintained
from within the libnetwork project.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: f12f51b8b934c21621c17590f1d526377a297a0d
Component: engine
2015-05-19 22:40:55 +00:00
13426de5e6
Docker integration with libnetwork
...
- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
- Reworked daemon to allocate network resources using libnetwork.
- Reworked remove link code to also update network resources in libnetwork.
- Adjusted the exec driver command population to reflect libnetwork design.
- Adjusted the exec driver create command steps.
- Updated a few test cases to reflect the change in design.
- Removed the dns setup code from docker as resolv.conf is entirely managed
in libnetwork.
- Integrated with lxc exec driver.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: d18919e304c240df84502cdcc5ed655d92d12d4f
Component: engine
2015-05-19 22:40:19 +00:00
249d122d71
Merge pull request #12884 from Microsoft/10662-startcontainerrefactor
...
Windows: Refactor container
Upstream-commit: 0cc5da0635880245420333d6ec43cea75f2f3afd
Component: engine
2015-05-19 10:44:23 -07:00
8911352f54
Fix Put without Get in overlay
...
It is called for example on daemon start after crash
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 3916561619d45a3d8ca17dfa467149824111023a
Component: engine
2015-05-19 09:32:23 -07:00
6da53b0de7
clean some redundant else clauses
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: d91ae65280c789307ec67fff7e2d268afe3aeba7
Component: engine
2015-05-19 10:54:04 +08:00
7113b757dc
Merge pull request #13277 from runcom/restartpolicy-methods
...
RestartPolicy methods instead of strings checking
Upstream-commit: 3b69ca5b97a937c904b8af91210af86de58f6893
Component: engine
2015-05-18 14:36:54 -04:00
edeb4ed190
Merge pull request #13249 from coolljt0725/fix_incorrect_document_of_storage_opt
...
Fix incorrect document storage-opt
Upstream-commit: 70e9e4bf9f7901137483fb4c9635d8d3cf686328
Component: engine
2015-05-18 11:35:01 -07:00
bcf5956dfc
Pass -log-opts map to logdrivers
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 8b11592d699df669b529e34658ef2d870c8a75f8
Component: engine
2015-05-18 16:50:14 +00:00
ce99abf239
Merge pull request #13283 from Microsoft/10662-fixbaselinenewdriver
...
Windows: NewDriver() re-baseline parms
Upstream-commit: 19ae59f9109d08452e37bdd6252fe8a053dd2839
Component: engine
2015-05-18 10:56:06 -04:00
c4f071bd48
Windows: Refactor container
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b9e4b95788e0d8eae5363b82f301dafb9ea687f7
Component: engine
2015-05-16 12:38:20 -07:00
5e6717ae3b
Windows: Simple import error on config_windows.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: dfddfa6bb8560e8a75aa67abd3b34cf82e98311c
Component: engine
2015-05-16 12:18:55 -07:00
Alexander Morozov
Brian Goff
Josh Hawn
Arnaud Porterie
David Calavera
Jessica Frazelle
John Howard
Antonio Murdaca
Darren Shepherd
Alexander Morozov
Madhu Venugopal
Qiang Huang
Lei Jitang
Jessie Frazelle
Jana Radhakrishnan
Zhang Wei
Michael Crosby
Ahmet Alp Balkan