Jessie Frazelle
94553f1ba6
Merge pull request #10902 from estesp/10855-fix-add-host-doc
...
Correct --add-host documentation regarding host IP address retrieval
2015-02-26 17:25:01 -08:00
Mary Anthony
02639c03b7
Smaller image
...
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
2015-02-26 08:48:58 -08:00
Jessie Frazelle
9324cdac07
Merge pull request #10831 from MalteJ/ipv6-ndp-proxy
...
Adding IPv6 NDP Proxying documentation
2015-02-26 07:19:36 -08:00
Sven Dowideit
7646e3f957
Missed to added doc files
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-27 01:10:50 +10:00
Tibor Vass
7e2328b76e
Merge pull request #10869 from SvenDowideit/extract-docs-base
...
Extract docs base
2015-02-25 23:16:46 -05:00
Sven Dowideit
6d4b0f5334
update the mkdocs.yml to add new docs
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-26 12:11:29 +10:00
James Turnbull
f8dbcdc599
Merge pull request #10940 from 1HLtd/master
...
docs/man/docker.1.md: spelling mistake fix
2015-02-25 20:45:46 -05:00
Sven Dowideit
0365e8c204
set the document meta-data for the orchestration docs to turn off the docker-version documentation dropdown, asit doesn't apply
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-26 11:41:39 +10:00
Sven Dowideit
ac47a87740
Manually place the orchestration docs into the menu
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-26 11:41:39 +10:00
Sven Dowideit
8d4459fffb
Don't require Docker 1.5.0 for docker build -f docs/Dockerfile
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-26 11:41:39 +10:00
Sven Dowideit
3e84b9e56a
Import docs from swarm, machine and compose repositories,
...
Also add the image spec from the code area to show we're building from the repo-root now
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-26 11:41:39 +10:00
Sven Dowideit
ab545aed4c
Simplify the existing docs building by extracting the main Dockerfile into a docs/base Hub image
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-26 11:41:39 +10:00
Michael Crosby
9a2e58dd29
Merge pull request #10498 from ashahab-altiscale/9875-lxc-stats
...
Implements stats for lxc driver
2015-02-25 13:46:18 -08:00
Phil Estes
f8a146311d
Correct --add-host documentation regarding host IP address retrieval
...
Fixes: 10855
The example was actually incorrect for many situations, and also, now
that we have IPv6 we should not that the example is for IPv4 and note
how to find IPv6 addresses. Also, the device they want to connect to
could be the bridge, or main ethernet device, or some other device
name, so note that as well.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-02-25 09:56:58 -05:00
Dan Walsh
17abfc3ddc
pass --change changes to the import job
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-02-24 13:01:36 -05:00
Dan Walsh
5767548fa7
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)
2015-02-24 13:01:36 -05:00
Sven Dowideit
1d27930faa
Merge pull request #10724 from SvenDowideit/takeover-10470
...
Update best practices for entrypoint.
2015-02-24 15:32:16 +10:00
Sven Dowideit
ad2063ca84
Merge pull request #10923 from bradleywright/patch-1
...
Fix erroneously wrapped URLs in links
2015-02-24 15:31:40 +10:00
Sven Dowideit
e500c00d7c
Merge pull request #10929 from thaJeztah/docs-optimize-images
...
docs: optimize and consolidate images, remove duplicates
2015-02-24 15:31:00 +10:00
Alexander Morozov
02c8881596
Merge pull request #10933 from ahmetalpbalkan/version-daemon-os-arch
...
cli: Add server OS/Arch info to 'version' cmd
2015-02-23 15:26:53 -08:00
Ahmet Alp Balkan
3346c2e4d9
cli: Add server OS/Arch info to 'version' cmd
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-23 14:32:25 -08:00
Andrew Kuklewicz
f9bb0afc6c
Have docker command use $HOME instead of 'mary'
...
Signed-off-by: Andrew Kuklewicz <andrew@beginsinwonder.com>
2015-02-23 12:37:11 -05:00
Sebastiaan van Stijn
743f0bcc83
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>
2015-02-23 12:10:54 +01:00
Abin Shahab
1a26ed09ee
Implements stats for lxc driver
...
Implements stats and fixes stats test.
Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
2015-02-23 10:16:52 +00:00
Fred Lifton
7d2188f995
Merge pull request #10918 from cpuguy83/10278_fix_create_docs_for_volumes
...
Remove CLI doc entry related to API-only function
2015-02-22 18:11:18 -08:00
Sven Dowideit
3c9d45e213
a little re-writing
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-23 12:00:50 +10:00
Jessica Frazelle
6009f2eac4
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)
2015-02-23 12:00:50 +10:00
James Turnbull
74394f03ac
Merge pull request #10930 from caryhartline/patch-1
...
Fix three spelling mistakes
2015-02-22 20:28:42 -05:00
James Turnbull
e8484a3438
Merge pull request #10942 from sdreyesg/patch-1
...
"docker run hello-world" instead of "docker hello-world"
2015-02-22 20:28:19 -05:00
sdreyesg
f37351f9e8
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>
2015-02-22 14:51:32 -08:00
Alessio Biancalana
47a847bca8
correcting a little visual bug
...
padding right: 10px; for #leftnav li
Signed-off-by: Alessio Biancalana <dottorblaster@gmail.com>
2015-02-22 22:59:41 +01:00
Cary
4c7d41ac18
Fix three spelling mistakes
...
There are three instances of "boo2docker" that should be changed to "boot2docker".
Signed-off-by: Cary Hartline <varmateo@icloud.com>
2015-02-22 14:47:39 -06:00
Marian Marinov
811132f4b9
docs/man/docker.1.md: spelling mistake fix
...
Signed-off-by: Marian Marinov <mm@yuhu.biz>
2015-02-22 22:47:22 +02:00
Bradley Wright
54ca9aca71
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>
2015-02-20 23:05:52 +00:00
Jessie Frazelle
f70567e9a9
Merge pull request #10900 from moxiegirl/connection-reset-by-peer-faq
...
Adding info to faq per customer problem.
2015-02-20 13:20:28 -08:00
Jessie Frazelle
aa057fd3b3
Merge pull request #10838 from moxiegirl/mac-update
...
Adding in updates for Mac for upcoming events
2015-02-20 13:10:29 -08:00
Brian Goff
4f0429621c
Remove CLI doc entry related to API-only function
...
Closes #10278
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-02-20 11:51:42 -05:00
Mary Anthony
a61766be9f
Adding in Sven's suggested check the doc line.
...
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
2015-02-19 17:29:46 -08:00
Jessie Frazelle
573e2484a5
Merge pull request #10898 from noironetworks/Fixing-docs-for-docker-ps-filter
...
Added missing documentation for PR #8543
2015-02-19 17:19:09 -08:00
Jessie Frazelle
934535db9c
Merge pull request #10468 from noironetworks/10457-Pause-and-unpause-accept-multi-containers
...
Allow docker pause and unpause to accept multiple containers
2015-02-19 15:16:05 -08:00
Steve Francia
356fe89d24
Merge pull request #10818 from estesp/link-add-aliases
2015-02-19 17:22:53 -05:00
Phil Estes
16aa64dc82
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)
2015-02-19 14:19:38 -08:00
André Martins
401e93bbb9
Added missing documentation for PR #8543
...
Added more examples and functionalities for docker ps documentation
Signed-off-by: André Martins <martins@noironetworks.com>
2015-02-19 22:05:14 +00:00
Mary Anthony
a5a0353dbe
Adding info to faq per customer problem.
...
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
2015-02-19 13:42:23 -08:00
Jessie Frazelle
ff2f1904c9
Merge pull request #10722 from SvenDowideit/takeover-10710
...
added -extfile to server certificate documentation
2015-02-19 13:17:17 -08:00
Steve Francia
1875cc2ef4
Merge pull request #10835 from jfrazelle/port-ranges
2015-02-19 16:11:59 -05:00
Jessie Frazelle
72e66136ee
Merge pull request #10751 from estesp/10701-update-ipv6-docs
...
Update IPv6 docs with modern `ip` command use + `sysctl`
2015-02-19 12:59:42 -08:00
Jessie Frazelle
dc37358d8c
Merge pull request #10619 from bcicen/add-logpath-to-inspect-container
...
Add logpath to inspect container
2015-02-19 12:56:45 -08:00
Jessie Frazelle
d6660ad605
Merge pull request #10881 from shishir-a412ed/cpu-shares-manpage
...
man page description for `-c/--cpu-shares` flag for `docker run` command.
2015-02-19 11:40:04 -08:00
Phil Estes
95668ed128
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>
2015-02-19 09:20:50 -08:00