centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-13 06:46:36 +07:00
Code Issues Packages Projects Releases Wiki Activity
13,920 Commits 57 Branches 28 Tags
ca6512acba714fb3e44849f6ffb5e4cf7b9593b8
Commit Graph

1062 Commits

Author SHA1 Message Date
Jessie Frazelle
5a239c0022 Merge pull request #11507 from crosbymichael/container-state 
Cleanup libcontainer container state
 2015-03-19 16:02:24 -07:00
Michael Crosby
455a272aef Merge pull request #11428 from vishh/parent-cgroup 
Adding '--cgroup-parent' option.
 2015-03-19 14:41:57 -07:00
Michael Crosby
2b12b099b8 Mount libcontainer state dir in tmpfs 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-19 14:27:17 -07:00
Michael Crosby
06c939e527 Ensure the container state is removed on daemon boot 
This ensures that the libcontainer state is fully removed for a
container after it is terminated.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-19 14:21:19 -07:00
Mrunal Patel
60ef4ae6fc Update libcontainer to 4a72e540feb67091156b907c4700e580a99f5a9d 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-03-19 14:42:23 -04:00
Alexander Morozov
d338c613bf Merge pull request #11459 from simonswine/10001-ipv6-tests 
[WiP] Adds testing for bridge's IPv6 support
 2015-03-19 08:37:28 -07:00
Tibor Vass
fdf49d758f Merge pull request #11274 from MabinGo/selinux_enable_verify 
Add logs when Docker enabled selinux (closes #11197)
 2015-03-19 10:34:55 -04:00
Phil Estes
9d5eab1873 Merge pull request #11453 from duglin/HideDaemonDots 
Hide dots on daemon startup when loglevel != info
 2015-03-19 10:10:18 -04:00
Vishnu Kannan
0b1e2b5a55 Adding '--cgroup-parent' flag to docker run. This feature helps users implement more complex 
resource isolation policies on top of what native docker provides.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2015-03-19 02:34:15 +00:00
Mabin
1bf529a456 Add logs when Docker enabled selinux 
Signed-off-by: Mabin <bin.ma@huawei.com>
 2015-03-19 09:46:53 +08:00
Jessie Frazelle
474f58e2e7 Merge pull request #11471 from LK4D4/wait_for_copier 
Wait for copier finishing it's work before closing logger
 2015-03-18 15:41:12 -07:00
Jessie Frazelle
e1a0bff6b8 Merge pull request #11474 from crosbymichael/null-masked-paths 
Do not mask /proc/kcore in privileged
 2015-03-18 14:43:13 -07:00
Michael Crosby
f4a458e67f Do not mask /proc/kcore in privileged 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-18 14:17:21 -07:00
Alexander Morozov
b6a42673ab Wait for copier finishing it's work before closing logger 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-18 13:48:01 -07:00
Alexander Morozov
bd8661e8fa Protect jsonfilelog writes with mutex 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-18 13:00:53 -07:00
Christian Simon
4307ec283b [WiP] Adds testing for bridge's IPv6 support 
* fixes #10001
* test for global subnets <= 80
* test for global subnets > 80
* test link local allocations
* test duplicated addresses
* test regression from bug #11427

Signed-off-by: Christian Simon <simon@swine.de>
 2015-03-18 08:51:14 +01:00
Alexander Morozov
cf071bb962 Merge pull request #11450 from crosbymichael/rlimitfix 
Don't hardcode default rlimit
 2015-03-17 20:27:05 -07:00
Jessie Frazelle
a5269223a7 Merge pull request #11320 from estesp/fix-daemon-startup 
Fix daemon shutdown on error after rework of daemon startup
 2015-03-17 19:04:25 -07:00
Doug Davis
88dc6cc2df Hide dots on daemon startup when loglevel != info 
When the deamon starts up with log level set to INFO it will show something
like this:
```
INFO[0000] Loading containers: start.
................................................................
INFO[0000] Loading containers: done.
```
where the dots represent containers in the system.
When you run with log level set to "error" it will still show the dots
w/o the "Loading..." lines before and after which looks really odd.
This PR will fix it so that the dots are only shown IFF the "Loading..."
lines are also shown

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-17 17:27:53 -07:00
Michael Crosby
f5a154f2d2 Don't hardcode default rlimit 
The default for rlimit handling should be to inherit the rlimit of the
daemon unless explicitly set.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-17 16:04:15 -07:00
Phil Estes
459e58ffc9 Fix daemon shutdown on error after rework of daemon startup 
Currently the daemon will not stop on error because the serve API job is
blocking the channel wait for daemon init.  A better way is to run the
blocking serve API job as a goroutine and make sure that error
notification gets back to the main daemon thread (using the already
existing channel) so that clean shutdown can occur on error.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-03-17 14:15:00 -04:00
Vishnu Kannan
39d49ba7ba Reduce logging level from error to warning if "/proc/sys/net/ipv4/ip_local_port_range" proc file in not accessible. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2015-03-17 17:39:17 +00:00
Arnaud Porterie
1ff5a91007 Merge pull request #10568 from LK4D4/logging_drivers 
Logging drivers
 2015-03-17 09:45:58 -07:00
Arnaud Porterie
cb77ad4757 Merge pull request #11369 from coolljt0725/fix_link 
Fix --link to a container which net mode is container
 2015-03-17 08:36:33 -07:00
Alexander Morozov
8685af0b13 Merge pull request #11401 from Mashimiao/11385-fix-lxc-conf-error 
fix not show error when using --lxc-conf without lxc driver
 2015-03-17 08:35:18 -07:00
Lei Jitang
82e2e1a11a Fix --link to a container which net mode is container mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-03-17 07:50:12 -07:00
Andy Goldstein
a2b0c9778f Add ability to refer to image by name + digest 
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
 2015-03-17 10:10:42 +00:00
Arnaud Porterie
b6ac111abf Merge pull request #9882 from ibuildthecloud/labels 
Proposal: One Meta Data to Rule Them All => Labels
 2015-03-16 20:20:05 -07:00
Ma Shimiao
703cab12e7 fix not show error when using --lxc-conf without lxc driver 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-03-17 08:50:17 +08:00
Jessie Frazelle
87a8658eb6 Merge pull request #11353 from mrunalp/override_default_mounts 
Filter out default mounts that are being overriden by the user.
 2015-03-16 16:40:32 -07:00
Jessie Frazelle
213be9ee27 Merge pull request #11427 from LK4D4/fix_alloc_ip6 
Fix IPv6 autoallocation from mac with --ipv6-cidr
 2015-03-16 16:38:46 -07:00
Michael Crosby
88f437d6c6 Merge pull request #11402 from miminar/err-cleanup 
Error formatting cleanups
 2015-03-16 16:13:16 -07:00
Mrunal Patel
7804cd36ee Filter out default mounts that are override by user. 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-03-16 18:39:50 -04:00
Alexander Morozov
491f8ab144 Fix IPv6 autoallocation from mac with --ipv6-cidr 
We used slice globalIPv6Network.IP itself, not its copy as expected.

Fixes #10774

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-16 15:36:50 -07:00
Michael Crosby
a2fcae41ef Merge pull request #11343 from hqhq/hq_fix_panic_error 
fix panic error when docker stats a stopped container
 2015-03-16 15:16:03 -07:00
Phil Estes
1705ded1d2 Merge pull request #10792 from larsks/bug/10781 
fix various problems with iptables.Exists
 2015-03-16 17:39:36 -04:00
Michael Crosby
0c2eb5ebfb Merge pull request #11295 from LK4D4/oom_after_dead 
Check oom status after container stopped in lxc driver
 2015-03-16 14:16:47 -07:00
Lars Kellogg-Stedman
3559b4177e fix various problems with iptables.Exists 
This modifies iptables.Exists so that it must be called with an explicit
table and chain.  This allows us (a) to generate an appropriate command
line for "iptables -C", which was not previously possible, and (b) it
allows us to limit our strings.Contains() search to just the table and
chain in question, preventing erroneous matches against unrelated rules.

Resolves #10781

Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
 2015-03-16 17:14:45 -04:00
Alexander Morozov
6485d885a0 Merge pull request #11323 from delftswa2014/utils-daemon-windows 
Make utils_daemon and volumes.go cross-platform compileable (Windows).
 2015-03-16 12:14:30 -07:00
Qiang Huang
8dc5791f73 fix panic error when docker stats a stopped container 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-03-16 19:55:34 +08:00
Michal Minar
210ab030bc Format error by value 
- Use `%v` verb to format errors.
- Give `param` constant in portallocator some better name.

Signed-off-by: Michal Minar <miminar@redhat.com>
 2015-03-16 12:05:53 +01:00
Rik Nijessen
1ec2eac50d Make utils_daemon and volumes cross-platform compileable. 
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
 2015-03-16 11:46:07 +01:00
Arnaud Porterie
82f390e139 Merge pull request #11076 from hqhq/hq_use_warning_in_sysinfo 
use type WARN for warning
 2015-03-15 21:13:23 -07:00
Arnaud Porterie
bc7d1d6ef3 Merge pull request #10298 from hqhq/hq_move_resource_to_hostconfig 
move resource options from Config to hostConfig
 2015-03-15 17:30:46 -07:00
Alexander Morozov
02c1dd899a Merge pull request #10238 from miminar/ephemeral-port-range-allocation 
Use system's ephemeral port range for port allocation
 2015-03-13 15:18:05 -07:00
Alexander Morozov
bdf3a0295d Fail docker logs on all logging drivers apart from 'json-file' 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-13 15:02:09 -07:00
Alexander Morozov
47a6afb93f Default 'json-file' logging driver and none logging driver 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-13 12:13:21 -07:00
Alexander Morozov
14887e2e1f Interface Logger for logging drivers 
Also there is aux datastructure Copier which can copy lines from streams
to Loggers

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-13 11:46:59 -07:00
Darren Shepherd
abb5e9a077 Set labels on container create 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-03-13 10:02:04 -07:00
Michal Minar
40d5406371 Pass buffered file reader to Fscanf instead of string reader 
Unless `file` is wrapped with buffered reader, `fmt.Fscanf` will read
just one byte and terminate with `EOF`.

Signed-off-by: Michal Minar <miminar@redhat.com>
 2015-03-13 09:40:53 +01:00