8785952282
Merge pull request #21830 from anusha-ragunathan/auplink
...
Be more lenient on auplink errors.
2016-04-07 09:19:38 +02:00
dbd9b7e121
Be more lenient on auplink errors.
...
On aufs, auplink is run before the Unmount. Irrespective of the
result, we proceed to issue a Unmount syscall. In which case,
demote erros on auplink to warning.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-04-06 18:24:19 -07:00
9d7f6bb921
Merge pull request #21733 from Microsoft/sjw/updatepending
...
Adding postRunProcessing infrastructure for hanlding Windows Update.
2016-04-06 15:36:39 -07:00
65464d11f1
Merge pull request #21809 from Microsoft/jjh/tp4removal
...
Windows: Remove TP4 support from main codebase
2016-04-06 14:11:33 -07:00
818a5198e4
Adding postRunProcessing infrastructure for hanlding Windows Update.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2016-04-06 14:03:05 -07:00
40dc921da2
Merge pull request #21805 from LK4D4/unused_stuff
...
all: remove some unused funcs and variables
2016-04-06 16:27:14 -04:00
5709f8e422
Merge pull request #21092 from WeiZhang555/fix-21064-detach-keys
...
Client print error when specify wrong detach keys
2016-04-06 22:14:14 +02:00
8c361eb5da
Merge pull request #21723 from devimc/master
...
Fix compilation errors with btrfs-progs-4.5
2016-04-06 15:56:42 -04:00
6bd429cb2a
Merge pull request #21802 from tiborvass/carry-21716
...
Carry 21716: When container had no layer data, cleanupContainer crashed
2016-04-06 15:21:38 -04:00
331c8a86d4
Windows: Remove TP4 support from main code
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-06 12:12:20 -07:00
40ccb7114e
Merge pull request #21768 from shishir-a412ed/fix_docker_run
...
Ignore os.IsNotExist errors when calling ToDiskLocking
2016-04-06 14:12:38 -04:00
5ee8652a21
all: remove some unused funcs and variables
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-04-06 10:40:01 -07:00
0bfc9c8de0
when container had no layer data, cleanupContainer crashed
...
Signed-off-by: mYmNeo <thomassong@tencent.com>
2016-04-06 12:40:20 -04:00
c7cf245053
Merge pull request #21751 from tonistiigi/runc-maskedpaths
...
Define readonly/mask paths in spec
2016-04-06 12:16:28 -04:00
606cf5310d
Ignore os.IsNotExist errors when calling ToDiskLocking
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2016-04-06 11:17:56 -04:00
fc9912fd00
Merge pull request #21272 from Microsoft/jstarks/manifest_updates
...
Add os_version and os_features to Image
2016-04-05 16:16:25 -07:00
3f81b49352
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>
2016-04-04 18:55:55 -07:00
194eaa5c0f
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>
2016-04-04 13:14:57 -07:00
91e5bb9541
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>
2016-04-04 15:35:55 +08:00
b8f38747e6
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>
2016-04-01 13:31:44 -07:00
a038cccf88
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>
2016-04-01 08:58:29 -06:00
42494720c2
Merge pull request #21687 from allencloud/fix-typos
...
fix typos
2016-03-31 14:18:31 -07:00
b9966f3a81
daemon: remove some unused code
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-31 11:24:12 -07:00
e6f2429e01
Merge pull request #21607 from allencloud/change-validateNoSchema-to-validateNoScheme
...
change validateNoSchema to validateNoScheme
2016-03-31 10:14:23 +02:00
c7b63338f0
Merge pull request #21637 from tonistiigi/refactor-cleanup
...
Fix container mount cleanup issues
2016-03-30 23:25:23 -07:00
ffee5588cd
Merge pull request #21372 from anusha-ragunathan/ctrd-rebase
...
Update mount state of live containers after a daemon crash.
2016-03-30 23:10:04 -07:00
5c161ade98
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-03-31 13:26:46 +08:00
28d3c22e55
1.change validateNoSchema into validateNoScheme
...
2.change schema into scheme in docs and some annotations.
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-03-31 12:29:15 +08:00
81d9eaa27e
Merge pull request #21600 from Microsoft/jstarks/escape_entrypoint
...
Windows: escape entrypoint before passing to libcontainerd
2016-03-30 18:00:32 -07:00
05cc737f54
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>
2016-03-30 17:25:49 -07:00
0dac544448
Merge pull request #21309 from nalind/journal-error-reporting
...
Improve error reporting when following journals
2016-03-30 16:15:34 -07:00
a7742e4379
Merge pull request #21636 from calavera/remove_builder_from_api
...
Remove builder dependency from the api.
2016-03-30 15:20:05 -07:00
6fa0239772
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>
2016-03-30 12:59:50 -07:00
d12b7c7e3e
Remove builder dependency from the api.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-29 17:02:36 -07:00
99adcaebc0
Merge pull request #21592 from anusha-ragunathan/docker-systemd
...
When using systemd, pass expected cgroupsPath and cli options to runc.
2016-03-29 17:00:10 -07:00
511a70583f
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>
2016-03-29 14:42:43 -07:00
7ed3d265a4
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>
2016-03-29 14:20:10 -07:00
114be249f0
daemon: register container as late as possible
...
fixes races between list and create
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-29 13:52:18 -07:00
1da40fb4ba
Merge pull request #21586 from calavera/remove_runconfig_from_routes
...
Remove runconfig package dependency from the API.
2016-03-29 08:40:49 -07:00
e6aa40a017
Merge pull request #19367 from shishir-a412ed/rootfs_size_configurable_cli
...
CLI flag for docker create(run) to change block device size.
2016-03-29 08:52:54 +02:00
6114072ffc
Merge pull request #21587 from Microsoft/jjh/bridgeconfig
...
Windows: bridgeConfig rework
2016-03-28 18:45:41 -07:00
051c5ddadc
Merge pull request #21552 from tonistiigi/aufs-mount-locks
...
Protect aufs mounts with locks
2016-03-28 17:00:43 -07:00
f0d26e1665
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>
2016-03-28 16:23:51 -04:00
3ca29823d4
Remove runconfig dependency from network routes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-28 16:23:50 -04:00
be390c30cd
Merge pull request #21523 from LK4D4/cancellable_routes
...
Embed context.Context to routes with usage of CloseNotify
2016-03-28 12:44:07 -07:00
ff3525c80f
Windows: bridgeConfig rework
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-03-28 12:24:01 -07:00
b16decfccf
CLI flag for docker create(run) to change block device size.
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2016-03-28 10:05:18 -04:00
59d8878558
Windows: psignal alias not required
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-03-27 17:23:34 -07:00
824c24e680
Protect aufs mounts with locks
...
Parallel aufs mount calls produce invalid argument error.
Fixes #21545
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-26 22:53:47 -07:00
a1d6c60ee0
Fixes #21538
...
typo corrected
Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
2016-03-26 09:38:00 +01:00
Vincent Demeester
Anusha Ragunathan
John Howard
Alexander Morozov
Stefan J. Wernli
Phil Estes
Tibor Vass
John Howard
Brian Goff
Alexander Morozov
mYmNeo
Shishir Mahajan
Tonis Tiigi
John Starks
Zhang Wei
Sebastiaan van Stijn
Julio Montes
Sebastiaan van Stijn
allencloud
David Calavera
Arnaud Porterie
Michael Crosby
Robin Naundorf