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
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
fce019ee42
Fix typo
...
Upstream-commit: 52e88d92f0cceb9caa13160febcfe046732e0b86
Component: engine
2014-06-13 15:53:42 +02:00
5591b84fff
Merge pull request #6307 from W4RH4WK/master
...
restore logo for README.md
Upstream-commit: a8d6d28be4d1a9a5393ee7a268c964c555fc93c5
Component: engine
2014-06-12 10:21:10 -07:00
65832d3e7c
Adds info on how to get env vars from container
...
Currently the docs just say "let's go into the container and look at the
env vars", but doesn't show how to do it. It is also not currently
possible to enter the container as it is written in the doc
( container started with app.py and then somehow later on we have a
shell in the same container )
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: fbf7815b2591adce4d9584feb75592c6facb92e1
Component: engine
2014-06-12 09:26:55 -07:00
ab4671a371
Linking containers added to API example
...
Linking containers was not covered in the API documentation. I looked it up in the client source code and testing it manually.
Upstream-commit: 0bdadfe4e7547f58c7c32582c61912dfe1fc7302
Component: engine
2014-06-12 17:15:14 +08:00
67655304d5
Docs: Fixed logged-in header username label target
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 4ccd91f0d8052ada203e2551b11121613d54f44a
Component: engine
2014-06-11 18:09:43 -07:00
89cd4745de
Merge pull request #6351 from lenw/patch-1
...
minor spelling fix
Upstream-commit: 96c03d6d920c87305bdb8abfd188de71aaaf8bb5
Component: engine
2014-06-11 06:55:33 -07:00
f73a57c5b6
minor spelling fix
...
Upstream-commit: db00e224c2ae76096490c29357ef041ded7fadfc
Component: engine
2014-06-11 13:16:53 +02:00
30903b9316
Fix some bullet points so they render correctly.
...
Upstream-commit: a247af9c97be92f91242db51f4a9545db1bda702
Component: engine
2014-06-11 11:44:30 +01:00
0e782ce982
docs: Fix docs' styling conflict with common names
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Closes issue #6329
Upstream-commit: cb40e3302e41c62d17a4d7c1935dd28e64ee2748
Component: engine
2014-06-10 11:18:20 -07:00
84ab25456a
Merge pull request #6322 from crucerucalin/master
...
Repaired broken links in docs/sources/faq.md
Upstream-commit: 9a7bd6d95b42d89db4c005e6fcbc0535f4031bfb
Component: engine
2014-06-10 08:46:42 -07:00
5e91e03e8e
Merge pull request #6315 from erikh/ubuntu-latest-install-docs
...
Improve documentation on Ubuntu for getting the latest release of docker.
Upstream-commit: 9254a62cd612f2d1383c249f5a3c72354cf22b08
Component: engine
2014-06-11 00:54:52 +10:00
f41579c1d4
Merge pull request #6300 from whatthejeff/patch-1
...
Avoid history expansion.
Upstream-commit: b83a171f9e4851040724ae44d39ba371a80310c4
Component: engine
2014-06-11 00:49:29 +10:00
9b5969a515
Repaired broken links
...
Docker-DCO-1.1-Signed-off-by: Calin Cruceru <crucerucalincristian@gmail.com > (github: crucerucalin)
Upstream-commit: 53802d54d6e2d322f4cd13e2cc6c294e73ef8b4e
Component: engine
2014-06-10 08:21:12 +03:00
3ad02e9ae6
Improve documentation on Ubuntu for getting the latest release of
...
docker.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 7ab1a90e59b34abda1d2ffa1dd6683302927d9ec
Component: engine
2014-06-09 18:31:46 -07:00
5c1c8409ec
Avoid history expansion.
...
Docker-DCO-1.1-Signed-off-by: Jeff Welch <whatthejeff@gmail.com > (github: whatthejeff)
Upstream-commit: 052ad32a7b0dc93dafe7a27034b6911d6a71e849
Component: engine
2014-06-09 17:30:34 -04:00
a504b7f947
restore logo for README.md
...
Docker-DCO-1.1-Signed-off-by: Alex Hirsch <ax.warhawk@gmail.com > (github: W4RH4WK)
Upstream-commit: cacb5c0ddeb75a26c7687d3c4887d3eb998b104e
Component: engine
2014-06-09 22:15:13 +02:00
9c48187761
Update windows.md
...
Replace "OS X" by "Windows"
Upstream-commit: 875d0b776d0ec4ba68491f82143e6f099a03944a
Component: engine
2014-06-09 11:23:54 +02:00
89ba3efbb5
Merge pull request #6299 from jamtur01/12link
...
Fixed API 1.12 links and misc other fixes
Upstream-commit: e2fce7d61284c2b3a472bdb25eab082b66f82c54
Component: engine
2014-06-08 18:06:27 -07:00
5d75749431
Merge pull request #6297 from jamtur01/hub
...
Updated Docker Hub documentation
Upstream-commit: 135ced208cf652f65a9197a7a5e156cb6a1f4507
Component: engine
2014-06-08 18:03:28 -07:00
6285d5504f
Updated Docker Hub documentation
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 871299de0d08242aa6afd9f7ffd4d96e81905331
Component: engine
2014-06-08 18:01:44 -07:00
a88207cb57
Fixed API 1.12 links and misc other fixes
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 11fee48c2daa254a724836cad59cced7dc96e267
Component: engine
2014-06-08 17:59:22 -07:00
64028c6451
Merge pull request #6298 from fredlf/copyedits
...
Edits to Win and OSX install
Upstream-commit: 3b0ae3ec68247424ffa3784f6faaf1ca5ff68570
Component: engine
2014-06-08 17:56:34 -07:00
56d2049094
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
...
Upstream-commit: 9e2e8188ae8e2c566b3e10c1b23ae3fff8f9d64a
Component: engine
2014-06-08 17:36:49 -07:00
effedf34e2
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
...
Upstream-commit: 9bc75d008e66eb15b85ac32134e654e07ae9bb7e
Component: engine
2014-06-08 17:35:49 -07:00
96f2c6b763
Merge pull request #6295 from ostezer/docs-ref-index-hub
...
Docs: Rename index with hub for ref. section
Upstream-commit: a43cebf08897c841ad2948ab53568bf89d5e6fee
Component: engine
2014-06-08 16:47:48 -07:00
a67ce8a53c
Copy edits to Understanding Docker
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredfl)
Upstream-commit: 4fd9cc9980d9ef5a788a9163287fb50e13669cdb
Component: engine
2014-06-08 16:46:31 -07:00
c408832b20
Docs: Rename index with hub for ref. section
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: b0a46d1cb981418f6447b7bc43db907367b77829
Component: engine
2014-06-08 16:34:47 -07:00
f9d5535dba
Merge pull request #6294 from SvenDowideit/simplify-windows-networking-docs
...
Simplify the windows docs and fix formatting
Upstream-commit: c740c760173ccf09afadd4dce6c6e07e23b29692
Component: engine
2014-06-08 16:14:54 -07:00
9064f1cd9a
Simplify the windows docs and fix formatting
...
The mention of NAT is confusing for those coming from pre-host-only networking b2d
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 744d39a46683909b95ac5a769ae5f839a992d59a
Component: engine
2014-06-09 09:10:41 +10:00
8c2e58dcde
Docs: Fix merge issue on docker-hub/builds.md
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: c37b4828dd1062a2e031344a536bf54147481a95
Component: engine
2014-06-08 16:05:07 -07:00
0f870fc34d
Fixed issues in Mac or Windows
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: bb7baf183557fd963f4d1b36ac6a0253a3a0e717
Component: engine
2014-06-08 15:53:20 -07:00
10c982a15a
Removed re-appearing production warnings
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 78426304803bc651fec3ae9b42cf5983d6e03370
Component: engine
2014-06-08 15:35:32 -07:00
757c6e1688
Initial links
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: ef364f7e1faedddab502cf91c0551154c6c48176
Component: engine
2014-06-08 14:54:32 -07:00
