Commit Graph

3057 Commits

Author SHA1 Message Date
2bc83bf87b add docs for commit --change
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 5767548fa79342cee94dbb66b9c41671d4a1879f
Component: engine
2015-02-24 13:01:36 -05:00
86eef40206 Merge pull request #10724 from SvenDowideit/takeover-10470
Update best practices for entrypoint.
Upstream-commit: 1d27930faaacf6ebe4553c7b23087e2164816470
Component: engine
2015-02-24 15:32:16 +10:00
351cb675a4 Merge pull request #10923 from bradleywright/patch-1
Fix erroneously wrapped URLs in links
Upstream-commit: ad2063ca8461a903fe993188b4dbaa5da804a72b
Component: engine
2015-02-24 15:31:40 +10:00
61ee3dd26f Merge pull request #10929 from thaJeztah/docs-optimize-images
docs: optimize and consolidate images, remove duplicates
Upstream-commit: e500c00d7cd855c02f390d1f9d55b668cc191854
Component: engine
2015-02-24 15:31:00 +10:00
f3462cd410 Merge pull request #10933 from ahmetalpbalkan/version-daemon-os-arch
cli: Add server OS/Arch info to 'version' cmd
Upstream-commit: 02c888159666ee53df9eeb1397c7d597dabf3b60
Component: engine
2015-02-23 15:26:53 -08:00
4fbdef753d cli: Add server OS/Arch info to 'version' cmd
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 3346c2e4d9ce0cf92b056b6ddc883adf5b8beddd
Component: engine
2015-02-23 14:32:25 -08:00
27d91a55a2 Have docker command use $HOME instead of 'mary'
Signed-off-by: Andrew Kuklewicz <andrew@beginsinwonder.com>
Upstream-commit: f9bb0afc6c37ea5b6f2d413474c5dcbdd84259f1
Component: engine
2015-02-23 12:37:11 -05:00
b907fd6bb4 docs: optimize and consolidate images, remove duplicates
This optimizes a number of images and removes a duplicate image.
Also consolidated images in the 'docker-hub' section.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 743f0bcc83b0b1b8ccc1980300e96a9003b5cd0f
Component: engine
2015-02-23 12:10:54 +01:00
f1c26b077c Merge pull request #10918 from cpuguy83/10278_fix_create_docs_for_volumes
Remove CLI doc entry related to API-only function
Upstream-commit: 7d2188f9955d3f2002ff8c2e566ef84121de5217
Component: engine
2015-02-22 18:11:18 -08:00
402ab2a4ba a little re-writing
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 3c9d45e2130e86c45da94aa00ce9a75e0d514e61
Component: engine
2015-02-23 12:00:50 +10:00
59491a1c4b Update best practices for entrypoint.
Despite being wrong we are kinda calling our users dumb, I feel it is a bit
demeaning. As well as just wrong.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Upstream-commit: 6009f2eac4d8d707b64bfada507345e11977643d
Component: engine
2015-02-23 12:00:50 +10:00
cd135d371f Merge pull request #10930 from caryhartline/patch-1
Fix three spelling mistakes
Upstream-commit: 74394f03ac422fe79c049f37c469fdceac078ff7
Component: engine
2015-02-22 20:28:42 -05:00
7735397fed Merge pull request #10942 from sdreyesg/patch-1
"docker run hello-world" instead of "docker hello-world"
Upstream-commit: e8484a34385d8e3652f820dd4be89e4b9c4b72d1
Component: engine
2015-02-22 20:28:19 -05:00
95592a5ea0 Update mac.md
I just tried this guide. I had to use "docker run hello-world" instead of "docker run"

Signed-off-by: Dario Galvis <sdreyesg@gmail.com>
Upstream-commit: f37351f9e88e077b2a1b219cd412e781ebb2ef9c
Component: engine
2015-02-22 14:51:32 -08:00
98b2a68b5d correcting a little visual bug
padding right: 10px; for #leftnav li

Signed-off-by: Alessio Biancalana <dottorblaster@gmail.com>
Upstream-commit: 47a847bca8aa91f55c6b18c726bd4a6d960322d1
Component: engine
2015-02-22 22:59:41 +01:00
2e2ad7fccb Fix three spelling mistakes
There are three instances of "boo2docker" that should be changed to "boot2docker".

Signed-off-by: Cary Hartline <varmateo@icloud.com>
Upstream-commit: 4c7d41ac180bba52bf567515bf9f033ecfa70de7
Component: engine
2015-02-22 14:47:39 -06:00
2b3a1d58f2 Fix erroneously wrapped URLs in links
Some of the links in this document contained hard-wrapped URL portions, which causes Markdown to insert a literal URL encoded `\n` inside the link, thus breaking them.

Signed-off-by: Bradley Wright <brad@intranation.com>
Upstream-commit: 54ca9aca71e4cbbff55f42ae88e8c8b8b5be4eec
Component: engine
2015-02-20 23:05:52 +00:00
cc62780e08 Merge pull request #10900 from moxiegirl/connection-reset-by-peer-faq
Adding info to faq per customer problem.
Upstream-commit: f70567e9a9a8c086f798f2c3b00f93ad1ae40b15
Component: engine
2015-02-20 13:20:28 -08:00
190cc5a491 Merge pull request #10838 from moxiegirl/mac-update
Adding in updates for Mac for upcoming events
Upstream-commit: aa057fd3b3f3a2817f01f834482c396cf08ce53d
Component: engine
2015-02-20 13:10:29 -08:00
85de285604 Remove CLI doc entry related to API-only function
Closes #10278

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 4f0429621c7e6ccaac8bc9a62a703bf68f2d4cd4
Component: engine
2015-02-20 11:51:42 -05:00
dacada99a3 Adding in Sven's suggested check the doc line.
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: a61766be9f7667d5153fde26b3c362471c9b9474
Component: engine
2015-02-19 17:29:46 -08:00
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
fe3631c840 Adding info to faq per customer problem.
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: a5a0353dbee6d95f7ce403705e6823c2d9f02275
Component: engine
2015-02-19 13:42:23 -08: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
03bd05f3c6 Fixing spacing after period
Upstream-commit: 112aa1e341e4c9392b27a3752d276671c0376f38
Component: engine
2015-02-17 16:10:32 -08:00
73618648ff Adding in Fred's comments.
Upstream-commit: 1b36272dc30659e528e0dd7028e69b48fec3cdde
Component: engine
2015-02-17 15:59:29 -08:00
e83b1f8cc3 Tweaking language
Upstream-commit: abc6896984cfa1ac4ab39a4a683038eaa10dee5d
Component: engine
2015-02-17 11:02:25 -08:00
bfa857605b Updating per Sven's request for localhost definition
Upstream-commit: 0581e8652dd0debb235864eac46986ff3625e8af
Component: engine
2015-02-17 10:55:19 -08:00
868d3c6f92 Adding in updates for Mac for birthday.
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: d03ce18b0bfaa5abaaac10b5bfb4a8d92683c0b3
Component: engine
2015-02-17 09:58:58 -08: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