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
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
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
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
f26f8ec5a7
Update dockerizing.md
...
Upstream-commit: a84115206928efd8e506641d2f8f31d136a05041
Component: engine
2014-06-18 22:50:56 -05:00
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
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
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
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
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
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
43a017ff69
fixed docker port command
...
Upstream-commit: 438d26b4052307c29354edc9cd01e35d2e05137a
Component: engine
2014-06-18 15:01:29 +09:00
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
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
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
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
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
8d4f489b58
fix wrong command
...
Upstream-commit: cac97b6bd86fb3b741ff3ce75cf422ef378854b9
Component: engine
2014-06-17 17:49:34 +09:00
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
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
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
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
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
28dcd27f99
Merge pull request #6438 from jamtur01/opts
...
Fixed DOCKER_OPTS
Upstream-commit: b3e80c6935b0565cb1fafee6311a0de9abf23212
Component: engine
2014-06-17 10:16:07 +10:00
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
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
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
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
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
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
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
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
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
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
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
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
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
b82599c74a
dockervolumes: Fix a minor typo
...
Upstream-commit: 8df0b12d821d5a57051e9a92bc8687ac893deb3f
Component: engine
2014-06-16 09:52:23 +02:00
db3540c189
Merge pull request #6378 from evanderkoogh/patch-1
...
Linking containers added to API example
Upstream-commit: 50d49d0db887453b6c5483c9086cbdb68ad466d2
Component: engine
2014-06-15 20:29:50 -04:00
b025f435dc
Merge pull request #6433 from soulshake/small-typos
...
Fix spelling and grammar errors; remove seemingly out-of-place words
Upstream-commit: 50fde602a1f1ddf3c388bf33bb02d9486e9fa7b0
Component: engine
2014-06-15 11:36:19 -07:00
9cacf9c04c
docker-java has moved to new location
...
Upstream-commit: 520163a00ee22ddb3d689f7304db2af2784d3bdb
Component: engine
2014-06-15 20:16:51 +02:00
441ed363ff
Fixed DOCKER_OPTS
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 0b97725340504b57b0abfa112746a16ba6a0d631
Component: engine
2014-06-15 12:26:52 -04:00
6e2a69bea8
Fixed headers and ' characters
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 4adab34dfa9d3e128d022522adfc95c0a47dd8e0
Component: engine
2014-06-15 12:15:59 -04:00
288f2b5878
Fix spelling and grammar errors; remove seemingly out-of-place words
...
Docker-DCO-1.1-Signed-off-by: AJ Bowen <aj@gandi.net > (github: soulshake)
Upstream-commit: be9dcbbef5961357117448976411be155daac019
Component: engine
2014-06-15 01:18:11 +02:00
99ccd1838c
Fix several typos
...
Docker-DCO-1.1-Signed-off-by: Michael Prokop <github@michael-prokop.at > (github: mika)
Upstream-commit: c0c58b6b46626c0ae5cc9c0b37519c505f5a8484
Component: engine
2014-06-14 23:16:30 +02:00
839293c4cd
Fix missing leading slash for /bin/bash executable
...
Upstream-commit: e9f1f760f220cbd0f3df68b09ab8c10b27dfa0e9
Component: engine
2014-06-14 15:54:27 +02:00
61604356ac
Merge pull request #6386 from cpuguy83/fix_link_docs
...
Adds info on how to get env vars from container
Upstream-commit: c40602b25483d7bf6e58b715717ade0ad9541b11
Component: engine
2014-06-13 23:12:32 -07:00
9ecc7d002d
Fixed whitespace errors
...
Upstream-commit: 1a441d9aeaf929abb89958675018ebc5e0868844
Component: engine
2014-06-13 17:08:53 -07:00
1dbb9e510c
Note user name and password in docs on boot2docker
...
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@docker.com > (github: nathanleclaire)
Upstream-commit: 073382a9c61fb73b8d1915bf53fa6e8c5bd8fbb8
Component: engine
2014-06-13 15:38:45 -07:00
dfd42b4d5f
docs: add spotify docker-client link
...
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
Upstream-commit: 27b2d7ff7245ad57dcaa7f9ce8eeeee743373a85
Component: engine
2014-06-13 14:20:31 -04:00
