Commit graph

204 commits

Author SHA1 Message Date
moxiegirl
6cba3109c2 Merge pull request #12787 from epc/copyedits
Copy edits for typos
2015-04-26 10:40:18 -07:00
Ed Costello
fa9299f4c0 Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
2015-04-25 15:01:05 -04:00
Sergey Alekseev
2188c8d2f4 Fix documentation typo in articles/basics.md
Signed-off-by: Sergey Alekseev <sergey.alekseev.minsk@gmail.com>
2015-04-25 11:32:17 +03:00
Rick Wieman
6359326761 Makes headings in documentation consistent
Fixes #10673.

Signed-off-by: Rick Wieman <git@rickw.nl>
2015-04-23 07:41:30 +02:00
Ankush Agarwal
9689aab5ec Update with @moxiegirl's patch and add direct config
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-04-22 10:36:38 -07:00
Ankush Agarwal
9424fc14bb Add Configuring Docker article [WIP]
Fixes #12088

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-04-21 17:49:29 -07:00
Sylvain Baubeau
acb6127c1a Allow specifying a default gateway for bridge networking
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
2015-04-20 15:13:30 +02:00
Tibor Vass
9dd23be563 Merge pull request #11947 from TonnyXu/master
Updated the explanation of ONBUILD in best-practices doc
2015-04-07 16:53:43 -04:00
Brent Salisbury
7165089f34 Replaced level with layer for OSI model references
- ty to @moxiegirl for the info workflow for patching images.

-link to the v6 svg (grey L2 switch in the top /level/layer/)
http://docs.master.dockerproject.com/article-img/ipv6_switched_network_example.svg

Signed-off-by: Brent Salisbury <brent.salisbury@docker.com>
2015-04-06 22:23:40 -04:00
Tibor Vass
d2992c78dc Revert "Since COPY has been deprecated in the recent release of Docker I updated the best practices section to inform users that ADD is the way forward and to not use COPY."
COPY was not deprecated.

This reverts commit 3148063af1.

Signed-off-by: Tibor Vass <tibor@docker.com>
2015-04-06 15:34:10 -04:00
moxiegirl
2c44556ff9 Merge pull request #12093 from malnick/malnick_dockerfile_best_practice_update
Updated the dockerfile best practice section on ADD and COPY
2015-04-06 11:43:50 -07:00
malnick
3148063af1 Since COPY has been deprecated in the recent release of Docker I updated the best practices section to inform users that ADD is the way forward and to not use COPY.
Signed-off-by: malnick <malnick@gmail.com>
2015-04-06 10:04:42 -07:00
moxiegirl
d489b91aa9 Merge pull request #11915 from ZJU-SEL/fix_issue_11676_11754
clarify RLIMIT_AS is disabled, explain how to edit DOCKER_OPTS
2015-04-06 09:23:53 -07:00
Tonny Xu
e50636617f Updated the explanation of ONBUILD in best-practices doc
Signed-off-by: Tonny Xu <tonny.xu@gmail.com>
2015-04-04 12:46:25 +09:00
Simei He
8c578b8190 minor edits.
Signed-off-by: Simei He <hesimei@zju.edu.cn>
2015-04-03 14:43:21 +08:00
Wolfgang Powisch
6a47c70d60 Update networking.md
Signed-off-by: Wolfgang Powisch <powo@powo.priv.at>
2015-04-01 00:44:41 +02:00
dalanlan
8d3d34d5e3 fix issue #11676 #11754, disable RLIMIT_AS,edit DOCKER_OPTS
Signed-off-by: Simei He <hesimei@zju.edu.cn>
2015-03-31 10:13:37 +08:00
Mary Anthony
29d01b7dde Removing sudo from command line examples
We now advise people to configure docker group and
add to sudo.  Mac shouldn't use sudo.  Removed sudo
from command examples.  Left in installation to be removed
in installation doc sweep -- removing requires finer
grain control.

Signed-off-by: Mary Anthony <mary@docker.com>
2015-03-26 11:12:37 -07:00
James Turnbull
33bec0a7f6 Merge pull request #11028 from jstangroome/patch-1
Correct IP/MAC address generation docs
2015-03-19 01:44:43 -04:00
Jessie Frazelle
44e9715e46 Merge pull request #10723 from SvenDowideit/takeover-10653
Update sample systemd for container
2015-03-16 17:18:57 -07:00
Enguerran
0cd857d99f Update registry_mirror.md
The syntactic coloration is a little bit ambiguous, I suggest this as a fix.

Signed-off-by: Enguerran Colson <engcolson@gmail.com>
2015-03-15 12:35:43 +01:00
Alexander Morozov
02c1dd899a Merge pull request #10238 from miminar/ephemeral-port-range-allocation
Use system's ephemeral port range for port allocation
2015-03-13 15:18:05 -07:00
Phil Estes
95dcb27484 Merge pull request #11244 from ChristopherBiscardi/docs-code-fixes
Fix a few code rendering errors in docs
2015-03-11 08:34:53 -04:00
ChristoperBiscardi
4ab18fa2ac Modify ip_forward instructions
Signed-off-by: ChristoperBiscardi <chris@docker.com>
2015-03-10 19:28:55 -07:00
Phil Estes
b32bf64f6f Add information on resolv.conf localhost filtering to networking.md
This patch adds detail on how the host's `/etc/resolv.conf` file is
filtered when creating the copy for the container.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-03-09 13:41:00 -04:00
Michal Minar
0eb3544c43 Use system's ephemeral port range for port allocation
Read `/proc/sys/net/ipv4/ip_local_port_range` kernel parameter to obtain
ephemeral port range that now sets the boundaries of port allocator
which finds free host ports for those exported by containers.

Signed-off-by: Michal Minar <miminar@redhat.com>
2015-03-09 09:13:20 +01:00
ChristoperBiscardi
79a0fa29f1 Fix a few code rendering errors in docs
Signed-off-by: ChristoperBiscardi <chris@docker.com>
2015-03-08 16:18:43 -07:00
Phil Estes
9057ca2541 Don't test resolv.conf updater on overlay filesystem
The overlay filesystem does not support inotify at this time. The
resolv.conf updater test was passing on overlay-based Jenkins because of
a fluke--because it was DIND, /etc/resolv.conf on the "host" was really
a bind-mounted resolv.conf from the outer container, which means a watch
directly on that file worked as it was not overlay backed.  The new test
(from #10703) unmounts the bind-mounted copy to test create and modify
code-paths, which caused us to hit the issue.

This PR also adds a note to the docs about the lack of auto-update when
using the overlay storage driver.

See https://lkml.org/lkml/2012/2/28/223 for more info on inotify and
overlay.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-03-05 00:22:01 -05:00
Jason Stangroome
ed3fe85ba3 Correct IP/MAC address generation docs
The MAC address is generated from the IP address, not the other way.

Signed-off-by: Jason Stangroome <jason@codeassassin.com>
2015-02-28 10:05:06 +11:00
Dmitry Gusev
39b3690ba1 Update cli.md
Use `-it` combination in example instead of `-ti`, because this is how it used everywhere in examples.

Update dockerfile_best-practices.md

Fix typo in command name

Signed-off-by: Dmitry Gusev <dmitry.gusev@gmail.com>
2015-02-27 23:18:32 +03: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
814916457b tweak the prose a little
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-23 14:44:31 +10:00
Daniel YC Lin
8c19e43dff Update sample systemd for container
1. Docker require to run before redis container run.
2. 'start' command can not accept more options like "run -e xx ..."
3. Remove wrong command 'Author='

Signed-off-by: Daniel YC Lin <dlin.tw@gmail>
2015-02-23 14:44:31 +10: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
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
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
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
Malte Janduda
a9a19bd911 add IPv6 NDP Proxying documentation
Signed-off-by: Malte Janduda <mail@janduda.net>
2015-02-16 19:20:00 +01:00
Arnaud Porterie
f058e9c43c 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>
2015-02-13 09:13:29 -08:00
Sven Dowideit
d79e597f30 Tweak the text a little
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-12 12:39:41 +10:00
Sven Dowideit
49d1ab0eb2 update the test code to enable testing the extra info
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-12 12:39:41 +10:00
Greg Fausak
df8d807102 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>
2015-02-12 12:39:41 +10:00
Zhang Wei
40486d9709 docs: fix a typo in registry_mirror.md
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-02-09 10:04:55 +08:00
Wei-Ting Kuo
2f69da2a5e Update certificates.md
`openssl req -new -x509 -text -key client.key -out client.cert` creates a self-sign certificate but not a certificate request.

Signed-off-by: Wei-Ting Kuo <waitingkuo0527@gmail.com>
2015-02-09 04:36:00 +08:00
unclejack
0b2f734462 docs/articles/systemd: correct --storage-driver
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-02-06 10:52:09 +02:00
Thell 'Bo' Fowler
cb3be586d6 Update dockerfile_best-practices.md
Signed-off-by: Thell Fowler <Thell@tbfowler.name>
2015-01-31 11:02:09 -06:00
Phil Estes
6a1da678de Add missing $HOST in a couple places in HTTPS/TLS setup docs
Fix typos in setup docs where tcp://:2376 is used without the $HOST
parameter.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2015-01-30 11:20:50 -05:00
Fred Lifton
5b9b5aff06 Merge pull request #10293 from SvenDowideit/test-9952
comment out the docker and curl lines we'll run later
2015-01-29 10:18:53 -08:00
Phil Estes
5945de43b0 Fix incorrect IPv6 addresses/subnet notations in docs
Fixes a few typos in IPv6 addresses. Will make it easier for users who
actually try and copy/paste or use the example addresses directly.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-01-27 22:45:43 -05:00