centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-13 23:06:15 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,050 Commits 58 Branches 28 Tags
3f600c831be720fac60ff8a78aa3e344a7423c4e
Commit Graph

1667 Commits

Author SHA1 Message Date
Victor Vieux
62b2b1bac3 Merge pull request #6532 from jonboulle/fix_capitals 
be consistent in capitalization of Docker
 2014-06-23 11:14:27 -07:00
Sven Dowideit
fa8f89c521 Merge pull request #6536 from dgageot/patch-2 
Fix flag names
 2014-06-23 15:26:08 +10:00
James Turnbull
10b8d6b8b0 Merge pull request #6583 from jamtur01/sshd 
Updated SSH example to ensure it continues working
 2014-06-23 01:17:35 -04:00
SvenDowideit
4d7e28a7d7 Remove $ leaders from examples of editing text in a file 
not everything that is indented is a commandline example

Closes #6591

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-06-23 14:50:11 +10:00
James Turnbull
ad19e5e133 Merge pull request #6581 from fredlf/copyedit_dockerrepo 
Revised and fixed links on dockerrepo.md
 2014-06-22 22:17:40 -04:00
Sven Dowideit
1e847bff7a Remove mention of SSH passphrase, it was only present in v0.12 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-06-22 17:36:02 -07:00
Fred Lifton
ab0fc77ebe Fixed a typo 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
 2014-06-20 17:52:30 -07:00
Fred Lifton
c70fbae3ed Revised and fixed links on dockerrepo.md 
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
 2014-06-20 17:10:20 -07:00
Paul Weaver
5266d6fa7b Clean up some uses on 'an' in builder docs 2014-06-20 22:36:31 +01:00
Paul Weaver
1bcc37caec Fix minor typo and improve wording 2014-06-20 22:21:18 +01:00
Jonathan Boulle
6d14e9f1ac be consistent in capitalization of Docker 
Docker-DCO-1.1-Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com> (github: jonboulle)
 2014-06-20 14:05:46 -07:00
Sven Dowideit
b2eb79b7da Merge pull request #6565 from shaunol/patch-1 
Update windows.md
 2014-06-20 23:27:12 +10:00
Sven Dowideit
ed833bb62d Merge pull request #6568 from jokajak/patch-2 
Minor typo/format fixes for dockerlinks.md
 2014-06-20 23:23:03 +10:00
James Turnbull
0d63d68e33 Merge pull request #6540 from lalyos/docs-installation-mac-windows 
Fix installation docs to use the new boot2docker command: ip
 2014-06-20 08:02:56 -05:00
James Turnbull
a32f3b4b50 Merge pull request #6566 from jokajak/patch-1 
Fix typo in networking.md
 2014-06-20 07:59:35 -05:00
Josh
66bccf3064 Minor typo/format fixes 
This fixes a code block typo so it renders as a code block.  Additionally synchronizes the variable prefix examples from 'DB' and 'DB1_' to 'DB_' and 'DB1_'
 2014-06-20 07:49:22 -04:00
Josh
cbdce9912d Fix typo in networking.md 
Minor typo fix
 2014-06-20 07:14:56 -04:00
shaunol
db9bf744ab Update windows.md 
Update Program Files path description, the default install folder is "Boot2Docker", rather than "Docker"
 2014-06-20 19:23:35 +12:00
Adam Singer
4efe02b3df full url to GCE image 
Docker-DCO-1.1-Signed-off-by: Adam Singer <financeCoding@gmail.com> (github: financeCoding)
 2014-06-19 22:01:10 -07:00
James Turnbull
4e286a9094 Merge pull request #6548 from jamtur01/sec 
Fixed #6545 - Updated Security article
 2014-06-19 20:21:07 -05: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
James Turnbull
346a350df4 Merge pull request #6538 from leeplay/patch-2 
Update dockerlinks.md
 2014-06-19 10:59:48 -05:00
James Turnbull
10eae16fa7 Updated SSH example to ensure it continues working 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-06-19 07:44:41 -05:00
James Turnbull
874698cb4a Merge pull request #6524 from behemphi/patch-1 
Update dockerizing.md
 2014-06-19 07:06:02 -05:00
lalyos
40966fa096 Fix installation docs to use the new boot2docker command: ip 
Docker-DCO-1.1-Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com> (github: lalyos)
 2014-06-19 13:00:45 +02:00
hyeongkyu.lee
7b1f34d626 Update dockerlinks.md 
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com> (github: leeplay)
 2014-06-19 18:45:31 +09:00
David Gageot
80bc06f1cf Fix flag names 2014-06-19 11:25:14 +02:00
James Turnbull
b1c114c3a7 Merge pull request #6519 from fredlf/latest-copyedits 
Copy edits to dockerhub.md, fixed a broken link.
 2014-06-19 01:45:20 -05:00
Boyd Hemphill
a841152069 Update dockerizing.md 2014-06-18 22:50:56 -05:00
Solomon Hykes
30313cacce Merge pull request #6363 from proppy/patch-5 
MAINTAINERS: add proppy for google.md
 2014-06-18 18:03:29 -07:00
Fred Lifton
8646bf4a40 Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl) 2014-06-18 17:50:24 -07:00
James Turnbull
2294294e19 Merge pull request #6468 from jstoja/6374-docs-apache-image 
Docs: apache image on installation
 2014-06-18 08:19:58 -05:00
kyu
438d26b405 fixed docker port command 2014-06-18 15:01:29 +09:00
Julien Bordellier
207d7807af Now using the nginx docker image instead of the apache one. dotcloud/docker/issues/6374 
Docker-DCO-1.1-Signed-off-by: Julien Bordellier <me@julienbordellier.com> (github: jstoja)
 2014-06-18 00:38:04 +08:00
James Turnbull
bf9482987f Merge pull request #6470 from adelton/dns-no-hostname 
The docker run --dns does not resolve hostname and having hostname in resolv.conf does not work.
 2014-06-17 10:13:12 -05:00
James Turnbull
0ba7f934ee Merge pull request #6473 from leeplay/userguide 
fix missing TAG for docker run
 2014-06-17 06:23:06 -05:00
kyu
cac97b6bd8 fix wrong command 2014-06-17 17:49:34 +09:00
Jan Pazdziora
e278082c21 The docker run --dns does not resolve hostname and having hostname in resolv.conf does not work. 
Docker-DCO-1.1-Signed-off-by: Jan Pazdziora <jpazdziora@redhat.com> (github: adelton)
 2014-06-17 09:40:59 +02:00
Marius Voila
2ed8b22099 fixed Automated Build page link 
Corrected the link in the Automated Builds page from  https://registry.hub.docker.io/builds/ to https://registry.hub.docker.com/builds/ as the *.io is not working
 2014-06-17 08:24:56 +01:00
SvenDowideit
21849f1a21 exclaimation marks cause shell pain - simplify it away 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-06-17 10:49:23 +10:00
SvenDowideit
7e9fbbba1c fixup small formatting 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-06-17 10:39:12 +10:00
Richard Harvey
2c5405f699 Updated Viewing App when on OSX 
Added section to show how to get IP address and view running python app if the user is using boot2docker on OSX

Docker-DCO-1.1-Signed-off-by: Richard Harvey <richard@squarecows.com> (github: richarvey)

Docker-DCO-1.1-Signed-off-by: Richard Harvey <richard@squarecows.com> (github: SvenDowideit)
 2014-06-17 10:39:11 +10:00
Sven Dowideit
b3e80c6935 Merge pull request #6438 from jamtur01/opts 
Fixed DOCKER_OPTS
 2014-06-17 10:16:07 +10:00
Sven Dowideit
8f6162f17b Merge pull request #6240 from pmorie/docs 
Add ApiVersion to doc example for remote API 1.12 /version
 2014-06-17 09:21:21 +10:00
Sven Dowideit
d5f7b4df1b Merge pull request #6306 from mheon/fix_manpage_issue 
Update documentation for docker pull
 2014-06-17 09:13:29 +10:00
Sven Dowideit
4e2cf53f4f Merge pull request #6449 from timthelion/host-net-docs 
Document the potential insecurity of --net host
 2014-06-17 09:06:27 +10:00
Timothy
ed5054389a Document the potential insecurity of --net host 
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)
 2014-06-16 20:40:07 +00:00
Matthew Heon
03ae463c8d Updated CLI documentation for docker pull with notes on specifying URL 
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
 2014-06-16 15:58:05 -04:00
James Turnbull
4e20407d82 Merge pull request #6304 from glyn/mac-build-no-sudo 
Do not build using sudo on Mac OS X
 2014-06-16 09:45:52 -04:00
Glyn Normington
1c05ddd645 Do not build using sudo on Mac OS X 
Building using sudo fails on Mac OS X, but is necessary on Linux.

See https://groups.google.com/d/topic/docker-dev/1EW_pfA1t9o/discussion for discussion.

Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
 2014-06-16 14:39:48 +01:00