1
0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Commit Graph

1824 Commits

Author SHA1 Message Date
Jonathan Boulle
ca9f863c20 be consistent in capitalization of Docker
Docker-DCO-1.1-Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com> (github: jonboulle)
Upstream-commit: 6d14e9f1acc3d5927cbd4f4b3c7ea0c691dea7bc
Component: engine
2014-06-20 14:05:46 -07:00
Sven Dowideit
fcdeff83df Merge pull request #6565 from shaunol/patch-1
Update windows.md
Upstream-commit: b2eb79b7dad44fcbfac31565bec3763bb7ec796c
Component: engine
2014-06-20 23:27:12 +10:00
Sven Dowideit
8b9e10c4f9 Merge pull request #6568 from jokajak/patch-2
Minor typo/format fixes for dockerlinks.md
Upstream-commit: ed833bb62d63ae037a91d38df617def548f3737a
Component: engine
2014-06-20 23:23:03 +10:00
James Turnbull
1d18ac109a Merge pull request #6540 from lalyos/docs-installation-mac-windows
Fix installation docs to use the new boot2docker command: ip
Upstream-commit: 0d63d68e33d0c74985482aafdd8a3c3c2f757efb
Component: engine
2014-06-20 08:02:56 -05:00
James Turnbull
b6eb05620c Merge pull request #6566 from jokajak/patch-1
Fix typo in networking.md
Upstream-commit: a32f3b4b50820d5d04b10948dab3dc9a13f01ae1
Component: engine
2014-06-20 07:59:35 -05:00
Josh
e3cc01df51 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_'
Upstream-commit: 66bccf3064effd910e47405dc738ba08a8d14b12
Component: engine
2014-06-20 07:49:22 -04:00
Josh
4982ce8f2c Fix typo in networking.md
Minor typo fix
Upstream-commit: cbdce9912d9f904b237e29dd2a1196367337628b
Component: engine
2014-06-20 07:14:56 -04:00
shaunol
c160f0471c Update windows.md
Update Program Files path description, the default install folder is "Boot2Docker", rather than "Docker"
Upstream-commit: db9bf744ab93f1e688bf986794c852abc40b873e
Component: engine
2014-06-20 19:23:35 +12:00
Adam Singer
64dc347e88 full url to GCE image
Docker-DCO-1.1-Signed-off-by: Adam Singer <financeCoding@gmail.com> (github: financeCoding)
Upstream-commit: 4efe02b3df67af544d398e435fbe567502bf0dea
Component: engine
2014-06-19 22:01:10 -07:00
James Turnbull
7c71f92cb5 Merge pull request #6548 from jamtur01/sec
Fixed #6545 - Updated Security article
Upstream-commit: 4e286a9094dc52a5dd709fd11787c8fb6b6fe38d
Component: engine
2014-06-19 20:21:07 -05:00
James Turnbull
af26e461d3 Fixed #6545 - Updated Security article
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: bf69b773ec4c817dcc276e4471fc85f762f18f9f
Component: engine
2014-06-19 16:13:20 -05:00
James Turnbull
2f32938e9d Merge pull request #6538 from leeplay/patch-2
Update dockerlinks.md
Upstream-commit: 346a350df4a9f8b6dac25d2b341fcc84139a46ad
Component: engine
2014-06-19 10:59:48 -05:00
James Turnbull
76247f5a34 Merge pull request #6524 from behemphi/patch-1
Update dockerizing.md
Upstream-commit: 874698cb4aaf10d7c1efe91bc15982e4d8c30c20
Component: engine
2014-06-19 07:06:02 -05:00
lalyos
fd6ce6d68b 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)
Upstream-commit: 40966fa0966b3acd1893852a5297526374b690f2
Component: engine
2014-06-19 13:00:45 +02:00
hyeongkyu.lee
5d3e706c66 Update dockerlinks.md
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com> (github: leeplay)
Upstream-commit: 7b1f34d6269b7076dda86e0288b906f553f19bd1
Component: engine
2014-06-19 18:45:31 +09:00
James Turnbull
228f6d739b Merge pull request #6519 from fredlf/latest-copyedits
Copy edits to dockerhub.md, fixed a broken link.
Upstream-commit: b1c114c3a779ab1d2655169b83f5a165483602bc
Component: engine
2014-06-19 01:45:20 -05:00
Boyd Hemphill
f26f8ec5a7 Update dockerizing.md
Upstream-commit: a84115206928efd8e506641d2f8f31d136a05041
Component: engine
2014-06-18 22:50:56 -05:00
Solomon Hykes
67efe6867d Merge pull request #6363 from proppy/patch-5
MAINTAINERS: add proppy for google.md
Upstream-commit: 30313cacce8d1b5c2e373fb2c08b539bfd25007f
Component: engine
2014-06-18 18:03:29 -07:00
Fred Lifton
e5b30f5226 Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
Upstream-commit: 8646bf4a403aa5333d00d0cea27e2dabe242146f
Component: engine
2014-06-18 17:50:24 -07:00
O.S. Tezer
03e5a3ec60 Docs styling update/upgrade
Closes https://github.com/dotcloud/docker/issues/6514
Closes https://github.com/dotcloud/docker/issues/6377
Closes https://github.com/dotcloud/docker/issues/6514
Closes https://github.com/dotcloud/docker/pull/6502

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 381050b1eeb90e3e91c16021b82a6e09cd307c41
Component: engine
2014-06-18 16:09:03 -07:00
James Turnbull
17421dcea4 Merge pull request #6497 from SvenDowideit/awscli-changes
pin awscli to 1.3.9, and then complexify the sync's to make them more li...
Upstream-commit: 4195fc04941d4f780187bdcc65c0a9d240216cd6
Component: engine
2014-06-18 08:46:30 -05:00
James Turnbull
3f0a0cfaf2 Merge pull request #6499 from SvenDowideit/add-redirects-for-renames
compared the 0.11 sitemap to the 1.0 one and these are the differences
Upstream-commit: ffe3ae7bfba3c17480ba11929fb7581b9089057f
Component: engine
2014-06-18 08:43:32 -05:00
James Turnbull
74a8a70c93 Merge pull request #6468 from jstoja/6374-docs-apache-image
Docs: apache image on installation
Upstream-commit: 2294294e19798a1c2ceb90c5a31a532bb85869c7
Component: engine
2014-06-18 08:19:58 -05:00
kyu
43a017ff69 fixed docker port command
Upstream-commit: 438d26b4052307c29354edc9cd01e35d2e05137a
Component: engine
2014-06-18 15:01:29 +09:00
SvenDowideit
d83699654c compared the 0.11 sitemap to the 1.0 one and these are the differences
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 42fe9327b9bb15354c5a7bdfee25f42e122fd994
Component: engine
2014-06-18 15:39:30 +10:00
SvenDowideit
61da490d61 pin awscli to 1.3.9, and then complexify the sync's to make them more likely to complete
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 6b352d1cfe33cb3f5f64a3c18bb9931e9225adf8
Component: engine
2014-06-18 12:38:45 +10:00
Julien Bordellier
da74dc358a 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)
Upstream-commit: 207d7807af35a3f1ee98e6401bff83146d2450f8
Component: engine
2014-06-18 00:38:04 +08:00
James Turnbull
d413b71710 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.
Upstream-commit: bf9482987f55d60c50fdf70525d20fd8ddd10e5e
Component: engine
2014-06-17 10:13:12 -05:00
James Turnbull
fcec122617 Merge pull request #6473 from leeplay/userguide
fix missing TAG for docker run 
Upstream-commit: 0ba7f934ee0fb3bf0953b1456792443e7faf0921
Component: engine
2014-06-17 06:23:06 -05:00
kyu
8d4f489b58 fix wrong command
Upstream-commit: cac97b6bd86fb3b741ff3ce75cf422ef378854b9
Component: engine
2014-06-17 17:49:34 +09:00
Jan Pazdziora
2ef780f316 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)
Upstream-commit: e278082c213d887322270eefb96fda6d76a082c0
Component: engine
2014-06-17 09:40:59 +02:00
Marius Voila
a96755d882 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
Upstream-commit: 2ed8b220998c11a0580adb10dc8647864748522a
Component: engine
2014-06-17 08:24:56 +01:00
SvenDowideit
53933481a7 exclaimation marks cause shell pain - simplify it away
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 21849f1a2149660005d465376d055924b6ab887a
Component: engine
2014-06-17 10:49:23 +10:00
SvenDowideit
fa879cab42 fixup small formatting
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 7e9fbbba1ca4682d3645c410636dc7c78d38c769
Component: engine
2014-06-17 10:39:12 +10:00
Richard Harvey
22dd81c469 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)
Upstream-commit: 2c5405f699c308eee0cfc87ec6dd8aa3bce1b2ef
Component: engine
2014-06-17 10:39:11 +10:00
Sven Dowideit
28dcd27f99 Merge pull request #6438 from jamtur01/opts
Fixed DOCKER_OPTS
Upstream-commit: b3e80c6935b0565cb1fafee6311a0de9abf23212
Component: engine
2014-06-17 10:16:07 +10:00
Sven Dowideit
c4f9cd6161 Merge pull request #6240 from pmorie/docs
Add ApiVersion to doc example for remote API 1.12 /version
Upstream-commit: 8f6162f17ba6684641312526b2bfd8b39607b714
Component: engine
2014-06-17 09:21:21 +10:00
Sven Dowideit
10692d0667 Merge pull request #6306 from mheon/fix_manpage_issue
Update documentation for docker pull
Upstream-commit: d5f7b4df1b96a49fe1523daec48a01f2c1cafa3e
Component: engine
2014-06-17 09:13:29 +10:00
Sven Dowideit
2ebe66f88a Merge pull request #6459 from ostezer/issue-5036-main-nav-top-level-click
Issue #5036 -> Click on nav bar goes to top level doc
Upstream-commit: 95ca361df6b1c2aab3fb8edd19a81ab6b1ad0138
Component: engine
2014-06-17 09:08:37 +10:00
Sven Dowideit
833bf1f98e Merge pull request #6449 from timthelion/host-net-docs
Document the potential insecurity of --net host
Upstream-commit: 4e2cf53f4fe39aac24ad23c02664daf8bf4fb568
Component: engine
2014-06-17 09:06:27 +10:00
O.S. Tezer
0701888e65 Issue #5036 -> Click on nav bar goes to top level doc
Closes issue #5036

This commit redirects the reader to top level doc upon clicking
on a main nav. menu item (eg. Installation [click] -> Mac OS X)

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 8ae966de75fade55da5e34bd65b83c8ceb27346b
Component: engine
2014-06-16 13:51:56 -07:00
Timothy
4c39400bd1 Document the potential insecurity of --net host
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)
Upstream-commit: ed5054389aa7cd0456bfdf1d940d3cdad0313f8f
Component: engine
2014-06-16 20:40:07 +00:00
O.S. Tezer
5a4f568984 Issue #5279 -> Introduce horizontal scrolling to code-blocks
Closes issue #5279

This commit re-introduces horizontal scrolling to docs' codeblocks

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 7a7bb43db5ecea4dd08af016a2528d0722bf79ac
Component: engine
2014-06-16 13:29:20 -07:00
Matthew Heon
65a88a1593 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)
Upstream-commit: 03ae463c8d77dd8d10e9fd9e37d984896ef9247e
Component: engine
2014-06-16 15:58:05 -04:00
James Turnbull
bee288d0b6 Merge pull request #6304 from glyn/mac-build-no-sudo
Do not build using sudo on Mac OS X
Upstream-commit: 4e20407d8260657bc823d6d02120972d718222b3
Component: engine
2014-06-16 09:45:52 -04:00
Glyn Normington
26c642c4fd 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)
Upstream-commit: 1c05ddd645c50102321274ec7595c8b62dd71335
Component: engine
2014-06-16 14:39:48 +01:00
Solomon Hykes
76dc816a6e Guillaume is busy full-time on his new business, and no longer available
as a maintainer.

Best of luck on your e-commerce business Guillaume, and thanks for all
the great contributions!

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 41d437117d13d445192b92a93955dec5c012512c
Component: engine
2014-06-16 06:22:15 -07:00
James Turnbull
86dabfb5d3 Merge pull request #6443 from catharsis/patch-1
dockervolumes: Fix a minor typo
Upstream-commit: 7085ec875fbfe927e555d1bdc485654682d698ab
Component: engine
2014-06-16 09:09:32 -04:00
Sven Dowideit
9246d93b3c Merge pull request #6437 from jamtur01/net
Fixed headers and ' characters
Upstream-commit: 2b468dc283d1379dd7d24dbdae4de8c92b2ae9ab
Component: engine
2014-06-16 20:19:03 +10:00
Anton Löfgren
b82599c74a dockervolumes: Fix a minor typo
Upstream-commit: 8df0b12d821d5a57051e9a92bc8687ac893deb3f
Component: engine
2014-06-16 09:52:23 +02:00