1d2208fed9
Forbid exec a restarting container
...
Currently if we exec a restarting container, client will fail silently,
and daemon will print error that container can't be found which is not a
very meaningful prompt to user.
This commit will stop user from exec a restarting container and gives
more explicit error message.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-27 10:05:06 +08:00
141a301dca
Merge pull request #19154 from hqhq/hq_verify_cgroupparent
...
Verify cgroup-parent name for systemd cgroup
2016-01-26 11:44:31 +01:00
1f2917602e
Merge pull request #19103 from vdemeester/events-with-attributes
...
Add the possibility to log event with specific attributes
2016-01-26 11:01:23 +01:00
07e2dedecb
Merge pull request #19057 from dnephin/remove_version_from_registry_pkg
...
Remove dockerversion from registry package
2016-01-25 22:45:06 -08:00
c5380f9118
Merge pull request #19468 from jfrazelle/refactor-sec-profiles-into-own-pkg
...
Refactor sec profiles their own packages
2016-01-25 22:18:56 -08:00
5b0183e91c
Merge pull request #19683 from calavera/network_config_file
...
Allow network configuration via daemon config file.
2016-01-25 18:59:20 -08:00
58c2488d07
Merge pull request #19568 from cpuguy83/17907_fix_rmv
...
On container rm, don't remove named mountpoints
2016-01-25 18:13:57 -08:00
2cb8fdd327
Merge pull request #19673 from aboch/epcs
...
Save endpoint config only if endpoint creation succeeds
2016-01-25 16:50:47 -08:00
d4ccd948e9
Merge pull request #19676 from cpuguy83/19672_fix_force_rm
...
Fix removing mountpoints on container rm fail
2016-01-25 16:44:25 -08:00
c539be8833
Allow network configuration via daemon config file.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-25 18:54:56 -05:00
f7abff4f81
Merge pull request #19560 from aboch/mn
...
Reject multiple networks on container creation request
2016-01-25 14:57:51 -08:00
733245b2e7
Save endpoint config only if endpoint creation succeeds
...
- Currently it is being save upfront...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-25 13:43:32 -08:00
dd7d1c8a02
On container rm, don't remove named mountpoints
...
This makes it so when calling `docker run --rm`, or `docker rm -v`, only
volumes specified without a name, e.g. `docker run -v /foo` instead of
`docker run -v awesome:/foo` are removed.
Note that all volumes are named, some are named by the user, some get a
generated name. This is specifically about how the volume was specified
on `run`, assuming that if the user specified it with a name they expect
it to persist after the container is cleaned up.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-25 15:51:28 -05:00
cfa515fd9d
Reject multiple networks on container creation
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-25 12:50:01 -08:00
0eed34755e
Fix removing mountpoints on container rm fail
...
Ensure that the the container's mountpoints are cleaned up if the
container is force removed.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-25 15:49:56 -05:00
8a68315c38
Fix error message in container creation
...
Error message was different if image was specified with the full ID.
Fixes #19652
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-01-25 11:45:20 -08:00
67d86d10d8
Merge pull request #19216 from scaleoutsean/master
...
Add GPFS filesystem IDs
2016-01-22 21:27:03 -05:00
5ce5a8e966
Verify cgroup-parent name for systemd cgroup
...
Fixes : #17126
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-01-22 21:17:23 -05:00
422827fa92
Merge pull request #19527 from aboch/epc
...
Move Unsupp Network & IP check to the new updateNetworkConfig() func
2016-01-22 15:54:21 -08:00
455a505749
Merge pull request #19190 from srust/volume_driver_parity_again
...
Allow external volume drivers to host anonymous volumes again
2016-01-22 15:53:06 -05:00
34a83f9f2c
Merge pull request #19517 from calavera/validate_config_keys
...
Verify that the configuration keys in the file are valid.
2016-01-22 15:01:29 -05:00
5e80ac0dd1
Make TLSOptions and LogConfig embedded structs.
...
That way the configuration file becomes flag, without extra keys.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-22 13:20:17 -05:00
bdc8241da9
Add GPFS
...
Signed-off-by: Sean Lee <seanlee@tw.ibm.com>
2016-01-22 21:12:47 +08:00
c91045a78b
Merge pull request #19558 from LK4D4/reduce_cgroup_parsing
...
Refactor sysinfo usage
2016-01-22 11:18:53 +01:00
bed0bb7d01
move default seccomp profile into package
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-21 16:55:29 -08:00
35e50119fc
move default apparmor policy into package
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-21 16:55:27 -08:00
3233f45609
Merge pull request #19263 from jfrazelle/update-aa-parser
...
refactor aaparser pkg, add unit tests
2016-01-21 19:40:53 -05:00
9ae51b3e0f
Merge pull request #19383 from calavera/container_store
...
Extract container store from the daemon.
2016-01-21 17:20:47 -05:00
ed4038676f
Verify that the configuration keys in the file are valid.
...
- Return an error if any of the keys don't match valid flags.
- Fix an issue ignoring merged values as named values.
- Fix tlsverify configuration key.
- Fix bug in mflag to avoid panics when one of the flag set doesn't have any flag.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-21 16:56:12 -05:00
d2448a0c20
Merge pull request #19524 from LK4D4/iocopy_writeto
...
Use bufio.Reader in io.Copy source for overlay.copyRegular
2016-01-21 15:37:12 -05:00
3b0d36dbc1
Move ErrUnsupportedNetwork* checks to updateNetworkConfig() func
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-21 10:56:01 -08:00
3f5e1c69b3
Use pools.Copy instead of io.Copy for overlay.copyRegular
...
That function is pretty heavy used on container start. Autoallocating
buffer can be painful.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-21 08:53:37 -08:00
98d0997894
Revert "Copy aufs hardlinks to top layer"
...
This reverts commit ef05b83417
2016-01-21 07:52:50 -08:00
757d686700
Merge pull request #19500 from cpuguy83/fix_loading_with_containerized_plugins
...
Fix loading with containerized plugins
2016-01-21 08:57:01 -05:00
476edba011
Merge pull request #19483 from coolljt0725/fix_19477
...
Fix #19477 , clean up the ports when release network
2016-01-21 14:29:29 +01:00
6025517b68
Fix #19477 , clean up the ports when release network
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-20 20:09:11 -05:00
22ebeede30
Reuse *sysinfo.SysInfo instance in verification
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-20 17:08:10 -08:00
ee001d87a9
Merge pull request #19514 from cpuguy83/19444_fix_links_with_same_name
...
Don't error out when link name in use.
2016-01-20 15:21:58 -08:00
332d95fd0d
Don't error out when link name in use.
...
This preserves old behavior from sqlite links/names.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-20 16:40:56 -05:00
2705fa573b
Merge pull request #19457 from calavera/post_config_verification
...
Fix post config verification without flags.
2016-01-20 14:49:32 -05:00
cd3446972e
Fix post config verification without flags.
...
- Set the daemon log level to what's set in the configuration.
- Enable TLS when TLSVerify is enabled.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-20 13:01:07 -05:00
fd79462af3
Merge pull request #19044 from HackToday/18890-validate-volume
...
Fix volume filter validation
2016-01-20 09:56:30 -08:00
d85b9f8580
Fix loading of containerized plugins
...
During daemon startup, all containers are registered before any are
started.
During container registration it was calling out to initialize volumes.
If the volume uses a plugin that is running in a container, this will
cause the restart of that container to fail since the plugin is not yet
running.
This also slowed down daemon startup since volume initialization was
happening sequentially, which can be slow (and is flat out slow since
initialization would fail but take 8 seconds for each volume to do it).
This fix holds off on volume initialization until after containers are
restarted and does the initialization in parallel.
The containers that are restarted will have thier volumes initialized
because they are being started. If any of these containers are using a
plugin they will just keep retrying to reach the plugin (up to the
timeout, which is 8seconds) until the container with the plugin is up
and running.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-20 12:23:17 -05:00
e5e62b96ce
Fix race condition in execCommandGC
...
`daemon.execCommandGC`
The daemon object (grep execCommandGC) iterate over a map
(grep execCommands.Commands) in a goroutine.
Lock can't protect concurrency access in this case.
Exec command storage object should return a copy of commands instead.
Signed-off-by: Pei Su <sillyousu@gmail.com>
2016-01-20 12:52:05 +08:00
3c82fad441
Extract container store from the daemon.
...
- Generalize in an interface.
- Stop abusing of List for everything.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-19 13:21:41 -05:00
30e42a2799
Merge pull request #19432 from jfrazelle/fix-x32
...
add send, recv, and x32 so we can install i386 pkgs on amd64
2016-01-19 10:20:01 -05:00
308eff99e8
add send, recv, and x32 so we can install i386 pkgs on amd64
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-18 19:24:01 -08:00
35dbce109b
nil ptr check for endpointsettings when used with older clients
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-18 17:15:59 -08:00
a495c148a5
Merge pull request #19414 from anusha-ragunathan/postBuild
...
Make daemonbuilder.Docker leaner.
2016-01-18 21:46:49 +01:00
3044a08326
Merge pull request #19372 from cloudflare/fix-log-copier
...
only close LogDriver after LogCopier is done
2016-01-18 14:38:34 -05:00
Zhang Wei
Vincent Demeester
Antonio Murdaca
Tibor Vass
Arnaud Porterie
Sebastiaan van Stijn
David Calavera
Alessandro Boch
Brian Goff
Tonis Tiigi
Phil Estes
Qiang Huang
scaleoutsean
Jessica Frazelle
Alexander Morozov
Lei Jitang
Pei Su
Madhu Venugopal