Akihiro Suda
ecffd5b73a
api: add TypeTmpfs to api/types/mount
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 18768fdc2e76ec6c600c8ab57d2d487ee7877794
Component: engine
2016-10-28 08:38:32 +00:00
John Howard
763c2d8e2f
Windows: Factor out unused fields in container
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 600f0ad21142f4085330107f629a80099af0490f
Component: engine
2016-10-13 14:51:10 -07:00
Brian Goff
7f3def0be4
Merge pull request #27072 from Microsoft/jjh/fix26843
...
Windows: Don't resolve volume dest
Upstream-commit: d89fb40e1ce1373e3b188b9a817fcf9a5f37cd13
Component: engine
2016-09-30 14:46:07 -04:00
John Howard
e59d7b9406
Windows: Don't resolve volume dest
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3838c314add208a57003611a6963784435863330
Component: engine
2016-09-30 09:40:15 -07:00
Tonis Tiigi
3616bb2973
Fix missing hostname and links in exec env
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e98145960988a2259074ae911b6478b7a940748b
Component: engine
2016-09-29 13:46:10 -07:00
Anusha Ragunathan
da06cf8da0
Merge pull request #26843 from anusha-ragunathan/vol-unmount-win
...
Call "VolumeDriver.Unmount" during container stop.
Upstream-commit: b8265e55508db99aea632033b2f5008f921b11e2
Component: engine
2016-09-23 10:37:28 -07:00
Anusha Ragunathan
4954dc9e06
Call "VolumeDriver.Unmount" during container stop.
...
"VolumeDriver.Mount" is being called on container start.
Make the symmetric call on container stop.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: d576509d8ad1ef4770cb3959a792748c8658b0be
Component: engine
2016-09-22 18:20:39 -07:00
msabansal
6bf922c44e
Changes required to support windows service discovery
...
Signed-off-by: msabansal <sabansal@microsoft.com >
Upstream-commit: d1e0a78614d4efa768c88c9db3868bc9e7782efc
Component: engine
2016-09-22 12:21:21 -07:00
allencloud
92f94b6c20
correct some nits in comments
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 9279a93f6d43da4c904eeb0adb249fdfa34f7f92
Component: engine
2016-09-15 12:17:58 +08:00
Michael Crosby
45ddc4bfcb
Add engine-api types to docker
...
This moves the types for the `engine-api` repo to the existing types
package.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 91e197d614547f0202e6ae9b8a24d88ee131d950
Component: engine
2016-09-07 11:05:58 -07:00
Zhang Wei
d1bde01a82
Forbid update restart policy of container with AutoRemove flag
...
"--restart" and "--rm" are conflict options, if a container is started
with AutoRemove flag, we should forbid the update action for its Restart
Policy.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 4754c64ab5b5bf5ae6f8a3040606296910e6cb19
Component: engine
2016-08-16 15:36:13 +08:00
Antonio Murdaca
eb2bdeb9cf
daemon: allow tmpfs to trump over VOLUME(s)
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 756f6cef4a1379e59d6511ee000e435d23659153
Component: engine
2016-06-15 16:01:51 +02:00
John Howard
b06eb99229
Windows: Support ARG in builder
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6b5c83bf18fe406e397c001acb0a1d9d7e147fd9
Component: engine
2016-05-04 14:32:23 -07:00
John Howard
a76e16e99f
Windows libcontainerd implementation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Signed-off-by: John Starks <jostarks@microsoft.com >
Signed-off-by: Darren Stahl <darst@microsoft.com >
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 94d70d835500bec3b171425271916d3e40f29635
Component: engine
2016-03-18 13:38:41 -07:00
msabansal
23f9a9fa41
Windows libnetwork integration
...
Signed-off-by: msabansal <sabansal@microsoft.com >
Upstream-commit: e8026d8a98ef30ff0ada303404e02567caebb1b0
Component: engine
2016-03-09 20:33:21 -08:00
John Howard
c01546df7d
Windows: Don't create working dir for Hyper-V Containers
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5849a5537607f991898247c75e9298492318c7b1
Component: engine
2016-03-01 14:10:40 -08:00
Zhang Wei
f153cf13ed
Update RestartPolicy of container
...
Add `--restart` flag for `update` command, so we can change restart
policy for a container no matter it's running or stopped.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: ff3ea4c90f2ede5cccc6b49c4d2aad7201c91a4c
Component: engine
2016-02-20 17:06:32 +08:00
Darren Stahl
2fc41c0b8b
Combine SetupWorkingDirectory for Linux and Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 6791230320fa9f8ae9df3e90d5c52d85621828a0
Component: engine
2016-02-05 10:27:10 -08:00
John Howard
342ab710cd
Signed-off-by: John Howard <jhoward@microsoft.com>
...
Revert "Combine SetupWorkingDirectory for Linux and Windows"
This reverts commit ec31741ca186278ea60faf49f85087c493e78806.
Upstream-commit: 54320d8d187d8b33be4fd33cfb3f8e486c6c8d90
Component: engine
2016-01-29 20:49:39 -08:00
Darren Stahl
88afeb1908
Combine SetupWorkingDirectory for Linux and Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: ec31741ca186278ea60faf49f85087c493e78806
Component: engine
2016-01-27 16:17:35 -08:00
David Calavera
4ec2693c9e
Modify import paths to point to the new engine-api package.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 907407d0b2e5863f0e1b40b93a356bbf03c7b9fb
Component: engine
2016-01-06 19:48:59 -05:00
David Calavera
e54bb2b509
Add volume events.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9d12d093009d3c4bf3bd4ebad3f8327c36d2d584
Component: engine
2015-12-30 17:39:33 -05:00
Qiang Huang
c4af30652d
Implemet docker update command
...
It's used for updating properties of one or more containers, we only
support resource configs for now. It can be extended in the future.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 8799c4fc0feadede6ae60e77bd7d9dfd7cc72a79
Component: engine
2015-12-28 19:19:26 +08:00
Tibor Vass
bf2423fe8a
builder: remove container package dependency
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: c70f8b3c9c7a6dc6a219354acaa2e650d1403ecf
Component: engine
2015-12-15 17:24:07 +01:00
Justas Brazauskas
3c4fcf6b7a
Fix typos found across repository
...
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com >
Upstream-commit: 927b334ebfc786276a039e45ec097e71bf9a104c
Component: engine
2015-12-13 18:04:12 +02:00
Tibor Vass
44348463e0
Move DisconnectFromNetwork back to daemon/
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 5bb4d0d9ea6a6c85a3f9a4a147fd7db0101eb725
Component: engine
2015-12-03 20:10:27 +01:00
David Calavera
d010c48ce4
Move Container to its own package.
...
So other packages don't need to import the daemon package when they
want to use this struct.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 6bb0d1816acd8d4f7a542a6aac047da2b874f476
Component: engine
2015-12-03 17:39:49 +01:00