Commit Graph

3030 Commits

Author SHA1 Message Date
299b14d7b4 Merge pull request #10898 from noironetworks/Fixing-docs-for-docker-ps-filter
Added missing documentation for PR #8543
Upstream-commit: 573e2484a5017385d645a11de29f9c9e7e207c5b
Component: engine
2015-02-19 17:19:09 -08:00
d5362cffa1 Merge pull request #10468 from noironetworks/10457-Pause-and-unpause-accept-multi-containers
Allow docker pause and unpause to accept multiple containers
Upstream-commit: 934535db9c78b20481c8ccabdf174926c6e04d4d
Component: engine
2015-02-19 15:16:05 -08:00
0385663f68 Merge pull request #10818 from estesp/link-add-aliases
Upstream-commit: 356fe89d2431bd54f38b3477aa91ef276f65ffb7
Component: engine
2015-02-19 17:22:53 -05:00
c4aef2a226 Add linked container's name and hostname as aliases to /etc/hosts
Currently when containers are linked the alias name (e.g. from `--link
name:alias`) is added to the parent container's `/etc/hosts` with a
reference to the IP of the linked container.  Some software requires
using the official hostname or node name in operations that need to
match on those values, and it is therefore helpful if the parent
container can refer to the child/link using those same values and still
access the same IP.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 16aa64dc82b6434ec78878fa35eb96e4983b46f8
Component: engine
2015-02-19 14:19:38 -08:00
caf4b888be Added missing documentation for PR #8543
Added more examples and functionalities for docker ps documentation

Signed-off-by: André Martins <martins@noironetworks.com>
Upstream-commit: 401e93bbb9b4bd682234f0ebca59aa83bfbe3f2e
Component: engine
2015-02-19 22:05:14 +00:00
0e10254635 Merge pull request #10722 from SvenDowideit/takeover-10710
added -extfile to server certificate documentation
Upstream-commit: ff2f1904c99ee907feb62c646ed1f047a47ac27a
Component: engine
2015-02-19 13:17:17 -08:00
b3d291c64f Merge pull request #10835 from jfrazelle/port-ranges
Upstream-commit: 1875cc2ef42787375055710fc6b359ca3dd85752
Component: engine
2015-02-19 16:11:59 -05:00
5dbf793edd Merge pull request #10751 from estesp/10701-update-ipv6-docs
Update IPv6 docs with modern `ip` command use + `sysctl`
Upstream-commit: 72e66136ee089c607552246b60a4bda677679ace
Component: engine
2015-02-19 12:59:42 -08:00
7eeecba437 Merge pull request #10619 from bcicen/add-logpath-to-inspect-container
Add logpath to inspect container
Upstream-commit: dc37358d8c9b177a050620731cf3b7f247a26f78
Component: engine
2015-02-19 12:56:45 -08:00
5198061b5e Merge pull request #10881 from shishir-a412ed/cpu-shares-manpage
man page description for `-c/--cpu-shares` flag for `docker run` command.
Upstream-commit: d6660ad605861e781ddbf0fd4228aa565ea7425b
Component: engine
2015-02-19 11:40:04 -08:00
b3d6568e35 Update IPv6 docs with modern ip command use + sysctl
Fixes: #10701

Updates the IPv6 documentation and images to reflect the more modern
`ip -6` command set versus `route` and `ifconfig`.  Also removes the
use of the special 2002: address range as that is reserved for 6to4
addressing, as well as use of any public address range and re-works the
switched routing example to use 3 subnets of the documentation IPv6
prefix range.

Also conformed all use of addresses to the same doc range per @MalteJ's
commit.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: 95668ed128c77b373bac54b721231bd320fa174d
Component: engine
2015-02-19 09:20:50 -08:00
ab127964ad Shorten help messages for docker cmd flags
In order to fit printed messages to fit 80 chars,
rewording messages for `-H` and `--tls` flags.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 27a73a98b704b77eaa7c4caebfeaa84743969c67
Component: engine
2015-02-18 22:52:33 -08:00
77b12b70c8 man page description for -c/--cpu-shares flag for docker run command
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: c1deb7f524da94adc0f7dd3ddf4607bbb92b8d02
Component: engine
2015-02-18 14:01:55 -05:00
cc3ec80739 add logpath to docker inspect.
Signed-off-by: Bradley Cicenas <bradley.cicenas@gmail.com>
Upstream-commit: 06c01b02f5d8149407028324e751df5c0a92fd14
Component: engine
2015-02-18 10:19:52 -05:00
d3be715b86 Merge pull request #10857 from pragmaticfrank/patch-1
fix source command for tab-completion
Upstream-commit: 09b785f3bed812736fe7526535088ca73c1fa10d
Component: engine
2015-02-17 20:22:06 -05:00
9067686a86 Merge pull request #10846 from chenhanxiao/pause-unpause-link
docs: add See also for description of pause and unpause
Upstream-commit: 6c4e1387d143f8f78738b9e54e7ea761588e3a62
Component: engine
2015-02-17 19:26:56 -05:00
5fc38e9a3e fix source command for tab-completion
source /etc/bash_completion.d/docker.io was not working for me, since the file is called docker, not docker.io.

There might be versions with 'io' ending; star is general enough.

Signed-off-by: Ferenc Szabo <pragmaticfrank@gmail.com>
Upstream-commit: 112829434d5aa517a00d89c3b476233fa277eb94
Component: engine
2015-02-17 16:53:18 +01:00
ee82c91c8a docs: add See Also for description of pause and unpause
make them reference to each other.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: a69b189fc5796248bedc01a9feb34da765c73547
Component: engine
2015-02-17 10:22:28 +08:00
bc6bb1e0e5 Merge pull request #10779 from duglin/10771-FixStatsHelp
Fix 'docker stats' help message
Upstream-commit: 9054e4dca3320ec769a02aed8c19aac577688992
Component: engine
2015-02-16 11:18:58 -08:00
53251d070b Merge pull request #10783 from tianon/BINDDIR-yes-two-Ds
Rename BINDDIR to BIND_DIR
Upstream-commit: bce2ae655cea2fe2a57225abb30bce2bf85adfa5
Component: engine
2015-02-16 11:00:44 -08:00
0e5cf57545 Group published and exposed ports by contiguous ranges
Signed-off-by: Colm Hally <colmhally@gmail.com>
Upstream-commit: 5dfef4fe08b890022f600fe742e5a4372b023767
Component: engine
2015-02-16 10:52:23 -08:00
4a9bcf2320 Merge pull request #10571 from jfrazelle/8689-remove-all-aliases
Removes the feature to pull all image aliases.
Upstream-commit: 9ea20f260c0a31d6a0e939a099f7005e93507eea
Component: engine
2015-02-16 10:29:20 -08:00
7a0aaa5999 Use newer help out for 'docker' and 'docker run'
Closes #10828

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: effa5e2c18f27b81fc46d1a925d04e6af5695459
Component: engine
2015-02-16 08:46:07 -08:00
5beb4d62d0 Merge pull request #10801 from cyrilf/patch-1
Documentation - smallest typo correction ever
Upstream-commit: 924b7154baa94e639b8655087e4ba5a5cf0125a4
Component: engine
2015-02-15 20:38:45 -05:00
564ab376d9 docs: fix a typo in Dockerfile.5.md
s/Exececutable/Executable

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: bfba622f86eb45e25d4ff6dc6808cd740bd2a671
Component: engine
2015-02-15 11:06:18 +08:00
6fae379b61 Smallest typo correction ever
Signed-off-by: Cyril Francesconi <cyrilf7x@gmail.com>
Upstream-commit: 582c360d5741a6dce35af1e7607ee636bcf4eb4c
Component: engine
2015-02-14 17:51:28 +01:00
474b56bd0a Docs: Improve description on volume removal
A comment in https://github.com/docker/docker/issues/6354#issuecomment-74160215
brought to light that the "Managing Data in containers" section contained an
incorrect (or confusing) line;

  "Volumes persist until no containers use them"

Which implies that volumes are automatically removed if they are no longer
referenced by a container.

This pull-request attempts to add some information explaining that volumes are
never automatically removed by Docker and adds some extra hints on working
with data volumes.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 00f2fd1dd5dee53919cda7ed9f5c70ba8558edb5
Component: engine
2015-02-14 17:04:06 +01:00
3de3653c91 Merge pull request #10752 from psftw/tweak-docs-readme
Clean up explanation of doc branches.
Upstream-commit: 99ca215c65e9a482f981790f2d4dbe8d4ccce4be
Component: engine
2015-02-13 17:20:59 -08:00
ac657c8159 Rename BINDDIR to BIND_DIR
It turns out the back-to-back `D`s here were tripping people up because visually, it looks like a typo.  This renames the variable to `BIND_DIR`, but allows `BINDDIR` to continue working for backwards-compatibility.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 987050a52b0ce6d5ae77554a03af5923304bd3e5
Component: engine
2015-02-13 15:50:42 -07:00
79ea7dd989 Fix 'docker stats' help message
Closes #10771

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b55346b3279a3243da8cab82a7ddc427454aba61
Component: engine
2015-02-13 12:45:50 -08:00
ab722f0215 Merge pull request #10674 from cpuguy83/cleanup_Dockerfile_manpage
Cleans up docs/man/Dockerfile.5.md
Upstream-commit: ee95aa1b813f53d52e42a7d37a3f4988918058ce
Component: engine
2015-02-13 12:42:19 -08:00
bebced9dfc Merge pull request #10715 from icecrime/keyserver_install_dependency
Use gpg from our server if keyserver is down
Upstream-commit: 8b010d9f10b42377bcd741dfbe00006994bd8adc
Component: engine
2015-02-13 11:29:39 -08:00
b108618571 Cleans up docs/man/Dockerfile.5.md
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 14131b65c41ee9f562c3311e533e0f7d9c9de97b
Component: engine
2015-02-13 12:47:58 -05:00
da0bb2cbb5 Use gpg keyserver pool
Make the install script independent from the ubuntu keyserver by using
the sks-keyservers pool instead.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: f058e9c43c8752dedcd4d251ddf105b22d0ed1d5
Component: engine
2015-02-13 09:13:29 -08:00
ba30fcef2a Clean up explanation of doc branches.
Signed-off-by: Peter Salvatore <peter@psftw.com>
Upstream-commit: 74b050bd0cfa897c0ef2fa50e26725af3c29a65e
Component: engine
2015-02-12 17:02:56 -05:00
2c48e42531 Update docs for HTTP_PROXY
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 7a7c00ca0834e6bad0132d834399bcee4d3b957b
Component: engine
2015-02-12 11:40:56 -08:00
65fed30f0c Tweak the text a little
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: d79e597f301fdf42a0f441f35b48504a5b07eb8b
Component: engine
2015-02-12 12:39:41 +10:00
55e028de55 update the test code to enable testing the extra info
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 49d1ab0eb2ab5ed880e2e1ed66bb62c68b801457
Component: engine
2015-02-12 12:39:41 +10:00
683246a195 added -extfile to server certificate documentation for support of
subjectAltName=IP:x.x.x.x
this allows for connecting to the docker server from docker client
using the dns name OR using the IP address (lots of docker stuff
prefers IP addresses)

Signed-off-by: Greg Fausak <greg@tacodata.com>
Upstream-commit: df8d80710297385aa7c8db41fdd1ef6795e39ae3
Component: engine
2015-02-12 12:39:41 +10:00
ebb652c696 Merge pull request #10686 from LK4D4/bump_docs
Bump api version to 1.18
Upstream-commit: f4749acad48f03454c951081a0a3f0149a23e260
Component: engine
2015-02-11 11:01:28 -08:00
2979e456cd Merge pull request #10632 from chenhanxiao/update-TESTFLAGS-docs
docs: emphasis TESTFLAGS and add some descriptions
Upstream-commit: 54b59c2b2f440df0a513a37d7709fc5b0c88773f
Component: engine
2015-02-11 12:36:43 +10:00
5c56835bc1 Bump api version to 1.18
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: d92b4232f7c7cb64efd8e56c33238b4426fe22af
Component: engine
2015-02-10 10:48:54 -08:00
04be9f6857 docs: emphasis TESTFLAGS and add some descriptions
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: d83b6918a7d18a09f86858709f173277d62c268e
Component: engine
2015-02-10 15:34:33 +08:00
44b33ef557 Merge pull request #10652 from SvenDowideit/update-9456
update kernel reqs doc; recommend updates on RHEL
Upstream-commit: 4284715c79acf1cdc4da1e8af4827b157ed08bb6
Component: engine
2015-02-10 11:02:42 +10:00
48d21d06a2 updates from review
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 32c6179f475183ba778cb90656a971cde81340dc
Component: engine
2015-02-10 11:02:05 +10:00
2fa60db4e0 update kernel reqs doc; recommend updates on RHEL
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: b4089114efe23b18218886ec2085455d463c7179
Component: engine
2015-02-10 11:02:05 +10:00
9dcb95789e remove the text-indent and increase the font size
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 6257505dbc44bb58c56ac92677dbf07548c0c74a
Component: engine
2015-02-10 09:50:02 +10:00
f24997510f Simplfy the sidebar html and css, and then allow the text to wrap
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: c237f9f201bbf5c4b06fbfd65254eb2af75e136f
Component: engine
2015-02-10 09:50:02 +10:00
d0465f42ac Merge pull request #10651 from HammerOfThor/master
docs: fix a typo in registry_mirror.md
Upstream-commit: a98355561d23a6b02d5c8d8c94e6ff54866efabf
Component: engine
2015-02-09 05:05:57 -05:00
ce923ef765 Merge pull request #10624 from stevekochscience/master
Add link to user guide to end of 14.04 section
Upstream-commit: c28ea14bbb5c16cd69aee384d5261f6a53581741
Component: engine
2015-02-09 14:05:33 +10:00