centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-27 22:38:54 +07:00
Code Issues Packages Projects Releases Wiki Activity
21,488 Commits 54 Branches 28 Tags
5537a92e450ea56e2002f83ff50bb70fdb2cc25e
Commit Graph

4729 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
7db58948bf Merge pull request #19434 from HackToday/fixmntvolume 
Refine the volume mount example
 2016-01-20 20:42:24 -08:00
Kai Qiang Wu(Kennan)
c2b59b03df Fix the typo in ps 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-21 04:26:49 +00:00
David Calavera
7915077a38 Merge pull request #19485 from HackToday/fixlink 
Fix the ulimit link
 2016-01-20 14:53:38 -08:00
Sebastiaan van Stijn
048234fcdb Merge pull request #19487 from HackToday/fixcommitcli 
Fix commit wrong repository example
 2016-01-20 14:45:59 -08:00
Dave Barboza
f50d0d7fdb Fix minor doc grammar issues 
Signed-off-by: Dave Barboza <dxbarboza@gmail.com>
 2016-01-20 10:52:21 -05:00
Kai Qiang Wu(Kennan)
3c8042a0cb Fix commit wrong repository example 
The old name is invalid in new repository name spec.
So we need to fix them.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-20 10:25:41 +00:00
Kai Qiang Wu(Kennan)
8f3c0fdff3 Fix the ulimit link 
The old link not existed, we need fix it the right one.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-20 09:18:20 +00:00
Kai Qiang Wu(Kennan)
9e3c1f2609 Refine the volume mount example 
The path here should be absolute, else it would
deem it as volume name.

Also link to release page to contain static binary,
the old link not work, because it is just used to
install docker in os distro, it can not be used
as static binary directly.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-20 06:40:46 +00:00
Wenyu You
5e450bc5df fix a spelling error of 'dnsmasq' 
Signed-off-by: Wenyu You <21551128@zju.edu.cn>
 2016-01-20 06:12:22 +00:00
Vincent Demeester
05e36d254f Merge pull request #19437 from HackToday/fixulimit 
Fix ulimit command form
 2016-01-19 10:26:02 +01:00
Vincent Demeester
25f4f71512 Merge pull request #19436 from HackToday/fixhostdev 
Fix add host device example
 2016-01-19 10:25:08 +01:00
Kai Qiang Wu(Kennan)
98e5a8efcc Fix ulimit command form 
The ulimit is builtin, so we need shell form to execute it.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-19 07:44:58 +00:00
Kai Qiang Wu(Kennan)
62b525f75d Fix add host device example 
The example is not right in parameter, and also
one command is same as first one, it should be typo
before, we should use 'rw' as example for that.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-19 07:00:58 +00:00
Kai Qiang Wu(Kennan)
3cc5550003 Fix the privileged example 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-19 06:41:49 +00:00
Candid Dauth
105778343a Set TasksMax in addition to LimitNPROC in systemd service files 
systemd sets an additional limit on processes and threads that defaults to 512 when run under Linux >= 4.3.
See more information here: http://unix.stackexchange.com/a/255603/59955

Signed-off-by: Candid Dauth <cdauth@cdauth.eu>
 2016-01-16 18:45:41 +01:00
Vincent Demeester
c476b2e3b5 Merge pull request #19041 from Akasurde/11556 
Updated documentation related to apt-cacher-ng
 2016-01-15 22:44:46 +01:00
Tibor Vass
a0fab35fe8 Bump API Version to v1.23 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-01-15 10:44:02 -05:00
Vincent Demeester
9b63019711 Merge pull request #19234 from jdoliner/patch-1 
Remove Pachyderm storage driver.
 2016-01-15 12:48:42 +01:00
Joe Doliner
5063efb8d8 Remove Pachyderm storage driver. 
Signed-off-by: Joe Doliner <jdoliner@gmail.com>
 2016-01-15 02:06:20 -08:00
Wen Cheng Ma
5cc672b006 Add Subnets info for user-defined network 
* If user doesn't specify the subnets to create a network, it will pick
  subnets from inside preferred pool. This PR aims to inspect these subnets info

* Add integration tests for docker inspect the subnets.

* docker-py project is already synchronized.

* jenkins checks depend on https://github.com/docker/docker-py/pull/888

Fixes issue #18626

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-15 10:03:29 +08:00
Sebastiaan van Stijn
954613fb24 Merge pull request #19122 from ajneu/master 
documentation: debian/ubuntu need apt-transport-https ca-certificates
 2016-01-14 16:53:08 -08:00
Sebastiaan van Stijn
e44364eae9 Merge pull request #18587 from calavera/daemon_configuration_file 
Allow to set daemon and server configurations in a file.
 2016-01-14 16:44:58 -08:00
Sebastiaan van Stijn
9539c0a402 Merge pull request #18452 from moxiegirl/carrry-doc-17989 
Update security docs for seccomp/apparmor
 2016-01-14 14:42:37 -08:00
Arnaud Porterie
33a06a7f05 Merge pull request #19346 from albers/completion-detach-keys 
Completion and docs update for --detach-keys
 2016-01-14 14:40:44 -08:00
Harald Albers
3bf821054e Document that detach keys are a list of key bindings 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-01-14 13:58:41 -08:00
Jessica Frazelle
61553fc2f5 WIP: Update security docs for seccomp/apparmor 
Signed-off-by: Mary Anthony <mary@docker.com>

Updaing and slight re-arrangement of security information

Signed-off-by: Mary Anthony <mary@docker.com>

Updating security files

Signed-off-by: Mary Anthony <mary@docker.com>

Updating links to the security documentation

Signed-off-by: Mary Anthony <mary@docker.com>

removing some extra spaces

Signed-off-by: Mary Anthony <mary@docker.com>

Correcting spelling

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-01-14 13:58:37 -08:00
David Calavera
677a6b3506 Allow to set daemon and server configurations in a file. 
Read configuration after flags making this the priority:

1- Apply configuration from file.
2- Apply configuration from flags.

Reload configuration when a signal is received, USR2 in Linux:

- Reload router if the debug configuration changes.
- Reload daemon labels.
- Reload cluster discovery.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-14 16:44:37 -05:00
Tibor Vass
e35f5a481a Merge pull request #17316 from rmb938/ipam_conf_options 
Add IPAM Config Options to match libnetwork
 2016-01-14 16:30:03 -05:00
Ryan Belgrave
662cac08ef Add IPAM Config Options to match libnetwork 
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
 2016-01-14 14:32:25 -05:00
David Calavera
73a5393bf3 Merge pull request #19242 from mavenugo/nsalias 
Network scoped alias support
 2016-01-14 10:58:51 -08:00
Madhu Venugopal
dda513ef65 Network scoped alias support 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-14 08:44:41 -08:00
Wen Cheng Ma
9f676ade0a Add network ID to container inspect 
Fixes issue #19089

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-14 22:33:41 +08:00
Vincent Demeester
851c94db1b Merge pull request #19317 from mavenugo/epforce 
Forced endpoint cleanup
 2016-01-14 14:21:30 +01:00
Vincent Demeester
0ed2e26f51 Merge pull request #19157 from wenchma/update_build_bridges 
Update the doc of build-bridges.md
 2016-01-14 11:10:37 +01:00
Vincent Demeester
ec143968de Merge pull request #19286 from aboch/ipdocs 
Add missing documentation for static IP options
 2016-01-14 11:00:09 +01:00
Vincent Demeester
63525a6dc5 Merge pull request #19252 from HackToday/fix-vol-resp-doc 
Update response content for volume mounts
 2016-01-14 09:15:13 +01:00
Kai Qiang Wu(Kennan)
0e8d41272c Remove wrong lxc support 
Docker master branch not support lxc, so it seems not proper to
say that anymore.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-14 07:23:04 +00:00
Madhu Venugopal
b464f1d78c Forced endpoint cleanup 
docker's network disconnect api now supports `Force` option which can be
used to force cleanup an endpoint from any host in the cluster.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-13 21:28:52 -08:00
Alessandro Boch
ee14232647 Add missing documentation for static IP options 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-13 14:53:14 -08:00
Sebastiaan van Stijn
661d75f398 Merge pull request #19123 from shishir-a412ed/rootfs_size_configurable 
daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
 2016-01-13 13:22:08 -08:00
Tibor Vass
612cf0f172 Merge pull request #19279 from tiborvass/rename-authz-to-authorization 
Rename authz to authorization for greater clarity
 2016-01-13 14:30:18 -05:00
Tibor Vass
5c630ea7c3 Rename authz to authorization for greater clarity 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-01-13 14:15:37 -05:00
Shishir Mahajan
e47112d3e8 daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2016-01-13 13:57:31 -05:00
Chun Chen
b70954e60a Add network interal mode 
Signed-off-by: Chun Chen <ramichen@tencent.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-13 11:30:36 -05:00
Antonio Murdaca
a79f96828f Merge pull request #19249 from calavera/carry_17414 
[Carry 17414] Added additional container information to "docker info".
 2016-01-13 10:42:22 +01:00
Kai Qiang Wu(Kennan)
6a04ecf813 Update response content for volume mounts 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-01-13 03:48:14 +00:00
Sebastiaan van Stijn
47d87d3b92 Merge pull request #19229 from mavenugo/udlinks 
Local alias support
 2016-01-12 16:47:32 -08:00
David Calavera
e5edc168a6 Complete documentation about extra container information. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-12 18:16:58 -05:00
David Calavera
c0c66c57b2 Merge pull request #19170 from aaronlehmann/delete-prune-digests 
Prune digest references when deleting by tag
 2016-01-12 15:15:36 -08:00
Madhu Venugopal
2aa5f33b20 Docs update for link functionality in user-defined networks 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-12 13:38:48 -08:00