13125ff6b4
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
Upstream-commit: 2519f465501657c24ecd13b8e53964b6c2f1a78d
Component: engine
2015-11-05 15:22:37 -08:00
90a6db029c
Merge pull request #17735 from LK4D4/errcode_resize
...
Move errcode handling for resize upper
Upstream-commit: b232362310c24a74c01741bb43ec3052ffe49f83
Component: engine
2015-11-05 15:00:48 -08:00
f427a47755
Remove exec-driver global daemon option.
...
Each platform has only a driver now.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 157b66ad390902ef6f5b51b3f76d5177eacac81b
Component: engine
2015-11-05 17:09:58 -05:00
ef88e7ace2
Remove LXC support.
...
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3b5fac462d21ca164b3778647420016315289034
Component: engine
2015-11-05 17:09:57 -05:00
b37ddbaf2b
Move errcode handling for resize upper
...
It'll allow to separate daemon layer more cleanly later.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: bb0e7eb196c65972ea66154461b7e654d776f92a
Component: engine
2015-11-05 13:42:33 -08:00
ce27d8b852
Merge pull request #17726 from runcom/fix-errors-format
...
Fix errors format
Upstream-commit: b52bedbd480b5029656733a449bd3596b8561e5a
Component: engine
2015-11-05 13:30:57 -08:00
44fac78e29
Merge pull request #17685 from WeiZhang555/cluster-parser
...
Fix `--cluster-store` option parser
Upstream-commit: c7b65288e458f51ea2d5adcb8692c279726a8292
Component: engine
2015-11-05 13:21:52 -08:00
723ed1d8d2
Merge pull request #17534 from Microsoft/10662-filterhyperv
...
Windows: Add isolation to ps filter
Upstream-commit: 9465d6ee6a669e4978ce746f16280910db7b1359
Component: engine
2015-11-05 15:55:47 -05:00
2ba09b4e09
Windows: Add isolation to ps filter
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9c5814171ce7ab3af48867da36f4d374f804c4a6
Component: engine
2015-11-05 10:18:24 -08:00
1bdb88a97a
Fix errors format
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 77826333fe12fb444ac536e115f23f8e00db24a8
Component: engine
2015-11-05 18:17:37 +01:00
5299efe664
Merge pull request #17671 from Microsoft/sjw/skip_mount_on_create
...
Optimize Create Container to skip extra mount on Windows.
Upstream-commit: bb9eca90363eec052e101bb8ef3351d0218dccf9
Component: engine
2015-11-05 09:15:28 -05:00
ca5fc035b7
Fix --cluster-store option parser
...
`--cluster-store` is of form KV-PROVIDER://KV-URL, this commit makes
sure that KV-URL contains no "://"
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 0ebdac8bee0c587a8a10e3bcdec46e9d8360e2fb
Component: engine
2015-11-05 11:45:08 +08:00
fa6a6b811f
Merge pull request #17703 from aboch/np
...
Verify Endpoint.Info() before accessing it
Upstream-commit: f18c5e9714face6eaa4ff63a32ecd6f01444ef4b
Component: engine
2015-11-04 19:23:11 -05:00
e3dc181362
Merge pull request #14012 from sallyom/exitCodes
...
Change 'docker run' exit codes to distinguish docker/contained errors
Upstream-commit: 236913f4e825d747b091e8eda07b48f8d62a41a9
Component: engine
2015-11-05 00:50:08 +01:00
63911eff34
Merge pull request #17673 from LK4D4/elim_str_comparison
...
Do not rely on string comparison in truncindex
Upstream-commit: 9c1006c8bf2efc71659ec3b5412ce987661decca
Component: engine
2015-11-04 15:39:19 -08:00
f9edf991b3
Optimize Create Container to skip extra mount on Windows.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: 9112d90b27c3bf13b8d1c41eb288c63868c53747
Component: engine
2015-11-04 14:43:50 -08:00
6cd1649ca5
Verify Endpoint.Info() before accessing it
...
- During concurrent operations in multihost environment,
it is possible that the implementer of `EndpointInfo`
is nil. It simply means the endpoint is no longer
available in the datastore.
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 54d22cbd9a04a965c935a693bf403d2c87109b5a
Component: engine
2015-11-04 13:27:17 -08:00
f66555fbae
Change 'docker run' exit codes to distinguish docker/contained errors
...
The purpose of this PR is for users to distinguish Docker errors from
contained command errors.
This PR modifies 'docker run' exit codes to follow the chroot standard
for exit codes.
Exit status:
125 if 'docker run' itself fails
126 if contained command cannot be invoked
127 if contained command cannot be found
the exit status otherwise
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: 41de7a18d8f231568977e66bb58a6a02545d49d9
Component: engine
2015-11-04 15:18:50 -05:00
b92bac632d
Do not rely on string comparison in truncindex
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: d4a8d09d1a7ced5c711fcc7a939986d22a0554eb
Component: engine
2015-11-04 11:34:05 -08:00
1820467533
Remove further references to the daemon within containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 63efc12070b2aff0f062ad62cc577cf2ffb66ef6
Component: engine
2015-11-04 12:28:54 -05:00
2b73c2cc80
Remove daemon field from container.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 444c82d19d3c8ee51f313c879d434ac5b8be6a6f
Component: engine
2015-11-04 12:27:49 -05:00
c61aec7054
Decouple daemon and container from the stats collector.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 5dc3a9a6da6ce6e3eee791251293cf045a4754f9
Component: engine
2015-11-04 12:27:49 -05:00
0e98961ec3
Decouple daemon and container to configure logging drivers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: c412300dd9f85301e2922ccc7c954eaa37fadcab
Component: engine
2015-11-04 12:27:49 -05:00
ed39402a61
Decouple daemon and container to manage networks.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 669949d6b436d2fc182b427a5e2b38b3bd77c743
Component: engine
2015-11-04 12:27:48 -05:00
ae0ea71e8c
Decouple daemon and container to cleanup containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 019c337b93d5e068fa7c701d8b70750052503188
Component: engine
2015-11-04 12:27:48 -05:00
cf2d677f4e
Decouple daemon and container to log events.
...
Create a supervisor interface to let the container monitor to emit events.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ca5ede2d0a23cb84cac3b863c363d0269e6438df
Component: engine
2015-11-04 12:27:48 -05:00
8678b0dd0d
Decouple daemon and container to manage volumes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 2c72015ce3b78b45e33529368fb1c5a724415d87
Component: engine
2015-11-04 12:27:48 -05:00
ad803b2d26
Decouple daemon and container to execute processes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: c1c42db060362e400a475dfb2884f89b86fce317
Component: engine
2015-11-04 12:27:48 -05:00
28971757bb
Move Daemon.containerCopy to daemon/archive.go
...
It's the only place where it's used.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ebf707ec5fc9e942b89f6405df35cd6c0fabb15b
Component: engine
2015-11-04 12:27:48 -05:00
c4c84fb5f6
Remove unused function Container.getImage.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 89decc4446ad01a5595de1b93c17c37232f8a9aa
Component: engine
2015-11-04 12:27:48 -05:00
6943fc8dc1
Remove unnecessary Container.changes function.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 6ea9a880dc434446c072ac23b1cab89ec3652140
Component: engine
2015-11-04 12:27:48 -05:00
b52340d649
Decouple daemon and container to mount and unmount filesystems.
...
Side effects:
- Decouple daemon and container to start containers.
- Decouple daemon and container to copy files.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3a497650464b40191bd2cde348e676acf4efe270
Component: engine
2015-11-04 12:27:47 -05:00
57930f801e
Decouple daemon and container to export containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1c94f5f53a47997f76cafb633092fce9dbdab3ea
Component: engine
2015-11-04 12:27:47 -05:00
d721eb8e53
Decouple daemon and container to pause and unpause containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9f79cfdb2f1f6aeb64c84e7cb877fc38d052d187
Component: engine
2015-11-04 12:27:47 -05:00
41d5167da1
Decouple daemon and container to stop and kill containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 4f2a5ba360d0b00213d31f50a5be074c89124c52
Component: engine
2015-11-04 12:27:47 -05:00
aecf79764a
Move exportContainerRw to the daemon.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 581380cc6cd26f43fe5e69965873769d8dc739ef
Component: engine
2015-11-04 12:27:47 -05:00
ab3f1d521b
Merge pull request #17672 from LK4D4/unn_var
...
Remove unnecessary var decls
Upstream-commit: 0f41761290160fbce38b6db62916d3009967954c
Component: engine
2015-11-04 12:24:52 +01:00
aaf60225d8
Remove unnecessary var decls
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: cec31abfea0576a9899b861a239ddf9dc1d7672a
Component: engine
2015-11-03 17:03:40 -08:00
014aae9963
Merge pull request #17630 from LK4D4/syscall_umount_warn
...
Do not ignore error from syscall.Unmount
Upstream-commit: c9208953fac6174bb205bd1b3705f81a602869c2
Component: engine
2015-11-03 19:58:19 -05:00
a0ca658098
Merge pull request #17665 from LK4D4/setupwd_refactor
...
Reorder code slightly in setupWorkingDirectory
Upstream-commit: 562a1263f2ce93b649a09803659be40c61b51b35
Component: engine
2015-11-03 15:56:10 -08:00
9aef196743
Merge pull request #17614 from LK4D4/fix_golint
...
Update linting tools to latest versions
Upstream-commit: e704182c9c5bea1655791d11d13878b6a5ec949c
Component: engine
2015-11-03 15:32:12 -08:00
dc1ef8ad94
Reorder code slightly in setupWorkingDirectory
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: bb66c168719f19a84909446dc177a6cf2f19eb23
Component: engine
2015-11-03 14:33:31 -08:00
c5e6963259
Merge pull request #17606 from mountkin/increase-max-retries
...
increase the maxJSONDecodeRetry in json log reader
Upstream-commit: c30b9e590c69a01ee6ea0510142fb9f965b62f7a
Component: engine
2015-11-03 13:45:45 -05:00
eb4200c1ba
Merge pull request #17638 from calavera/move_net_stats_collector
...
Make the stats collector to collect network stats.
Upstream-commit: aff8bd178c048780fa221e65a9dcce28b9c96df9
Component: engine
2015-11-03 10:31:40 -08:00
56e28325cd
Merge pull request #17629 from tonistiigi/kill-autorestart-fix
...
Fix race causing autorestart turning off on restart
Upstream-commit: 8d5695470ae909d0abb62e10f41c6e5f342520cd
Component: engine
2015-11-03 08:24:11 -08:00
0c95e3cdf7
Fix race causing autorestart turning off on restart
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: b8aaa4b07c100a338136be82292289a37b09b5e7
Component: engine
2015-11-02 18:37:55 -08:00
24e41f974f
Make the stats collector to collect network stats.
...
Currently, we get the network stats each time per subscriber, causing a
high load of cpu when there are several subscribers per container.
This change makes the daemon to collect once and publish N times, where N is the
number of subscribers per container.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 453473d6a964e58f4a61599bd90d62d0088f0cc2
Component: engine
2015-11-02 21:06:44 -05: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
8388c2e10b
Do not ignore error from syscall.Unmount
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 3f10bdf100067580c35e27524b10ad06fadd0527
Component: engine
2015-11-02 14:40:29 -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
