0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
10663 commits 14 branches 412 tags 338 MiB
Commit graph

84 commits

Author SHA1 Message Date
unclejack
9fb34ae571 Merge pull request #6101 from LK4D4/ip_range_#4986 
Implement allocating IPs from CIDR within bridge network
 2014-09-22 17:09:16 +03:00
Frederick F. Kautz IV
3bb12d390a 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>
 2014-09-18 08:48:24 +04:00
James Turnbull
b645589071 Merge pull request #8056 from SvenDowideit/use-sudo-docker-everywhere 
Consistently use 'sudo docker' in examples
 2014-09-16 08:43:58 -04:00
Sven Dowideit
fc9a3b1c1b Consistently use 'sudo docker' in examples 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-09-16 11:49:05 +10:00
Fred Lifton
023241614e Merge pull request #8034 from michaljemala/patch-1 
The default name of the bridge created is called 'docker0'.
 2014-09-15 17:32:57 -07:00
Sven Dowideit
62b86613e8 Merge pull request #8037 from unclejack/shrink_docs_images 
docs: shrink images
 2014-09-16 10:13:03 +10:00
unclejack
90dcc7c840 docs: shrink images 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-15 14:46:29 +03:00
Michal Jemala
140229677a The default name of the bridge created is called 'docker0'. 2014-09-15 12:10:46 +01:00
Nicholas E. Rabenau
81357e12e7 Append instead of replace file contents 
I think the `DOCKER_OPTS` should be appended to `/etc/default/docker` and not replace the entire contents.
 2014-09-13 22:26:40 +02:00
Phil Estes
d6f4b2ebb4 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)
 2014-09-11 17:20:01 -04:00
Tim Smith
69a75c673c 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)
 2014-09-09 19:03:38 +00:00
James Turnbull
1ce3e22efc Very minor formatting update for docs/sources/articles/networking.md 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-09-07 22:39:37 -04:00
Sven Dowideit
31d2701377 Merge pull request #7749 from hollietealok/master 
Doc: Resizing Boot2Docker Volume with VirtualBox
 2014-08-28 16:08:29 -07:00
Hollie Teal
0f8d461ed7 Final tweaks. 
Signed-off-by: Hollie Teal <hollie@docker.com>
 2014-08-28 13:51:38 -07:00
Hollie Teal
ce73a3bcf7 Added changes brought up in PR discussion. 
Signed-off-by: Hollie Teal <hollie@docker.com>
 2014-08-28 11:04:53 -07:00
Erik Hollensbe
f6a2fc4c33 Update networking doc with clarified text regarding links usage 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-27 18:23:41 -07:00
Victor Vieux
450740c891 Update /etc/hosts when linked container is restarted 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-08-27 18:23:41 -07:00
Hollie Teal
77ca0ae9de Added Fred's suggestions. 
Signed-off-by: Hollie Teal <hollie@docker.com>
 2014-08-27 11:49:26 -07:00
Hollie Teal
161cc21f24 Final changes. 
Signed-off-by: Hollie Teal <hollie@docker.com>
 2014-08-26 14:01:10 -07:00
Hollie Teal
1d1bb2ae45 Image additions and copy changes. 
Signed-off-by: Hollie Teal <hollie@docker.com>
 2014-08-25 16:50:55 -07:00
Hollie Teal
e4ff140fdd Additional formatting and markdown changes to B2D volume resize doc 
Signed-off-by: Hollie Teal <hollie@docker.com>
 2014-08-22 18:19:58 -07:00
Hollie Teal
db3db49e9c Initial commit: Increase Boot2Docker Volume + images 
Signed-off-by: Hollie Teal <hollie@docker.com>
 2014-08-22 17:06:28 -07:00
Victor Vieux
26feb09fac add small doc 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-08-19 17:06:17 +00:00
James Turnbull
17112704b9 Merge pull request #7126 from ostezer/update-certificates 
Docs: articles/certificates.md rewrite.
 2014-08-14 08:52:08 -04:00
O.S. Tezer
7df5493071 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 bd28595e31) 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)
 2014-08-12 14:49:08 +03:00
Sven Dowideit
b94f2c4c6d 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)
 2014-08-12 10:32:38 +10:00
Michael Crosby
0ea5160d2a Merge pull request #7412 from bfirsh/rename-docker-config 
Rename DOCKER_CONFIG envvar to DOCKER_CERT_PATH
 2014-08-05 14:52:28 -07:00
Ben Firshman
a49de2c467 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)
 2014-08-04 17:36:53 -07:00
Erik Inge Bolsø
e6a084f4f8 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)
 2014-08-01 10:41:16 +02:00
Sven Dowideit
503d124677 Merge pull request #7035 from tianon/standardize-apt-get-install 
Standardize "apt-get install" usage across the repo
 2014-08-01 11:43:37 +10:00
O.S. Tezer
711fb3e19d 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)
 2014-07-30 18:09:58 +03:00
Timothy
fae72c83be Apply @jamtur01's copy edit's to certificates.md 
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: timthelion)
 2014-07-30 16:23:56 +03:00
Tianon Gravi
fc637b5275 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)
 2014-07-28 17:41:59 -06:00
James Turnbull
1d21f75fa4 Merge pull request #7238 from dericcrago/patch-1 
apache2 was looking for two other directories
 2014-07-25 19:38:47 -04:00
Andrew Weiss
7a5db6df99 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)
 2014-07-25 15:49:33 -04:00
Deric Crago
3fb913ab77 apache2 was looking for two other directories 
/var/lock/apache2
/var/run/apache2
 2014-07-25 10:14:52 -04:00
Victor Vieux
b3ee9ac74e update go import path and libcontainer 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-24 22:19:50 +00:00
soulshake
319a8a241e Resolve merge conflict, attempt 3 
Docker-DCO-1.1-Signed-off-by: AJ Bowen <aj@gandi.net> (github: soulshake)
 2014-07-21 12:18:59 -07:00
Solomon Hykes
c7bc929e01 Merge pull request #3070 from alexlarsson/certificates 2014-07-18 18:27:00 -07:00
Brett Kochendorfer
95caf8c485 Update runmetrics.md 2014-07-18 16:16:19 -05:00
James Kyle
c0471ee35a 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)
 2014-07-15 15:47:00 -07:00
Aaron Huslage
c3d91263a8 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)
 2014-07-11 14:35:01 -04:00
Bryan Bess
1df4049e17 Fix typos 
Docker-DCO-1.1-Signed-off-by: Bryan Bess <squarejaw@bsbess.com> (github: squarejaw)
 2014-07-09 23:14:06 -05:00
James Turnbull
a1ddf57216 Replaced selected docs references to ADD with COPY 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-07-09 17:13:26 -04:00
SvenDowideit
fa29b1f062 I'm going to wish I didn't do this 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-07-03 10:31:56 +10:00
Fred Lifton
96e2bfe28a Merge pull request #6781 from anweiss/6738-dscarticle 
Add Article for PowerShell DSC
 2014-07-01 15:48:19 -07:00
Andrew Weiss
5c344dca4b add DSC article 
Docker-DCO-1.1-Signed-off-by: Andrew Weiss <andrew.weiss@outlook.com> (github: anweiss)
 2014-07-01 17:32:55 -04:00
SvenDowideit
fde10cf87b blindly make all uses of e\.?g\.? into e.g., 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-07-01 09:55:19 +10:00
Josh
cbdce9912d Fix typo in networking.md 
Minor typo fix
 2014-06-20 07:14:56 -04:00
James Turnbull
bf69b773ec Fixed #6545 - Updated Security article 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-06-19 16:13:20 -05:00