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
7e95f54878
Merge pull request #7749 from hollietealok/master
...
Doc: Resizing Boot2Docker Volume with VirtualBox
Upstream-commit: 31d2701377c6667ad099226fe25004345017fb5d
Component: engine
2014-08-28 16:08:29 -07:00
3de067038b
Final tweaks.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: 0f8d461ed7c8b338d671bea0240b288fa91155b6
Component: engine
2014-08-28 13:51:38 -07:00
44d46dd074
Added changes brought up in PR discussion.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: ce73a3bcf77e1333a000a55de8df033dce6e54ae
Component: engine
2014-08-28 11:04:53 -07:00
9d40e69de7
Update networking doc with clarified text regarding links usage
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: f6a2fc4c3370983043a4284be5d8a09c3ff3bb6e
Component: engine
2014-08-27 18:23:41 -07:00
ac32065d5c
Update /etc/hosts when linked container is restarted
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 450740c891c60dda15b7abe29f35b8e142c2c40e
Component: engine
2014-08-27 18:23:41 -07:00
9ed3d21c9e
Added Fred's suggestions.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: 77ca0ae9decbdcb8958c20f16d35ec34372b6efe
Component: engine
2014-08-27 11:49:26 -07:00
24190e7f53
Final changes.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: 161cc21f245cf05c6c2c168a6f5981989026e2cb
Component: engine
2014-08-26 14:01:10 -07:00
296956ed9d
Image additions and copy changes.
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: 1d1bb2ae4507f67bd7192dd9f19d13cd1bce7d53
Component: engine
2014-08-25 16:50:55 -07:00
8854caaae3
Additional formatting and markdown changes to B2D volume resize doc
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: e4ff140fddcc0b23e10e5db5a49e77e049460b14
Component: engine
2014-08-22 18:19:58 -07:00
0b4b4921d3
Initial commit: Increase Boot2Docker Volume + images
...
Signed-off-by: Hollie Teal <hollie@docker.com >
Upstream-commit: db3db49e9cd8c8fb0f230987e9f111a0509f4666
Component: engine
2014-08-22 17:06:28 -07:00
09240bd768
add small doc
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 26feb09fac7cfcafef36cc71df1176301c70eb53
Component: engine
2014-08-19 17:06:17 +00:00
c395d23539
Merge pull request #7126 from ostezer/update-certificates
...
Docs: articles/certificates.md rewrite.
Upstream-commit: 17112704b99405aa642df37d5c8b7e369dd0b4ab
Component: engine
2014-08-14 08:52:08 -04:00
b9d0f7cfec
Docs: articles/certificates.md rewrite.
...
This commit contains a re-structured re-write of the original
certificated.md file, containing the amendments proposed with
PR #7120 (commit ID bd28595e310ccfa98) by @timthelion.
Related to: https://github.com/dotcloud/docker/pull/7120
2014-07-30: Update/rebase/squash based on the comments from @jamtur01 and @fredlf.
2014-08-12: Update/rebase/squash based on the comments from @fredlf (of 2014-08-12).
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 7df54930716d3674f97d4a7e071a52f3769791ba
Component: engine
2014-08-12 14:49:08 +03:00
b38de9ff8f
tell the user what to expect, including that it is a verbode process.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: b94f2c4c6d6fa7b3efc0dbf8874735b12d00b57c
Component: engine
2014-08-12 10:32:38 +10:00
343e9e6a4a
Merge pull request #7412 from bfirsh/rename-docker-config
...
Rename DOCKER_CONFIG envvar to DOCKER_CERT_PATH
Upstream-commit: 0ea5160d2aff93f49f4288046de4c92727c2e097
Component: engine
2014-08-05 14:52:28 -07:00
3b38f1694c
Rename DOCKER_CONFIG envvar to DOCKER_CERT_PATH
...
DOCKER_CONFIG was introduced in #6984 .
We may use "config" for other purposes (e.g. #7232 ). Until we
have made a design decision around how configuration files will
work, DOCKER_CERT_PATH is a much safer name to rely on for future
compatibility.
Docker-DCO-1.1-Signed-off-by: Ben Firshman <ben@firshman.co.uk > (github: bfirsh)
Upstream-commit: a49de2c46713149053b0ee25313c6f7a39273c25
Component: engine
2014-08-04 17:36:53 -07:00
6c58b89d2d
networking.md: Networking between containers works without ip_forward
...
Docker-DCO-1.1-Signed-off-by: Erik Inge Bolsø <knan@redpill-linpro.com > (github: knan-linpro)
Upstream-commit: e6a084f4f8af3f7a5bc7c2c5ed375eaed61e8b8c
Component: engine
2014-08-01 10:41:16 +02:00
c5e8598f0d
Merge pull request #7035 from tianon/standardize-apt-get-install
...
Standardize "apt-get install" usage across the repo
Upstream-commit: 503d124677f5a0221e1bf8c8ed7320a15c5e01db
Component: engine
2014-08-01 11:43:37 +10:00
41bdc73a7f
Docs: articles/https minor amendments and update
...
This commit proposes some minor amendments and updates
for the articles/https.md document to fix certain errors, inc.:
- Marking commands / flags as code (e.g. `tlsverify`) [done before rebase]
- Capitalising the word Docker
- Normalizing headers to match the rest of the docs;
- Expanding the page description to match the page title and the content;
- Capitalizing HTTPS etc.;
- Some spelling error fixes;
- Line-length adjustments to make it easier to read the raw file.
It does not propose any fundemental changes to the structure of the document.
Certain changes were based before another update on this doc.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 711fb3e19d4caf7f084d8d1eaca85cfbaef6e978
Component: engine
2014-07-30 18:09:58 +03:00
18545c4dec
Apply @jamtur01's copy edit's to certificates.md
...
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz > (github: timthelion)
Upstream-commit: fae72c83be211c4331e1982a3d548c6101240501
Component: engine
2014-07-30 16:23:56 +03:00
e2390724e7
Standardize "apt-get install" usage across the repo
...
I might have missed some, but I think this is most of the offenders.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: fc637b5275c2fe23c9857a34316a783042d906b8
Component: engine
2014-07-28 17:41:59 -06:00
dd911c0f0c
Merge pull request #7238 from dericcrago/patch-1
...
apache2 was looking for two other directories
Upstream-commit: 1d21f75fa42cb51132c5c394987710b2200e7cb7
Component: engine
2014-07-25 19:38:47 -04:00
012e97ea38
updated article to reflect changes in config; fixed hyperlinks #7243
...
Docker-DCO-1.1-Signed-off-by: Andrew Weiss <andrew.weiss@outlook.com > (github: anweiss)
Upstream-commit: 7a5db6df995a131579020fd2cbacd49cb82e0aea
Component: engine
2014-07-25 15:49:33 -04:00
fa3a5b81e8
apache2 was looking for two other directories
...
/var/lock/apache2
/var/run/apache2
Upstream-commit: 3fb913ab7712634f1f311a9aab47c5eaa9f8fe9d
Component: engine
2014-07-25 10:14:52 -04:00
6ae4c9014c
update go import path and libcontainer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
2014-07-24 22:19:50 +00:00
5d850a0bb6
Resolve merge conflict, attempt 3
...
Docker-DCO-1.1-Signed-off-by: AJ Bowen <aj@gandi.net > (github: soulshake)
Upstream-commit: 319a8a241e0b9182ea309b886e2d23e2f4d73c6c
Component: engine
2014-07-21 12:18:59 -07:00
1a215f0eb4
Merge pull request #3070 from alexlarsson/certificates
...
Upstream-commit: c7bc929e0151b01e723feca1213a1adb9ffc7d9b
Component: engine
2014-07-18 18:27:00 -07:00
8cf0e7787b
Update runmetrics.md
...
Upstream-commit: 95caf8c4856ad477dbc835c6f9af5af5668389c0
Component: engine
2014-07-18 16:16:19 -05:00
4e42254381
Closes 6937. Allows setting of docker config dir.
...
Can now dynamically set the docker config directory through an
environment variable.
export DOCKER_CONFIG=/path/to/docker_config/
Default behavior remains the same, e.g. ~/.docker
Documentation for change added to the https.md docs.
Docker-DCO-1.1-Signed-off-by: James A. Kyle <james@jameskyle.org > (github: jameskyle)
Upstream-commit: c0471ee35aa58a99b423ad914301194e8f3663c1
Component: engine
2014-07-15 15:47:00 -07:00
eaad0a8c81
Clarified TLS Docs
...
Made a "Secure by default" section, create 2048-bit keys, various cleanups.
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
Upstream-commit: c3d91263a867aa4ac4da6c2cad52f0505a6eccf0
Component: engine
2014-07-11 14:35:01 -04:00
