Commit Graph

4749 Commits

Author SHA1 Message Date
2c020b81f9 Merge pull request #19074 from arun-gupta/couchbase
adding docs for Dockerizing Couchbase service
Upstream-commit: 2b97c9674258e0dc0b36526176b2f2cea85b40fe
Component: engine
2016-01-25 15:46:56 -08:00
93f57e97b4 Fix remove API order in menu
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 42f6e8d40d059c8d53adaada24b400761f42ec5b
Component: engine
2016-01-24 02:48:47 -08:00
c418f65372 Merge pull request #19622 from r4j4h/quick-doc-fix
Correcting `overlay` -> `bridge` driver in run.md
Upstream-commit: 037d159981c8f8d79f8f445df502527e635d525c
Component: engine
2016-01-24 00:42:36 -08:00
f308df2986 Correcting overlay -> bridge driver in run.md
Correcting `overlay` -> `bridge` driver in run.md to match the preceding paragraph.

Signed-off-by: Jasmine Hegman <jasmine@jhegman.com>
Upstream-commit: ae5fce9fe02523e7a43ddd533f645d1a8fb20193
Component: engine
2016-01-24 01:34:04 -07:00
45cae822ec Update aufs-driver.md
fix typo in file path for image layers

Signed-off-by: bjcheny <companycy@gmail.com>
Upstream-commit: ac1eac21c91c1b8395a0356699f58f1d91d0d173
Component: engine
2016-01-24 10:03:29 +08:00
a12671092e Merge pull request #19592 from duglin/Issue15777
Add some helper text for magical ADD
Upstream-commit: bf85a49509ef67eb68a2251928385a221a85254e
Component: engine
2016-01-22 18:27:44 -08:00
a793a1a33c Merge pull request #19596 from Djelibeybi/fix-oracle-install-docs
Updated Oracle Linux install documentation
Upstream-commit: 2d30720c1e2fedca5534e0cc5b0763162f740501
Component: engine
2016-01-22 17:27:42 -08:00
112e739739 Updated Oracle Linux install documentation to be more accurate.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 081bffc1e1ff869a8215b9b8b439d4cb9f6a144a
Component: engine
2016-01-23 12:18:41 +11:00
4749465580 Fixing missing certs article; consolidating security material
Entering comments from reviewers
Updating with Derek's comments
Fixing bad links reported by build

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 4c76c665b73dbd0beb0cb465caa921cbeb1cf61f
Component: engine
2016-01-22 16:44:18 -08:00
44fa01bbec Merge pull request #19517 from calavera/validate_config_keys
Verify that the configuration keys in the file are valid.
Upstream-commit: 34a83f9f2c0516b3c5e7024393487eee54309401
Component: engine
2016-01-22 15:01:29 -05:00
9aa26ba55a 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>
Upstream-commit: 5e80ac0dd183874ab7cd320a8bd0f0378dbd1321
Component: engine
2016-01-22 13:20:17 -05:00
5246f2719a Add some helper text for magical ADD
Closes: #15777

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 8d94a85d62d6945be1217446738d856b3c2e2ddc
Component: engine
2016-01-22 10:13:13 -08:00
4172179211 fixed typo
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com>
Upstream-commit: b0873c2c5009d4b2f758ea49477b55a2b5600c90
Component: engine
2016-01-22 09:27:53 +02:00
d592211a78 adding docs for Dockerizing Couchbase service
cleaning up instructions, removing redundant output

Signed-off-by: Arun Gupta <arun.gupta@gmail.com>

adding the latest feedback

Signed-off-by: Arun Gupta <arun.gupta@gmail.com>
Upstream-commit: e25d47db270e5159528023fee8d7ef14e7ff7c79
Component: engine
2016-01-21 17:58:43 -08:00
a73130b07f 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>
Upstream-commit: ed4038676f09d124180d634ec2cb341745f5fc79
Component: engine
2016-01-21 16:56:12 -05:00
84f68b3062 Merge pull request #19557 from tiborvass/karkhaz-add-dead-to-docker-ps-documentation
Carry 19305: Added `dead` to docs for docker ps -f status=...
Upstream-commit: 45db4fa70eb3d33230e38457fd98b1f5403e70d6
Component: engine
2016-01-21 13:46:51 -08:00
e6386361f9 Added dead to docs for docker ps -f status=...
It is possible to invoke `docker ps -f status=dead`, but the
documentation for docker-ps does not mention `dead` as a valid option.
This commit fixes that.

Signed-off-by: Kareem Khazem <karkhaz@karkhaz.com>
Upstream-commit: 859262a82abb482f54577935dc44c74e135dcd05
Component: engine
2016-01-21 16:44:33 -05:00
c20140ef75 Merge pull request #19540 from A33a/A33a-patch-1
Fixed typo in "/etc/subUid"
Upstream-commit: 5e143d51683027e93169a66475cf28944b031daa
Component: engine
2016-01-21 17:24:29 +01:00
3869ddcbb9 Fixed typo in "/etc/subUid"
Signed-off-by: Azat Khuziyakhmetov <shadow_uz@mail.ru>
Upstream-commit: 935849f17a1aceb2c453e9843322776202cb3092
Component: engine
2016-01-21 12:46:29 +01:00
ff3e96b827 Fix comment about swap limit of docker update
The description "set `-1` to disable swap" is wrong, `build`,
`create` and `run` already fixed, we need to fix `update` as well.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 603bc69b2c3c00714c18e6ddc65bf53c2f1a079d
Component: engine
2016-01-21 13:48:53 +08:00
8e2b976298 Merge pull request #19434 from HackToday/fixmntvolume
Refine the volume mount example
Upstream-commit: 7db58948bf256ae7daf372eed6b996688e4aae40
Component: engine
2016-01-20 20:42:24 -08:00
c9d0008e68 Fix the typo in ps
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: c2b59b03df364901ce51ee485d60fce7e7aaa955
Component: engine
2016-01-21 04:26:49 +00:00
4b5b18fd7e Merge pull request #19485 from HackToday/fixlink
Fix the ulimit link
Upstream-commit: 7915077a38e30496391a0759f08134b8942f8524
Component: engine
2016-01-20 14:53:38 -08:00
f4fc2afe32 Merge pull request #19487 from HackToday/fixcommitcli
Fix commit wrong repository example
Upstream-commit: 048234fcdbc4f3af7e81048bbd2367940f3718ac
Component: engine
2016-01-20 14:45:59 -08:00
d3c651df14 Fix minor doc grammar issues
Signed-off-by: Dave Barboza <dxbarboza@gmail.com>
Upstream-commit: f50d0d7fdb11ce36715adfbf857e4668c0fd8f75
Component: engine
2016-01-20 10:52:21 -05:00
45878e7bdb 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>
Upstream-commit: 3c8042a0cb2253be37303e6d646e96d87cefe0fc
Component: engine
2016-01-20 10:25:41 +00:00
c168cad9b2 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>
Upstream-commit: 8f3c0fdff3846c5d7999c200c69c9d67751acc08
Component: engine
2016-01-20 09:18:20 +00:00
62fe2c147e 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>
Upstream-commit: 9e3c1f260989f8302b29d45fef1a947e6072709c
Component: engine
2016-01-20 06:40:46 +00:00
c2e0bcab00 fix a spelling error of 'dnsmasq'
Signed-off-by: Wenyu You <21551128@zju.edu.cn>
Upstream-commit: 5e450bc5df9b59ea5b1fcee2b12b30669fb8ceff
Component: engine
2016-01-20 06:12:22 +00:00
b6ea559472 Merge pull request #19437 from HackToday/fixulimit
Fix ulimit command form
Upstream-commit: 05e36d254f4310a93df7f5818e85721c3e180d91
Component: engine
2016-01-19 10:26:02 +01:00
53e905757e Merge pull request #19436 from HackToday/fixhostdev
Fix add host device example
Upstream-commit: 25f4f7151221d6a0ebb9185c03cef812ac24825d
Component: engine
2016-01-19 10:25:08 +01:00
0028abf222 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>
Upstream-commit: 98e5a8efcc390d2b5de18049e3227db7a257c232
Component: engine
2016-01-19 07:44:58 +00:00
debdc9b3c1 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>
Upstream-commit: 62b525f75dbdb78f8ae7ee7f6b2cac2d262dc4dd
Component: engine
2016-01-19 07:00:58 +00:00
d68b8b9b1f Fix the privileged example
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 3cc5550003c0b11db572f64c9fc801cde0c7447a
Component: engine
2016-01-19 06:41:49 +00:00
b8f7499a3b 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>
Upstream-commit: 105778343a2e5d510fae1cbdb1b7ab6879e5a028
Component: engine
2016-01-16 18:45:41 +01:00
c5ac81d906 Merge pull request #19041 from Akasurde/11556
Updated documentation related to apt-cacher-ng
Upstream-commit: c476b2e3b5dd480a2b886ec4c20950c0e22fb3e7
Component: engine
2016-01-15 22:44:46 +01:00
cd32dc3773 Bump API Version to v1.23
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: a0fab35fe80f201fc40477a32a992f6cd931cf44
Component: engine
2016-01-15 10:44:02 -05:00
89c24617af Merge pull request #19234 from jdoliner/patch-1
Remove Pachyderm storage driver.
Upstream-commit: 9b630197111fabedd3e382eb94812ecba0435be7
Component: engine
2016-01-15 12:48:42 +01:00
ec621875ef Remove Pachyderm storage driver.
Signed-off-by: Joe Doliner <jdoliner@gmail.com>
Upstream-commit: 5063efb8d84aac9f7e11cbfe41ac3dbd264cb1b9
Component: engine
2016-01-15 02:06:20 -08:00
819b85bb3a 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>
Upstream-commit: 5cc672b0061f3df41073cb7b4ff962998a13a09c
Component: engine
2016-01-15 10:03:29 +08:00
b7e519041b Merge pull request #19122 from ajneu/master
documentation: debian/ubuntu need apt-transport-https ca-certificates
Upstream-commit: 954613fb248ee31ed1a919f72153eb43268f2c30
Component: engine
2016-01-14 16:53:08 -08:00
25aab1428e Merge pull request #18587 from calavera/daemon_configuration_file
Allow to set daemon and server configurations in a file.
Upstream-commit: e44364eae90784b423eee8b2969bda9cd2429746
Component: engine
2016-01-14 16:44:58 -08:00
95dbab54f7 Merge pull request #18452 from moxiegirl/carrry-doc-17989
Update security docs for seccomp/apparmor
Upstream-commit: 9539c0a4022857f7d317894e24a0694f4b62bbaf
Component: engine
2016-01-14 14:42:37 -08:00
e168bb6f35 Merge pull request #19346 from albers/completion-detach-keys
Completion and docs update for --detach-keys
Upstream-commit: 33a06a7f05ce660ab307f5b392a2abad96748566
Component: engine
2016-01-14 14:40:44 -08:00
198f38f301 Document that detach keys are a list of key bindings
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3bf821054e1d7681ae76ec3dbba8ea81f4dc5adf
Component: engine
2016-01-14 13:58:41 -08:00
90c89012d1 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>
Upstream-commit: 61553fc2f538a7fe8f83e6b41a93722b5c61d374
Component: engine
2016-01-14 13:58:37 -08:00
1a8f320266 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>
Upstream-commit: 677a6b3506107468ed8c00331991afd9176fa0b9
Component: engine
2016-01-14 16:44:37 -05:00
57bedb0b2d Merge pull request #17316 from rmb938/ipam_conf_options
Add IPAM Config Options to match libnetwork
Upstream-commit: e35f5a481ac5c982c4f97be5dc41206e21e19007
Component: engine
2016-01-14 16:30:03 -05:00
f8714c52f0 Add IPAM Config Options to match libnetwork
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
Upstream-commit: 662cac08ef83ee105addb4d29f6e46188468306f
Component: engine
2016-01-14 14:32:25 -05:00
082c746378 Merge pull request #19242 from mavenugo/nsalias
Network scoped alias support
Upstream-commit: 73a5393bf3530815a608725fe2546121ccadbfe4
Component: engine
2016-01-14 10:58:51 -08:00