Joey Geiger
318b4f0b5f
Fix typos in create.go
...
There were a few spelling issues that I noticed when reading about shared mounts.
Signed-off-by: jgeiger <joey.geiger@irco.com >
2016-01-28 14:08:11 -07:00
Vincent Demeester
36b5e63179
Merge pull request #19773 from coolljt0725/fix_message
...
Correct the info message when stop container
2016-01-28 08:29:42 +01:00
David Calavera
7a016578db
Merge pull request #18041 from jnummelin/feature/fluent-logger-ignore-connect-error-flag
...
Added flag to ignore fluentd connect error on container start
2016-01-27 14:25:24 -08:00
Brian Goff
f4e5eb3f86
Merge pull request #19775 from coolljt0725/fix_prepare_mount
...
daemon: don't prepare mountpoint for restart container
2016-01-27 16:11:12 -05:00
Ivan Babrou
5a3351883b
Add tag support to journald logging driver, closes #19556
...
Signed-off-by: Ivan Babrou <ibobrik@gmail.com >
2016-01-27 10:52:19 +00:00
Lei Jitang
6716a3a167
Correct the info message when stop container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2016-01-27 03:06:45 -05:00
Lei Jitang
0feeab2e43
daemon: don't prepare mountpoint for restart container
...
The restart container has already prepared the mountpoint, there is
no need to do that again. This can speed up the daemon start if
the restart container has a volume and the volume driver is not
available.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2016-01-27 02:43:40 -05:00
Jussi Nummelin
3cf82ff1ab
Added flag to ignore fluentd connect error on container start
...
Signed-off-by: Jussi Nummelin <jussi.nummelin@gmail.com >
Changed buffer size to 1M and removed unnecessary fmt call
Signed-off-by: Jussi Nummelin <jussi.nummelin@gmail.com >
Updated docs for the new fluentd opts
Signed-off-by: Jussi Nummelin <jussi.nummelin@gmail.com >
2016-01-27 09:05:44 +02:00
David Calavera
63f8429bf0
Merge pull request #19717 from coolljt0725/fix_load
...
Daemon: do GetRWLayer after checking if container support the current graph driver
2016-01-26 21:55:32 -08:00
Lei Jitang
0ae94303b8
Merge pull request #19722 from WeiZhang555/exec-restarting
...
Forbid exec a restarting container
2016-01-27 11:43:43 +08:00
Arnaud Porterie
70c5e96cb8
Merge pull request #19604 from Microsoft/jjh/testrename
...
Windows CI: Fix TestRename*
2016-01-26 19:03:31 -08:00
Zhang Wei
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
Lei Jitang
899f1b1870
Daemon: do GetRWLayer after checking if container use the current graph driver
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2016-01-26 20:20:30 -05:00
Tibor Vass
7992b353c0
Merge pull request #19737 from calavera/fix_reload_docs
...
Remove cluster storage advertise from reload.
2016-01-26 17:04:46 -08:00
Arnaud Porterie
3a70ab3a2c
Merge pull request #19688 from crosbymichael/tmpfs-tar
...
Remove tar copy-up for tmpfs mounts
2016-01-26 17:03:07 -08:00
David Calavera
fa163f5619
Remove cluster storage advertise from reload.
...
Because libnetwork won't really send container information to the new
storage anyways.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-01-26 18:19:30 -05:00
Brian Goff
146e49b039
Merge pull request #19671 from calavera/volume-dangling
...
Make volume dangling filter return only used volumes with `dangling=false`.
2016-01-26 17:01:20 -05:00
Michael Crosby
ae8ec4860e
Move tar copy-up for tmpfs mounts
...
We cannot rely on the tar command for this type of operation because tar
versions, flags, and functionality can very from distro to distro.
Since this is in the container execution path it is not safe to have
this as a dependency from dockers POV where the user cannot change the
fact that docker is adding these pre and post mount commands.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2016-01-26 14:00:39 -08:00
Brian Goff
b775efc9bc
Merge pull request #19704 from cpuguy83/speedup_build_cache
...
Use imageStore.Children instead of whole the Map
2016-01-26 16:59:55 -05:00
Brian Goff
1350e8b7b8
Use imageStore.Children instead of whole the Map
...
daemon cache was getting the whole image map and then iterating through
it to find children. This information is already stored in the image
store.
Prior to this change building the docker repo with a full cache took 30
seconds.
After it takes between 15 seconds or less (As low as 9 seconds).
This is an improvement on docker 1.9.1 which hovered around 17 seconds.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-01-26 14:12:56 -05:00
Arnaud Porterie
269a6d7d36
Merge pull request #19705 from mavenugo/18222
...
Vendor libnetwork v0.6.0-rc4 & corresponding changes in engine for port-map sandobx handling.
2016-01-26 09:16:57 -08:00
Aleksa Sarai
4357ed4a73
*: purge dockerinit from source code
...
dockerinit has been around for a very long time. It was originally used
as a way for us to do configuration for LXC containers once the
container had started. LXC is no longer supported, and /.dockerinit has
been dead code for quite a while. This removes all code and references
in code to dockerinit.
Signed-off-by: Aleksa Sarai <asarai@suse.com >
2016-01-26 23:47:02 +11:00
Madhu Venugopal
e38463b277
Move port-mapping ownership closer to Sandbox (from Endpoint)
...
https://github.com/docker/libnetwork/pull/810 provides the more complete
solution for moving the Port-mapping ownership away from endpoint and
into Sandbox. But, this PR makes the best use of existing libnetwork
design and get a step closer to the gaol.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2016-01-26 03:59:03 -08:00
Vincent Demeester
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
Antonio Murdaca
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
Tibor Vass
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
Arnaud Porterie
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
Sebastiaan van Stijn
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
Tibor Vass
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
Tibor Vass
2cb8fdd327
Merge pull request #19673 from aboch/epcs
...
Save endpoint config only if endpoint creation succeeds
2016-01-25 16:50:47 -08:00
David Calavera
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
David Calavera
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
Tibor Vass
f7abff4f81
Merge pull request #19560 from aboch/mn
...
Reject multiple networks on container creation request
2016-01-25 14:57:51 -08:00
Alessandro Boch
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
David Calavera
1431b623a4
Make volume dangling filter return only used volumes with dangling=false.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-01-25 16:26:51 -05:00
Brian Goff
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
Alessandro Boch
cfa515fd9d
Reject multiple networks on container creation
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2016-01-25 12:50:01 -08:00
Brian Goff
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
Tonis Tiigi
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
John Howard
f21fb2162e
Windows CI: Fix TestRename*
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2016-01-23 09:25:10 -08:00
Phil Estes
67d86d10d8
Merge pull request #19216 from scaleoutsean/master
...
Add GPFS filesystem IDs
2016-01-22 21:27:03 -05:00
Qiang Huang
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
David Calavera
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
Brian Goff
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
Phil Estes
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
David Calavera
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
scaleoutsean
bdc8241da9
Add GPFS
...
Signed-off-by: Sean Lee <seanlee@tw.ibm.com >
2016-01-22 21:12:47 +08:00
Vincent Demeester
c91045a78b
Merge pull request #19558 from LK4D4/reduce_cgroup_parsing
...
Refactor sysinfo usage
2016-01-22 11:18:53 +01:00
Jessica Frazelle
bed0bb7d01
move default seccomp profile into package
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2016-01-21 16:55:29 -08:00
Jessica Frazelle
35e50119fc
move default apparmor policy into package
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2016-01-21 16:55:27 -08:00