0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19972 commits 14 branches 412 tags 338 MiB
Commit graph

375 commits

Author SHA1 Message Date
Michael Crosby
104dab87ea Merge pull request #17478 from vdemeester/pr-13921 
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
 2015-11-17 15:44:57 -08:00
Alexander Morozov
f18d5da6a7 Merge pull request #17300 from kunalkushwaha/plugin-info 
Patch for Plugin drivers in docker info
 2015-11-17 10:46:29 -08:00
Alexander Morozov
a3065fa48f Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels 
Allow configurable metadata for Splunk log driver
 2015-11-16 10:11:27 -08:00
Kunal Kushwaha
aa7fd884e6 Supported added for reterving Plugin list for Network and Volume. 
Also, plugin information in docker info output.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2015-11-16 15:28:09 +09:00
Zhang Kun
82ba25bea9 fix doc 
Signed-off-by: Zhang Kun <zkazure@gmail.com>

fix doc

Signed-off-by: Zhang Kun <zkazure@gmail.com>
 2015-11-15 23:32:40 +08:00
Vincent Demeester
49779b674a Add pkg/parsers/architecture and pkg/platform 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-14 23:03:02 +01:00
Olle Jonsson
4e8fcd4002 /info: Add keys Architecture, OSType 
- introduces Swarm-relevant keys, see #13634
  - docs updated

Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com>
 2015-11-14 22:21:45 +01:00
Alexander Morozov
f5e318a17b Merge pull request #17090 from duglin/dockerignoreWildcards 
Support multi-dir wildcards in .dockerignore
 2015-11-13 14:29:34 -08:00
Doug Davis
eddb14a44e Support multi-dir wildcards in .dockerignore 
Closes #13113

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-11-13 13:44:07 -08:00
Alexander Morozov
cccf674943 Merge pull request #16873 from coolljt0725/expand_docker_info 
Add more cgroup config to docker info
 2015-11-13 09:37:06 -08:00
Sebastiaan van Stijn
02bc514fb8 Merge pull request #17912 from thaJeztah/fix-docs-for-docker-logs 
docs: update supported drivers for docker logs
 2015-11-13 07:37:47 +01:00
Vincent Demeester
812a1c149a Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device 
Add support for blkio.weight_device
 2015-11-12 20:42:13 +01:00
Denis Gladkikh
26855c7801 Allow configurable metadata for Splunk log driver 
Add support of `tag`, `env` and `labels` for Splunk logging driver.
Removed from message `containerId` as it is the same as `tag`.

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
 2015-11-12 06:36:51 -08:00
Sven Dowideit
9c6e3396ef Merge pull request #17631 from sallyom/docker-login-non-root 
clarify docker login
 2015-11-12 22:39:35 +10:00
Sally O'Malley
f9657819cd docker-login man/doc add security info 
Signed-off-by: Sally O'Malley <somalley@redhat.com>
 2015-11-12 07:25:35 -05:00
Sebastiaan van Stijn
f2705fa6ed docs: fix link to "run reference" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-11-12 12:38:46 +01:00
moxiegirl
40ed821d2e Merge pull request #17388 from vikstrous/notary_docs 
more notary documentation
 2015-11-11 20:07:55 -08:00
Viktor Stanchev
e869e8aa3d more notary documentation 
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>
 2015-11-11 19:56:10 -08:00
Anusha Ragunathan
2b766a455c Include xfsprogs in build environment. 
devmapper uses xfs by default now. So include xfsprogs in build
environment. Also update docs to reflect the new default.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2015-11-11 14:42:08 -08:00
Sebastiaan van Stijn
3e9543fc61 docs: update supported drivers for docker logs 
The journald driver also supports docker logs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-11-11 20:47:42 +01:00
Ma Shimiao
0fbfa1449d Add support for blkio.weight_device 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-11-11 23:06:36 +08:00
John Howard
2d87dd5c6e Removing made up word 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-10 14:37:23 -08:00
Sebastiaan van Stijn
d4c4557b1a Merge pull request #17613 from Microsoft/10662-isolationexecopt 
Windows: Add default isolation exec driver option
 2015-11-10 19:55:46 +00:00
John Howard
a429ad1e35 Windows: Add default isolation exec driver option 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-10 11:39:05 -08:00
Sebastiaan van Stijn
2f1865ae0e Merge pull request #17778 from tophj-ibm/link-fixes 
Fixed broken links in docker_remote_api
 2015-11-10 19:17:17 +00:00
Kai Qiang Wu(Kennan)
a874ce08f3 Fixing wrong volume doc format 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2015-11-09 02:17:50 -06:00
Sebastiaan van Stijn
fdc8cce070 Merge pull request #16742 from runcom/10772-docker-stats-all 
Allow docker stats without arguments
 2015-11-07 19:41:03 +00:00
Antonio Murdaca
ae818a820f Allow docker stats without arguments 
This patch adds the ability to run `docker stats` w/o arguments and get
statistics for all running containers by default. Also add a new
`--all` flag to list statistics for all containers (like `docker ps`).
New running containers are added to the list as they show up also.
Add integration tests for this new behavior.
Docs updated accordingly. Fix missing stuff in man/commandline
reference for `docker stats`.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-07 17:03:33 +01:00
Christopher Jones
93939c3f9f Fixed broken links in docker_remote_api 
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2015-11-06 16:12:51 -06:00
Sebastiaan van Stijn
7a2669f596 Merge pull request #17610 from thaJeztah/add-env-example 
Add examples for ENV vars in API
 2015-11-06 01:19:58 +01:00
Solomon Hykes
2519f46550 Merge pull request #17700 from calavera/remove_lxc 
Remove LXC support.
 2015-11-05 15:22:37 -08:00
David Calavera
157b66ad39 Remove exec-driver global daemon option. 
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-11-05 17:09:58 -05:00
David Calavera
3b5fac462d Remove LXC support. 
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-11-05 17:09:57 -05:00
Brian Goff
9465d6ee6a Merge pull request #17534 from Microsoft/10662-filterhyperv 
Windows: Add isolation to ps filter
 2015-11-05 15:55:47 -05:00
John Howard
9c5814171c Windows: Add isolation to ps filter 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-05 10:18:24 -08:00
Sebastiaan van Stijn
1ef3b1f857 Merge pull request #17694 from hrldcpr/patch-1 
fix documentation inconsistency for volume create
 2015-11-05 01:16:09 +01:00
Sally O'Malley
41de7a18d8 Change 'docker run' exit codes to distinguish docker/contained errors 
The purpose of this PR is for users to distinguish Docker errors from
contained command errors.
This PR modifies 'docker run' exit codes to follow the chroot standard
for exit codes.
Exit status:
125 if 'docker run' itself fails
126 if contained command cannot be invoked
127 if contained command cannot be found
the exit status otherwise

Signed-off-by: Sally O'Malley <somalley@redhat.com>
 2015-11-04 15:18:50 -05:00
harold cooper
f67da614e9 fix documentation inconsistency for volume create 
the example command uses `/world` but the description refers to `/src`

Signed-off-by: Harold Cooper <hrldcpr@gmail.com>
 2015-11-04 13:22:53 -05:00
Madhu Venugopal
39dfc536d4 Updating networking docs with technical information 
- the /etc/hosts read caveat due to dynamic update
- information about docker_gwbridge
- Carries and closes #17654
- Updating with last change by Madhu
- Updating with the IPAM api 1.22

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-11-03 08:42:40 -08:00
Sebastiaan van Stijn
43ae13742d Merge pull request #17650 from thaJeztah/fix-api-network-output 
docs: update remote API responses and minor fixes
 2015-11-03 16:09:01 +01:00
Sebastiaan van Stijn
286fe69d53 docs: update remote API responses and minor fixes 
Add back the "old" networksettings fields that were removed,
but added back to maintain backward compatibility, in
https://github.com/docker/docker/pull/17538

Update network endpoint responses, with updated response
introduced in;
https://github.com/docker/docker/pull/17536

Added changes to v1.22 that were applied to the v1.21 / v1.20 docs
after the API bump(s);

https://github.com/docker/docker/pull/17085
https://github.com/docker/docker/pull/17127
https://github.com/docker/docker/pull/13707

Also fixed some mixed tab/spaces indentation
and Markdown formatting issues (causing code-blocks to
be rendered incorrectly)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-11-03 15:24:31 +01:00
Mary Anthony
0f1083c8da Fixing ZooKeeper and some other nits Nathan found 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-11-03 05:34:54 -08:00
Mary Anthony
9ef855f9e5 First pass at consolidating 
Removing old networking.md
Updating dockernetworks.md with images
Adding information on network plugins
Adding blurb about links to docker networking
Updating the working documentation
Adding Overlay Getting Started
Downplaying links by removing refs/examples, adding refs/examples for network.
Updating getting started to reflect networks not links
Pulling out old network material
Updating per discussion with Madhu to add Default docs section
Updating with bridge default
Fix bad merge
Updating with new cluster-advertise behavior
Update working and NetworkSettings examples
Correcting example for default bridge discovery behavior
Entering comments
Fixing broken Markdown Syntax
Updating with comments
Updating all the links

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-11-02 21:14:55 -08:00
Sebastiaan van Stijn
e41de3e631 Add examples for ENV vars in API 
As discussed in https://github.com/docker/docker/issues/16623,
the API calls for setting ENV-vars lacked an actual example.

This PR adds some examples to the API calls.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-11-02 17:44:31 +01:00
moxiegirl
e2e2ea401a Merge pull request #17591 from moxiegirl/remove-old-api 
Remove old api docs that are no-longer appearing on docs-docker.com
 2015-11-01 12:30:58 -08:00
Mary Anthony
d2382f7b96 Remove old api docs that are no-longer appearing on docs-docker.com 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-11-01 08:22:10 -08:00
Mary Anthony
e4d86c2c38 Update to hide the 1.10 material 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-11-01 08:03:08 -08:00
Mary Anthony
5ce093e945 Fixing broken links 
Fixing the weight

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-10-31 19:45:56 -07:00
moxiegirl
f714118439 Merge pull request #17447 from ehaydenr/master 
Update kill.md
 2015-10-30 10:07:44 -07:00
Tibor Vass
c545dce004 Merge pull request #16640 from samuelkarp/awslogs-logging-driver 
[awslogs] Auto-detect region and set user-agent
 2015-10-30 12:38:40 -04:00