Commit Graph

211 Commits

Author SHA1 Message Date
f38b9f3ec2 Update Configuring and running Docker article
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 9bfe6f0d24a9eb85c7689bc696487d9f016a67d4
Component: engine
2015-05-14 07:45:20 +02:00
d7e8665b03 Add --userland-proxy daemon flag
The `--userland-proxy` daemon flag makes it possible to rely on hairpin
NAT and additional iptables routes instead of userland proxy for port
publishing and inter-container communication.

Usage of the userland proxy remains the default as hairpin NAT is
unsupported by older kernels.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: f42348e18f73d1d775d77ac75bc96466aae56d7c
Component: engine
2015-05-04 16:07:45 -07:00
71aca0e198 Merge pull request #12574 from ahmetalpbalkan/docs/systemd-dir
docs: Add more places docker.service can be at
Upstream-commit: 029cbc10040ab9ee336663889454e5b08d1ef785
Component: engine
2015-04-29 19:07:58 -04:00
24deb92a52 docs: Add more places docker.service can be at
More systemd goodness. Documenting where `docker.service` lives under Ubuntu 15.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: c0a1b2d6e99d5c6e29a016da39c1313a54c1cb34
Component: engine
2015-04-29 22:39:48 +00:00
9af361f6e2 Merge pull request #12245 from buddhamagnet/dockerignore-ignores
Add support for exclusion rules in dockerignore
Upstream-commit: 4676ff3fd72f92fc26c3a1d9d588ed544fb46b55
Component: engine
2015-04-28 11:28:46 -07:00
bc3d7f1531 add support for exclusion rules in dockerignore
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com>
Upstream-commit: 6fd8e485c85c4f8ca62578d0840bdeddc4cba151
Component: engine
2015-04-28 18:56:45 +01:00
00b8817331 Rewrite Official Repositories page.
The existing page is focused on listing a set of requirements for
proposing a new repository.  This information has become outdated and is
duplicated in the `docker-library/official-images` and
`docker-library/docs` GitHub repositories.  This PR rewrites the
Official Repositories page to describe what they actually are, and
defers to GitHub/IRC for the subset of users that are interested in
contributing.  I also removed the requirement to contact
partners@docker.com and made it optional to reduce the barrier to entry.

Signed-off-by: Peter Salvatore <peter@psftw.com>
Upstream-commit: 8f52eb7b827d658d6974056460afd722a5cb040f
Component: engine
2015-04-28 00:37:17 -04:00
145f0ac265 Merge pull request #12787 from epc/copyedits
Copy edits for typos
Upstream-commit: 6cba3109c2a9c0c20d2541605a9aa7873225a224
Component: engine
2015-04-26 10:40:18 -07:00
d7a0961327 Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
Upstream-commit: fa9299f4c03cf097887db26dadcc63c711c925f1
Component: engine
2015-04-25 15:01:05 -04:00
940ced577b Fix documentation typo in articles/basics.md
Signed-off-by: Sergey Alekseev <sergey.alekseev.minsk@gmail.com>
Upstream-commit: 2188c8d2f41f4905411a40c30f4c703d7f4e0fcf
Component: engine
2015-04-25 11:32:17 +03:00
701a9fb9a1 Makes headings in documentation consistent
Fixes #10673.

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

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 9424fc14bb7465f9874e6e3560cf62b560dbd13d
Component: engine
2015-04-21 17:49:29 -07:00
6f062d5e99 Allow specifying a default gateway for bridge networking
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
Upstream-commit: acb6127c1a3f7054c25d1468b67f2eb269f4ecbf
Component: engine
2015-04-20 15:13:30 +02:00
8dfe9e8a9b Merge pull request #11947 from TonnyXu/master
Updated the explanation of ONBUILD in best-practices doc
Upstream-commit: 9dd23be563be63b8dc3cf0ffda696cdf558f82fd
Component: engine
2015-04-07 16:53:43 -04:00
4b42a60c0f 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>
Upstream-commit: 7165089f34a1ff6d1c350dcd46bdcef15667cab1
Component: engine
2015-04-06 22:23:40 -04:00
d62565ffca 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 3148063af16e5c14ea543f615d136f477a4e9537.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: d2992c78dc1f71b0844b3c17d5ea9be8fff8b15e
Component: engine
2015-04-06 15:34:10 -04:00
a0e29b0a30 Merge pull request #12093 from malnick/malnick_dockerfile_best_practice_update
Updated the dockerfile best practice section on ADD and COPY
Upstream-commit: 2c44556ff9d94ddeca09349c8c4669a47cfe22fb
Component: engine
2015-04-06 11:43:50 -07:00
ea1fc2ed3e 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>
Upstream-commit: 3148063af16e5c14ea543f615d136f477a4e9537
Component: engine
2015-04-06 10:04:42 -07:00
07de27cc12 Merge pull request #11915 from ZJU-SEL/fix_issue_11676_11754
clarify RLIMIT_AS is disabled, explain how to edit DOCKER_OPTS 
Upstream-commit: d489b91aa94a6e15d7d1daa953468cac9866f218
Component: engine
2015-04-06 09:23:53 -07:00
1d80656252 Updated the explanation of ONBUILD in best-practices doc
Signed-off-by: Tonny Xu <tonny.xu@gmail.com>
Upstream-commit: e50636617f10f4a2ca4924260cb67719bf906ec1
Component: engine
2015-04-04 12:46:25 +09:00
c9d7b160f7 minor edits.
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 8c578b8190a9abd5a48efa723878a12568f91e54
Component: engine
2015-04-03 14:43:21 +08:00
179a6af99a Update networking.md
Signed-off-by: Wolfgang Powisch <powo@powo.priv.at>
Upstream-commit: 6a47c70d60f5ac92b152e1c8ef7fe5b714fe7833
Component: engine
2015-04-01 00:44:41 +02:00
55c259c94d fix issue #11676 #11754, disable RLIMIT_AS,edit DOCKER_OPTS
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 8d3d34d5e310e6d3c80b4c3301b804a1edd25fb6
Component: engine
2015-03-31 10:13:37 +08:00
e5276fe0a7 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>
Upstream-commit: 29d01b7ddedb5d1b5ec2262e2d961b737cbc6f38
Component: engine
2015-03-26 11:12:37 -07:00
a7ed4dc483 Merge pull request #11028 from jstangroome/patch-1
Correct IP/MAC address generation docs
Upstream-commit: 33bec0a7f63695d6fa60a79c8732d49623d30223
Component: engine
2015-03-19 01:44:43 -04:00
df4aae20f1 Merge pull request #10723 from SvenDowideit/takeover-10653
Update sample systemd for container
Upstream-commit: 44e9715e46db46d9c88b5bba6072c0fe42aa5837
Component: engine
2015-03-16 17:18:57 -07:00
3e5ae00db7 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>
Upstream-commit: 0cd857d99f3b57db7db9f8668f57fb1788a7ae01
Component: engine
2015-03-15 12:35:43 +01:00
1174b9d420 Merge pull request #10238 from miminar/ephemeral-port-range-allocation
Use system's ephemeral port range for port allocation
Upstream-commit: 02c1dd899a7ea84c89cb6f5a87297f4690e393ef
Component: engine
2015-03-13 15:18:05 -07:00
cb89c142a6 Merge pull request #11244 from ChristopherBiscardi/docs-code-fixes
Fix a few code rendering errors in docs
Upstream-commit: 95dcb2748442fc1f59e8c2e010679e0aea3cef1c
Component: engine
2015-03-11 08:34:53 -04:00
6148a6ae03 Modify ip_forward instructions
Signed-off-by: ChristoperBiscardi <chris@docker.com>
Upstream-commit: 4ab18fa2ac119c26516f2156dabda9dd0a781301
Component: engine
2015-03-10 19:28:55 -07:00
c4e98d23c7 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)
Upstream-commit: b32bf64f6f3cc09334f52a08a4449a109ad123ff
Component: engine
2015-03-09 13:41:00 -04:00
054ec22a23 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>
Upstream-commit: 0eb3544c43cb8e9488d6bf329ceecc11fa0db6f1
Component: engine
2015-03-09 09:13:20 +01:00
6d6d8eee07 Fix a few code rendering errors in docs
Signed-off-by: ChristoperBiscardi <chris@docker.com>
Upstream-commit: 79a0fa29f1de0be0d69adf54a63eed7312d4be70
Component: engine
2015-03-08 16:18:43 -07:00
aa9b58cd0b 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)
Upstream-commit: 9057ca2541582fc41eb7cb45edd332247a813bba
Component: engine
2015-03-05 00:22:01 -05:00
c8d8754d3e 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>
Upstream-commit: ed3fe85ba3b30d2586108a707fe20bba6c667e91
Component: engine
2015-02-28 10:05:06 +11:00
4020847acb 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>
Upstream-commit: 39b3690ba1801b36c1f43fa220ae5128958a0739
Component: engine
2015-02-27 23:18:32 +03:00
38df4a721b Merge pull request #10831 from MalteJ/ipv6-ndp-proxy
Adding IPv6 NDP Proxying documentation
Upstream-commit: 9324cdac07484373c752f3368c3cb30db070b839
Component: engine
2015-02-26 07:19:36 -08:00
bbfbec00cd tweak the prose a little
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 814916457b50082e4299691ae92b4ed368ddb076
Component: engine
2015-02-23 14:44:31 +10:00
9059cf0db5 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>
Upstream-commit: 8c19e43dff7d46e6213eac512d44bb2582d1c959
Component: engine
2015-02-23 14:44:31 +10: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
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
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
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
77655c4ee6 add IPv6 NDP Proxying documentation
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: a9a19bd91122984b9efaae81cb8b0becb99c96de
Component: engine
2015-02-16 19:20:00 +01: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
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