Alexander Morozov
fd21ba82c6
Merge pull request #21809 from Microsoft/jjh/tp4removal
...
Windows: Remove TP4 support from main codebase
Upstream-commit: 65464d11f1b1aac6a5b9792cb599e23f376d169d
Component: engine
2016-04-06 14:11:33 -07:00
Phil Estes
1ca23d3d69
Merge pull request #21805 from LK4D4/unused_stuff
...
all: remove some unused funcs and variables
Upstream-commit: 40dc921da21e4f1fd165f1d7da87d600e3eb8609
Component: engine
2016-04-06 16:27:14 -04:00
Vincent Demeester
5da6bec3ad
Merge pull request #21092 from WeiZhang555/fix-21064-detach-keys
...
Client print error when specify wrong detach keys
Upstream-commit: 5709f8e4227e0e1da333739c44003a3f47279bd5
Component: engine
2016-04-06 22:14:14 +02:00
Tibor Vass
5ada0d9d57
Merge pull request #21723 from devimc/master
...
Fix compilation errors with btrfs-progs-4.5
Upstream-commit: 8c361eb5da51318168d7d1bd2214f7369de28394
Component: engine
2016-04-06 15:56:42 -04:00
Tibor Vass
1735136bd7
Merge pull request #21802 from tiborvass/carry-21716
...
Carry 21716: When container had no layer data, cleanupContainer crashed
Upstream-commit: 6bd429cb2aabfed7a39748aa3fefd047883f893a
Component: engine
2016-04-06 15:21:38 -04:00
John Howard
9f10b4351a
Windows: Remove TP4 support from main code
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 331c8a86d489e573fcbf1df3c4f813bbc3168624
Component: engine
2016-04-06 12:12:20 -07:00
Brian Goff
feab92573f
Merge pull request #21768 from shishir-a412ed/fix_docker_run
...
Ignore os.IsNotExist errors when calling ToDiskLocking
Upstream-commit: 40ccb7114e7aceca38e66b365d4f54e4f4d64d0c
Component: engine
2016-04-06 14:12:38 -04:00
Alexander Morozov
842746c494
all: remove some unused funcs and variables
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 5ee8652a21756b1b4719e3477bd871d13b237c12
Component: engine
2016-04-06 10:40:01 -07:00
mYmNeo
8c0c7b5da7
when container had no layer data, cleanupContainer crashed
...
Signed-off-by: mYmNeo <thomassong@tencent.com >
Upstream-commit: 0bfc9c8de07cb2ad716d522952b2901080161909
Component: engine
2016-04-06 12:40:20 -04:00
Tibor Vass
3cc8db1e5f
Merge pull request #21751 from tonistiigi/runc-maskedpaths
...
Define readonly/mask paths in spec
Upstream-commit: c7cf2450537cf5f5f6d24067447376402ddf2680
Component: engine
2016-04-06 12:16:28 -04:00
Shishir Mahajan
10e0c5235b
Ignore os.IsNotExist errors when calling ToDiskLocking
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 606cf5310d20518b4a9dfbe4d8e6b872f8683d9e
Component: engine
2016-04-06 11:17:56 -04:00
John Howard
5c35f01162
Merge pull request #21272 from Microsoft/jstarks/manifest_updates
...
Add os_version and os_features to Image
Upstream-commit: fc9912fd00f5e12a6f0904f3c758275724ba3318
Component: engine
2016-04-05 16:16:25 -07:00
Tonis Tiigi
ac4137daba
Define readonly/mask paths in spec
...
This vendors in new spec/runc that supports
setting readonly and masked paths in the
configuration. Using this allows us to make an
exception for `—-privileged`.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 3f81b4935292d5daedea9de4e2db0895986115da
Component: engine
2016-04-04 18:55:55 -07:00
John Starks
4815437b5f
Add os_version and os_features to Image
...
These fields are needed to specify the exact version of Windows that an
image can run on. They may be useful for other platforms in the future.
This also changes image.store.Create to validate that the loaded image is
supported on the current machine. This change affects Linux as well, since
it now validates the architecture and OS fields.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 194eaa5c0f843257e66b68bd735786308a9d93b2
Component: engine
2016-04-04 13:14:57 -07:00
Zhang Wei
97016757fb
Let client print error when speicify wrong detach keys
...
Fix #21064
Let client print error message explicitly when user specifies wrong
detach keys.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 91e5bb954131904af150b06bd22b007559a8ce27
Component: engine
2016-04-04 15:35:55 +08:00
Sebastiaan van Stijn
9b4fb715c9
Improve udev unsupported error message
...
Show a different message if a dynamic binary
is running, but doesn't have udev sync support.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b8f38747e60eb76e19f08129ab27cb808d21c22a
Component: engine
2016-04-01 13:31:44 -07:00
Julio Montes
7929b2459d
Fix compilation errors with btrfs-progs-4.5
...
btrfs-progs-4.5 introduces device delete by devid
for this reason btrfs_ioctl_vol_args_v2's name was encapsulated
in a union
this patch is for setting btrfs_ioctl_vol_args_v2's name
using a C function in order to preserve compatibility
with all btrfs-progs versions
Signed-off-by: Julio Montes <imc.coder@gmail.com >
Upstream-commit: a038cccf88998814249a7a40b71a33a680e3f02f
Component: engine
2016-04-01 08:58:29 -06:00
Sebastiaan van Stijn
32d1f4fa04
Merge pull request #21687 from allencloud/fix-typos
...
fix typos
Upstream-commit: 42494720c2a8d31867587c1b633d8f439e54b319
Component: engine
2016-03-31 14:18:31 -07:00
Alexander Morozov
b5af51fa11
daemon: remove some unused code
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: b9966f3a81e89640d0de8fa5ae8d38213df0b8fe
Component: engine
2016-03-31 11:24:12 -07:00
Vincent Demeester
dc335512b1
Merge pull request #21607 from allencloud/change-validateNoSchema-to-validateNoScheme
...
change validateNoSchema to validateNoScheme
Upstream-commit: e6f2429e017eb3c41bbc77442e81a23635287625
Component: engine
2016-03-31 10:14:23 +02:00
Sebastiaan van Stijn
dc5103ac67
Merge pull request #21637 from tonistiigi/refactor-cleanup
...
Fix container mount cleanup issues
Upstream-commit: c7b63338f0c46b2ca0efee3b8a590c2e2033ea14
Component: engine
2016-03-30 23:25:23 -07:00
Sebastiaan van Stijn
2a5d48b968
Merge pull request #21372 from anusha-ragunathan/ctrd-rebase
...
Update mount state of live containers after a daemon crash.
Upstream-commit: ffee5588cd9be4c67c73476998af1ecbc61250b6
Component: engine
2016-03-30 23:10:04 -07:00
allencloud
3982305fda
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 5c161ade98107ce48a77e3525321c436734a43ec
Component: engine
2016-03-31 13:26:46 +08:00
allencloud
8ae6c0847a
1.change validateNoSchema into validateNoScheme
...
2.change schema into scheme in docs and some annotations.
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 28d3c22e55259281c70fd90780a1b0d388450ddf
Component: engine
2016-03-31 12:29:15 +08:00
Brian Goff
b52259e5cc
Merge pull request #21600 from Microsoft/jstarks/escape_entrypoint
...
Windows: escape entrypoint before passing to libcontainerd
Upstream-commit: 81d9eaa27e4efb5cad52b57ca2e9d71a0c9b2272
Component: engine
2016-03-30 18:00:32 -07:00
Tonis Tiigi
2da8076367
Fix container mount cleanup issues
...
- Refactor generic and path based cleanup functions into a single function.
- Include aufs and zfs mounts in the mounts cleanup.
- Containers that receive exit event on restore don't require manual cleanup.
- Make missing sandbox id message a warning because currently sandboxes are always cleared on startup. libnetwork#975
- Don't unmount volumes for containers that don't have base path. Shouldn't be needed after #21372
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 05cc737f5411a0effd299429140d031c4ad8dd05
Component: engine
2016-03-30 17:25:49 -07:00
David Calavera
9fa3adf0a8
Merge pull request #21309 from nalind/journal-error-reporting
...
Improve error reporting when following journals
Upstream-commit: 0dac5444489a34e86bd3e289b33fab3f17c1bf70
Component: engine
2016-03-30 16:15:34 -07:00
David Calavera
a27733f46d
Merge pull request #21636 from calavera/remove_builder_from_api
...
Remove builder dependency from the api.
Upstream-commit: a7742e437943bb0c59cc9e01fd9f5e68259ad3ec
Component: engine
2016-03-30 15:20:05 -07:00
John Starks
6a83b0bb5c
Windows: escape entrypoint before passing to libcontainerd
...
This makes Windows behavior consistent with Linux -- the entry point must
be an executable, not an executable and set of arguments.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 6fa0239772e672eefb98cef91ca8d806b86182b0
Component: engine
2016-03-30 12:59:50 -07:00
David Calavera
b960646c00
Remove builder dependency from the api.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: d12b7c7e3e5566f49f81189b757bcd0e4ef09956
Component: engine
2016-03-29 17:02:36 -07:00
David Calavera
5888c28b47
Merge pull request #21592 from anusha-ragunathan/docker-systemd
...
When using systemd, pass expected cgroupsPath and cli options to runc.
Upstream-commit: 99adcaebc0aca57f2665f356e4a9b4218aa5d5f7
Component: engine
2016-03-29 17:00:10 -07:00
Anusha Ragunathan
ad9621a58c
Update mount state of live containers after a daemon crash.
...
Fix unmount issues in the daemon crash and restart lifecycle, w.r.t
graph drivers. This change sets a live container RWLayer's activity
count to 1, so that the RWLayer is aware of the mount. Note that
containerd has experimental support for restore live containers.
Added/updated corresponding tests.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 511a70583fbb901f57acb44d501cca8e6dcbce2c
Component: engine
2016-03-29 14:42:43 -07:00
Anusha Ragunathan
3b9321568d
When using systemd, pass expected cgroupsPath and cli options to runc.
...
runc expects a systemd cgroupsPath to be in slice:scopePrefix:containerName
format and the "--systemd-cgroup" option to be set. Update docker accordingly.
Fixes 21475
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 7ed3d265a4499ec03f10537fea0aac3ebaa0cec6
Component: engine
2016-03-29 14:20:10 -07:00
Alexander Morozov
5b11bbb1cc
daemon: register container as late as possible
...
fixes races between list and create
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 114be249f022535f0800bd45987c4e9cd1b321a4
Component: engine
2016-03-29 13:52:18 -07:00
Arnaud Porterie
922dd0a9e8
Merge pull request #21586 from calavera/remove_runconfig_from_routes
...
Remove runconfig package dependency from the API.
Upstream-commit: 1da40fb4badd116a7591dd2c19009146770c9a89
Component: engine
2016-03-29 08:40:49 -07:00
Vincent Demeester
57e1cc77d5
Merge pull request #19367 from shishir-a412ed/rootfs_size_configurable_cli
...
CLI flag for docker create(run) to change block device size.
Upstream-commit: e6aa40a017e0c11186fb9053b9e71e34b93ebe1c
Component: engine
2016-03-29 08:52:54 +02:00
Sebastiaan van Stijn
46aef12c44
Merge pull request #21587 from Microsoft/jjh/bridgeconfig
...
Windows: bridgeConfig rework
Upstream-commit: 6114072ffc78adda9888b31c70b95e73a8ea3c2e
Component: engine
2016-03-28 18:45:41 -07:00
Michael Crosby
93a9ef306c
Merge pull request #21552 from tonistiigi/aufs-mount-locks
...
Protect aufs mounts with locks
Upstream-commit: 051c5ddadc17ffb8a0f9923df0f0b2206ae0eba9
Component: engine
2016-03-28 17:00:43 -07:00
David Calavera
56103ffaad
Remove runconfig package dependency from image and container routers.
...
Use an interface to specify the behavior of a configuration decoder.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: f0d26e1665f7552972db5b041554cc7b45bc3060
Component: engine
2016-03-28 16:23:51 -04:00
David Calavera
91e6a2df59
Remove runconfig dependency from network routes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3ca29823d42ab1e2b1ea76981ccc9aa11e858cb2
Component: engine
2016-03-28 16:23:50 -04:00
David Calavera
1660794bad
Merge pull request #21523 from LK4D4/cancellable_routes
...
Embed context.Context to routes with usage of CloseNotify
Upstream-commit: be390c30cdde978ea1a5417875876e4f3ae52655
Component: engine
2016-03-28 12:44:07 -07:00
John Howard
701bd59680
Windows: bridgeConfig rework
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ff3525c80f9118e2320e480dde75887c50d6ac0a
Component: engine
2016-03-28 12:24:01 -07:00
Shishir Mahajan
9ab7e4327f
CLI flag for docker create(run) to change block device size.
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: b16decfccfdb0749c490be9272cb7b4789be87b4
Component: engine
2016-03-28 10:05:18 -04:00
John Howard
379ab3cb40
Windows: psignal alias not required
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 59d8878558f97055d8abb1fa347df437cf8f90aa
Component: engine
2016-03-27 17:23:34 -07:00
Tonis Tiigi
a119fb7401
Protect aufs mounts with locks
...
Parallel aufs mount calls produce invalid argument error.
Fixes #21545
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 824c24e6802ad3ed7e26b4f16e5ae81869b98185
Component: engine
2016-03-26 22:53:47 -07:00
Robin Naundorf
0d92595efc
Fixes #21538
...
typo corrected
Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de >
Upstream-commit: a1d6c60ee094e12b7373cc86b78d89ba0a3e5090
Component: engine
2016-03-26 09:38:00 +01:00
Alexander Morozov
4948749e40
use router.Cancellable instead of direct CloseNotify
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 62c9e62edcf3d96d251fd06a48437b2fa2f56ad6
Component: engine
2016-03-25 11:33:54 -07:00
David Calavera
2803dd9564
Merge pull request #21486 from Microsoft/jjh/execroot
...
Windows: Remove --exec-root
Upstream-commit: 786305ed0cd8f9b8b8a66b6b77907b2f8635e95b
Component: engine
2016-03-25 11:07:48 -07:00
Vincent Demeester
cfeb820c82
Merge pull request #21361 from HackToday/addfilter
...
Add name/driver filter support for volume
Upstream-commit: 2de29fb9c2eaee803d69625a7105953da941356e
Component: engine
2016-03-25 08:07:38 +01:00
Sebastiaan van Stijn
9a2a79217f
Merge pull request #21487 from tonistiigi/fix-old-dind
...
Fix setting cgroup permission to user/privileged devices
Upstream-commit: f3d824771a10a8143ea97afb6864d0a587c7b7e3
Component: engine
2016-03-24 22:56:39 -07:00