Commit Graph

122 Commits

Author SHA1 Message Date
c1a6d58dbd Update networking.md with new iptables behaviour
Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
Upstream-commit: 137ceae9138e535f8b3f4e76bda18f6db954c231
Component: engine
2014-12-21 12:57:32 +10:00
912c56d931 add Scott's link checker script, and fix what it finds
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: fbb9223b1adc16834768acaa7a5776697825deb2
Component: engine
2014-12-16 14:46:25 +10:00
55530bfc16 Merge pull request #9556 from nealmcb/9555-https-no-sudo
Fixes #9555: sudo not needed with cert authn
Upstream-commit: e4b2f802ae669f4a89b04576ac92c95858773810
Component: engine
2014-12-15 15:08:03 +11:00
e7ab84e497 Merge pull request #9558 from philips/fixup-typo-in-systemd-article
docs: docker.service not services
Upstream-commit: c587a3faf65c94b50fa1b56ba2af3ae3c547933f
Component: engine
2014-12-09 23:10:17 +11:00
9938c679ed docs: use systemd drop-ins instead of copying
Copying the entire docker service file isn't necessary to add an
environment variable, instead use a drop-in configuration file. The nice
side-effect is that the user gets any vendor updates to the
docker.service file.

Signed-off-by: Brandon Philips <brandon.philips@coreos.com>
Upstream-commit: 2d51d71561565987fc6a600234f2e2d15e0ecf31
Component: engine
2014-12-07 18:45:50 -08:00
3c2c492c7f docs: remove a trailing whitespace
Signed-off-by: Brandon Philips <brandon.philips@coreos.com>
Upstream-commit: e0792e7ece7a71da83c902a03654bda4797ab054
Component: engine
2014-12-07 18:45:43 -08:00
a6561f311c docs: docker.service not services
Minor but important typo in the new systemd guide introduced in #9347.

Signed-off-by: Brandon Philips <brandon.philips@coreos.com>
Upstream-commit: 1ae7be716eadf6efdc7ee033c83127e975222a76
Component: engine
2014-12-07 18:35:37 -08:00
245df65b49 Fixes #9555: sudo not needed with cert authn
Signed-off-by: Neal McBurnett <neal@mcburnett.org>
Upstream-commit: ee1ba252187a7e1a80e3773fe9748410d01a39b8
Component: engine
2014-12-07 14:31:35 -07:00
be6e29bd97 Extract the systemd docs from various places and add a little more
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: d53b586ff1b274b529b7912df3052a1bc2ca8dfe
Component: engine
2014-11-27 10:17:46 +10:00
5f5c30608e Consistently use sudo docker
Signed-off-by: Satnam Singh <satnam@raintown.org>
Upstream-commit: b273c447e0f0b124d5f81ff60033a4894e2acec8
Component: engine
2014-11-17 17:14:39 -08:00
dc90086a2e Fix mkdir typo in dockerfile_best-practices.md.
Upstream-commit: b95f9c10ff2bd05fc2d30b30bebb8174883c683a
Component: engine
2014-11-10 01:00:05 +01:00
458ef2c326 Merge pull request #8876 from whoshuu/docpatch-2
Remove out-of-context code block
Upstream-commit: a61c4dc959bd9370f6c6240efbeff2bf73433676
Component: engine
2014-11-05 10:52:50 +01:00
590a54ca61 enhancing set-macaddress docu
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: 971fc2253af77ae4a22a3741fff51d84cd9bc697
Component: engine
2014-11-03 11:43:27 +01:00
c0897a4514 Adding docker-cli run param to set MAC address
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: f2df38050e019c0db265e7c3e38ee0de8948ca77
Component: engine
2014-11-01 15:35:09 +01:00
e8cb0ca4b5 Merge pull request #8839 from irachex/dns-search-doc
Add docs for --dns-search=.
Upstream-commit: 0f9f5f3fdfd45ef7759d6b163860aac4436bf9b7
Component: engine
2014-10-31 11:25:57 -07:00
7a8d9de28f Remove out-of-context code block
Signed-off-by: Huu Nguyen <whoshuu@gmail.com>
Upstream-commit: 8453cf0671879aef04f96ffce52bf3fbcb75ca13
Component: engine
2014-10-30 23:58:14 -04:00
9d604d6213 Merge pull request #8822 from wilsaj/patch-2
Update host integration article
Upstream-commit: c3762c3abf0c217f5d84729cf15d00f9befc4815
Component: engine
2014-10-30 12:19:36 -07:00
59014e2c8a doc: Update host integration article
Update for changes in docker 1.2. Running the docker daemon with "-r=false" has been deprecated in favor of per-container restart policies.

Signed-off-by: wilsaj <wilson.andrew.j+github@gmail.com>
Upstream-commit: 9542ea72188614d5b14f9e7fc31c80e6425738c4
Component: engine
2014-10-30 13:39:45 -05:00
3a00799059 Add docs for --dns-search=.
PR 6720 introduce that use `--dns-search=.` will not set `search` in `/etc/resolv.conf`.

Signed-off-by: Huayi Zhang <irachex@gmail.com>
Upstream-commit: 36ffbd7acf60d15942c0591bb4fec498f021331e
Component: engine
2014-10-30 21:04:35 +08:00
083e0d1a65 Add a link to some documentation about exec.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 7f1ea7129e7b87e60ea4b1e4449b0541f6f432c9
Component: engine
2014-10-24 12:41:19 +10:00
482067e0dc fix cli dashes in boot2docker resizing article
The CLI commands had long dashes that won't work on most terminals when copy pasting.

Signed-off-by: wilsaj <wilson.andrew.j+github@gmail.com>
Upstream-commit: 36dae27fa26fe58efaf68296169cd2c6ba6dfcfe
Component: engine
2014-10-21 11:38:19 -05:00
87dffd42be On Red Hat Registry Servers we return 404 on certification errors.
We do this to prevent leakage of information, we don't want people
to be able to probe for existing content.

According to RFC 2616, "This status code (404) is commonly used when the server does not
wish to reveal exactly why the request has been refused, or when no other response i
is applicable."

https://www.ietf.org/rfc/rfc2616.txt

10.4.4 403 Forbidden

   The server understood the request, but is refusing to fulfill it.
   Authorization will not help and the request SHOULD NOT be repeated.
   If the request method was not HEAD and the server wishes to make
   public why the request has not been fulfilled, it SHOULD describe the
   reason for the refusal in the entity.  If the server does not wish to
   make this information available to the client, the status code 404
   (Not Found) can be used instead.

10.4.5 404 Not Found

   The server has not found anything matching the Request-URI. No
   indication is given of whether the condition is temporary or
   permanent. The 410 (Gone) status code SHOULD be used if the server
   knows, through some internally configurable mechanism, that an old
   resource is permanently unavailable and has no forwarding address.
   This status code is commonly used when the server does not wish to
   reveal exactly why the request has been refused, or when no other
   response is applicable.

When docker is running through its certificates, it should continue
trying with a new certificate even if it gets back a 404 error code.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 69fe3e1a3493e53acb2da7220764bd3807415ea2
Component: engine
2014-10-20 13:20:48 -04:00
eb924a4c12 Add a little info on how to talk to the TLS encrypted Docker Socket
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 1c68de798fdebba5eefa1c66a79e946c7bb06fb5
Component: engine
2014-10-15 17:24:53 +10:00
830a3741c6 Add DOCKER_TLS_VERIFY environment variable, equivalent to --tlsverify flag
This makes it possible to make the Docker client "secure by default"
without wrapping the binary in a shell alias so that `--tlsverify` is
always passed.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: 19fb942d3609f647adeda68c6ca106371c7b32ac
Component: engine
2014-10-13 11:49:26 +01:00
33d0e956f0 Add a best practice to reduce cache invalidations
inspired by https://github.com/docker-training/docker-fundamentals/pull/206

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: a36ba19ccad8ea551a912ce16921af89d9e59012
Component: engine
2014-10-08 11:26:48 +10:00
f49339f3ba Merge pull request #8222 from fredlf/adding_official-repo-guidelines
Edits and fixes based on review.
Upstream-commit: 95e169a6a14b46c9db6b6d316524b28abfdc3391
Component: engine
2014-10-03 22:03:05 -04:00
6da135ab37 Edits and fixes to Dockerfile Best Practices based on review feedback.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 36db0a30fa471aa96cf5acd8139b554db78cec22
Component: engine
2014-10-02 14:08:39 -07:00
4149b93c3c Update host_integration.md
Upstream-commit: f10a08887e939936662071e5609670f7da9fb62c
Component: engine
2014-10-01 14:51:47 +01:00
b3bf4ac72c Edits and fixes to Dockerfile Best Practices based on review feedback.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 42b377904b081170c74b6526959cb70215778f21
Component: engine
2014-09-30 13:30:14 -07:00
9405298e4e Add more info about when build cache is invalidated/used - Issue #3636
Plus some edits as suggested by @jamtur01

Closes #3636

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 83f0f46b7c0475ae1da329cd97a8c0a67bdc2a6a
Component: engine
2014-09-29 14:13:39 -07:00
2dae619626 Merge pull request #8205 from sequenceiq/master
Fix code example formatting in best-practices article
Upstream-commit: 4547b6d529df10d83ffc1937abc260c8a2ede743
Component: engine
2014-09-25 12:34:36 +10:00
fce5f6490a Merge pull request #8195 from tiborvass/migrate-get.docker.io
Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
Upstream-commit: 3fa0ed01425dc6facb85a00338ddf99ed74a86be
Component: engine
2014-09-24 19:06:09 -04:00
8a28fc553b Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 808257654a4147ad9b54cfeddc5d0ad236c26e3f
Component: engine
2014-09-24 18:53:27 -04:00
65521dc5a1 Fix code example formatting in best-practices article
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com>
Upstream-commit: be4454c4f0ba1a1d9fdd2f0ec7e631403ee61f63
Component: engine
2014-09-24 10:45:56 +02:00
134a1a90ab Merge pull request #8197 from fredlf/adding_official-repo-guidelines
Docs for Official Repo release
Upstream-commit: 8dd11c7175147d31761b647daac10fb18f0420c2
Component: engine
2014-09-23 20:55:07 -07:00
82616b8c9e Revisions and edits based on feedback.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 950eccab4ad4d79a5afa154849567ddfdf8dc7eb
Component: engine
2014-09-23 18:26:02 -07:00
7f93986b70 Typo and formatting fixes. Copy edits.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 6747dfc8031205f0e629a3508f14125b3b66a5b2
Component: engine
2014-09-23 15:51:17 -07:00
756d3489d5 Adding new Dockerfile Best Practices doc, and links thereto.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: d9fd5f6199aebb9ea784f5b23ec97b960f89f3d4
Component: engine
2014-09-23 14:21:00 -07:00
eb02e608df Merge pull request #6101 from LK4D4/ip_range_#4986
Implement allocating IPs from CIDR within bridge network 
Upstream-commit: 9fb34ae5710faaadc730a7005f785cefc56eed4b
Component: engine
2014-09-22 17:09:16 +03:00
2508e0d078 Adding additional documentation for fixed-cidr networking
Docker-DCO-1.1-Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu> (github: fkautz)

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 3bb12d390a8a965e4dc680db7ecdab8c76f23990
Component: engine
2014-09-18 08:48:24 +04:00
abfdc34927 Merge pull request #8056 from SvenDowideit/use-sudo-docker-everywhere
Consistently use 'sudo docker' in examples
Upstream-commit: b64558907139911b86d846de70ab859504cc45a2
Component: engine
2014-09-16 08:43:58 -04:00
cd4d60a084 Consistently use 'sudo docker' in examples
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: fc9a3b1c1b835c170a4916362855e127a0e366e1
Component: engine
2014-09-16 11:49:05 +10:00
a7a415757f Merge pull request #8034 from michaljemala/patch-1
The default name of the bridge created is called 'docker0'.
Upstream-commit: 023241614efbbf143041f261df969bed6fc7f645
Component: engine
2014-09-15 17:32:57 -07:00
1bc2448cc5 Merge pull request #8037 from unclejack/shrink_docs_images
docs: shrink images
Upstream-commit: 62b86613e8c6bb8fa1c50fd30a92c050ffbed88e
Component: engine
2014-09-16 10:13:03 +10:00
c3fe53e47f docs: shrink images
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 90dcc7c8405437a10b81e932b49a856502cee626
Component: engine
2014-09-15 14:46:29 +03:00
df653eaf4f The default name of the bridge created is called 'docker0'.
Upstream-commit: 140229677af2cf4865424e535b06440f043e163b
Component: engine
2014-09-15 12:10:46 +01:00
a1ea7562ca Append instead of replace file contents
I think the `DOCKER_OPTS` should be appended to `/etc/default/docker` and not replace the entire contents.
Upstream-commit: 81357e12e7a019c14d87dc491705ad92409293b7
Component: engine
2014-09-13 22:26:40 +02:00
3be52d7f70 Match docs to actual port range used in code.
Addresses #7985

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: d6f4b2ebb40ac79c3ba21e7196bba3b83124cf16
Component: engine
2014-09-11 17:20:01 -04:00
0b07be83cc Add daemon flag to specify public registry mirrors
Adds support for a --registry-mirror=scheme://<host>[:port]
daemon flag. The flag may be present multiple times. If
provided, mirrors are prepended to the list of endpoints used
for image pull. Note that only mirrors of the public
index.docker.io registry are supported, and image/tag resolution
is still performed via the official index.

Docker-DCO-1.1-Signed-off-by: Tim Smith <timbot@google.com> (github: timbot)
Upstream-commit: 69a75c673ccf0aebf19c7b350243f1b0cefad8be
Component: engine
2014-09-09 19:03:38 +00:00
c28d415c47 Very minor formatting update for docs/sources/articles/networking.md
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 1ce3e22efc699d90f69b29f68fedf059ec4379a7
Component: engine
2014-09-07 22:39:37 -04:00