Commit Graph
8810 Commits
Author SHA1 Message Date
Alexandr Morozov 6c57622b2a Don't exit on eof in header reading in stdcopy
There was random lines drops in docker logs because of this
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: b1bae925341f45736fcafaeaf8c75274e9ad4305
Component: engine
2014-06-11 15:13:31 +04:00
James Turnbull b71d34e96b Merge pull request #6339 from ostezer/docs-fix-css-title-conflict
docs: Fix docs' styling conflict with common names
Upstream-commit: 4cf40c968f072d51272217b30ef2b8f5cba55ffe
Component: engine
2014-06-10 13:40:22 -07:00
O.S. Tezer 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
James Turnbull 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
Sven Dowideit 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
Sven Dowideit 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
Tianon Gravi 4e8352c6cd Merge pull request #6252 from tianon/update-check-config
Update contrib/check-config.sh to check for CGROUP_FREEZER and to use /proc/mounts
Upstream-commit: 5ff3a28cb4955b5d933c17d0d9c6f8f0b6267d7d
Component: engine
2014-06-10 08:09:34 -06:00
Cruceru Calin-Cristian 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
Erik Hollensbe 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
unclejack 70824b0aaa Merge pull request #6317 from crosbymichael/libcontainerdep
Move libcontainer deps into libcontainer
Upstream-commit: fb2ac5bedb4e3e3d624dd8f4a4c595e066138a51
Component: engine
2014-06-10 03:16:15 +03:00
Michael Crosby b00f7d0626 Gofmt imports
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: bae6a5a616cfc382f45a25af13633681875ddff0
Component: engine
2014-06-09 16:01:57 -07:00
Michael Crosby 3c7670e68c Move libcontainer deps into libcontainer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 6158ccad97db51e756aafefb096d1163aa4d6439
Component: engine
2014-06-09 15:52:12 -07:00
Jeff Welch 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
Michael Crosby 2cf64a9662 Merge pull request #6305 from crosbymichael/merge_release_v1.0.0
Merge release v1.0.0
Upstream-commit: fd32fc80625c8e608332f48d69c1801c23a6ffa4
Component: engine
2014-06-09 07:17:43 -07:00
Michael Crosby 5b45d1841a Change version to v1.0.0-dev
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: faf5ef6f80632db948e112fcb1e29a53562ad0c8
Component: engine
2014-06-09 07:14:51 -07:00
Michael Crosby 8845816a75 Merge branch 'release' into merge_release_v1.0.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 07e9ac9ffedc07b92ac446fc6a9e7ad1f21e3301
Component: engine
2014-06-09 07:14:40 -07:00
Michael Crosby 76b1ae4677 Merge pull request #6303 from crosbymichael/bump_v1.0.0
Bump version to v1.0.0
Upstream-commit: d9939758e6a02cbd42e01635166fc168ef0470dd
Component: engine
2014-06-09 07:12:42 -07:00
James Turnbull c87123a2be Merge pull request #6302 from Costent/patch-1
Update windows.md
Upstream-commit: 5dc6339e33452ed071fe5f93d49d0f6068ff106d
Component: engine
2014-06-09 06:14:16 -07:00
William Riancho 9c48187761 Update windows.md
Replace "OS X" by "Windows"
Upstream-commit: 875d0b776d0ec4ba68491f82143e6f099a03944a
Component: engine
2014-06-09 11:23:54 +02:00
Sven Dowideit 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
James Turnbull 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
James Turnbull 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
James Turnbull 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
James Turnbull 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
Fred Lifton 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
Fred Lifton 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
Sven Dowideit 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
Sven Dowideit e8985434e5 Merge pull request #6265 from fredlf/copyedits
Copyedits
Upstream-commit: 83b446492c2fd7675809231d4934127db8d620ad
Component: engine
2014-06-08 16:47:12 -07:00
Fred Lifton 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
Michael Crosby 35f8f058d8 Bump to version v1.0.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 63fe64c471e7d76be96a625350468dfc65c06c31
Component: engine
2014-06-08 16:42:30 -07:00
Michael Crosby 95f4352346 Merge branch 'master' into bump_v1.0.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 9722c66dadace81be5db7326e2904e34591614bb
Component: engine
2014-06-08 16:40:19 -07:00
O.S. Tezer 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
unclejack 0df7356ec5 Merge pull request #6293 from vieux/fix_version_decode
Fix version numbering
Upstream-commit: e570987c4f83239aa342f137216f44dfe42b1a3f
Component: engine
2014-06-09 02:23:27 +03:00
Sven Dowideit 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
SvenDowideit 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
Sven Dowideit 42dc1b18d7 Merge pull request #6292 from ostezer/docs-merge-on-builds
Docs: Fix merge issue on docker-hub/builds.md
Upstream-commit: 23cc3e5c638055c572a72881b5b02bad95df7a38
Component: engine
2014-06-08 16:09:56 -07:00
Victor Vieux 3d809d2056 fix version numbering
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: e975687b9a877dc46b465b6ce8b811ce6fa02cda
Component: engine
2014-06-08 23:06:47 +00:00
O.S. Tezer 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
Sven Dowideit aae9545c47 Merge pull request #6291 from jamtur01/mac
Fixed issues in Mac or Windows
Upstream-commit: 23bdb3b3a6d5a1a5219a6b82ac6f22ec011b3e81
Component: engine
2014-06-08 15:56:52 -07:00
James Turnbull 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
Sven Dowideit 7d33e9cc9c Merge pull request #6289 from jamtur01/dev
Removed re-appearing production warnings
Upstream-commit: 4dc5315e3b226c043ee65f9738c5cb2223af4809
Component: engine
2014-06-08 15:36:17 -07:00
James Turnbull 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
James Turnbull bd6d044877 Merge pull request #6287 from jamtur01/userguide
Initial links
Upstream-commit: d87fdaa1e39049199a2a3b30cbb1069576a9959c
Component: engine
2014-06-08 14:57:40 -07:00
James Turnbull 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
James Turnbull c9c6a7abdd Merge pull request #6284 from SvenDowideit/remove-table-of-contents-eyebrow
Remove the 'TABLE OF CONTENTS' header
Upstream-commit: c9f216d2faa0b5eade0f9d0e1a8bd8cbe886de3b
Component: engine
2014-06-08 14:22:09 -07:00
James Turnbull c689522bef Merge pull request #6264 from SvenDowideit/add-osx-boot2docker-start
add an image to show the use of the Docker OSX applet
Upstream-commit: b737837882774c6610b278cd3d57a6bece217d56
Component: engine
2014-06-08 14:03:42 -07:00
Thatcher d644c497ca Merge pull request #6285 from ostezer/docs-new-style-improvements
Docs: Remove unused font and fix navigation links
Upstream-commit: 3cb59c5140a001ec802881f861515daaca25b1e6
Component: engine
2014-06-08 13:59:49 -07:00
O.S. Tezer 9979be41b2 Docs: Remove unused font and fix navigation links
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 55d645246aa61f74cf5cdc9c5dbb16828371cdd9
Component: engine
2014-06-08 13:57:34 -07:00
Sven Dowideit 18ca2526a5 add an image to show the use of the Docker OSX applet
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 90251a488d87614770ce7c10265e0b3c8d7f2f9b
Component: engine
2014-06-09 06:51:13 +10:00
Sven Dowideit 761500b35e Merge pull request #6283 from huslage/doc-videos
Videos for installing b2d
Upstream-commit: f72a31ae31acae3af54f48c936e72536cc10c4c7
Component: engine
2014-06-08 13:44:21 -07:00