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
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
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
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
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
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
SvenDowideit
7a498338c3
Remove the 'TABLE OF CONTENTS' header
...
Its tricked a number of readers, as its not a TOC, its just local to the
current topic. Now that the docs are not mobile responsive its not an
active UI element either.
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 8e851aaa27ef20a8a0c33b568e45c4c8c45db787
Component: engine
2014-06-09 06:21:07 +10:00
Aaron Huslage
6380330c31
Videos for installing b2d
...
Mac and Windows video embeds from YouTube
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
Upstream-commit: fa7946a510f75a118aaf0d419c0d6c2f6d3b8d73
Component: engine
2014-06-08 13:11:50 -07:00
John OBrien III
11001bd7bc
Update usingdocker.md
...
Added container name `nostalgic_morse` to end of `inspect -f` example
Upstream-commit: 862d3eb284f32a6d9318bb5f981133790314328a
Component: engine
2014-06-08 15:12:00 -04:00
James Turnbull
daa5389127
Merge pull request #6281 from jobrieniii/patch-2
...
Update usingdocker.md
Upstream-commit: 8ac4261263c9ed8dcd11d55b1937b5c24600dfb7
Component: engine
2014-06-08 12:05:36 -07:00
James Turnbull
c90fdfcfaa
Merge pull request #6275 from ostezer/docs-design-dev
...
Docker Docs styling overhaul
Upstream-commit: 8349e282a9df0ec98eb37efdf0ebe28a7c7ef3de
Component: engine
2014-06-08 12:03:59 -07:00
John OBrien III
85c3cc2615
Update usingdocker.md
...
Just noticed `sudo` missing on line 232. (Learning so doing lots of copying / pasting)
Upstream-commit: 2337f529995956546ba0fff2a952df978a40e953
Component: engine
2014-06-08 14:58:13 -04:00
John OBrien III
239f418c81
Update dockerizing.md
...
Upstream-commit: d6c494671fbc916aec11f0290fb359dbb4e74c30
Component: engine
2014-06-08 14:37:58 -04:00
Sébastien
b141ed9bf5
Update dockervolumes.md
...
Error on title note :)
Upstream-commit: 752c3e9208fc44ca25d9698170d41d28a3005cee
Component: engine
2014-06-08 20:31:10 +02:00
O.S. Tezer
176e92312b
Docker Docs styling overhaul
...
This commit/PR changes docs' styling with Docker general styling
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 38daa47ee24d88ae15600a5c0f6ebe9ef3f8f1c9
Component: engine
2014-06-08 11:18:24 -07:00
Sébastien
967a1996ae
Update dockerimages.md
...
Error on title Note.
Upstream-commit: 5f9a673025bc5025fd4550a4c18591a66d2fd815
Component: engine
2014-06-08 20:15:31 +02:00
Sébastien
9f47d9852d
Update dockerizing.md
...
Error on title Note :)
Upstream-commit: 31e8993d5725421d5979ec7fa247e353aea122b6
Component: engine
2014-06-08 17:25:53 +02:00
O.S. Tezer
d866bb2587
Merge pull request #6235 from zdover23/06_Jun_2014
...
Fixed docker commit man page typos
Upstream-commit: 259d714b9300f5b30f8da2380ae996d7b901e463
Component: engine
2014-06-07 23:15:39 -07:00
Zac Dover
fb8eee397b
BZ#1104401
...
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com > (github: zdover23)
Upstream-commit: 8f99875d030cb282090d41fbbf8669169fbc9e2f
Component: engine
2014-06-08 14:15:37 +10:00
Michael Crosby
d0a58d4a1e
Merge pull request #6260 from vieux/disable_timeout_on_push
...
Disable timeout for push
Upstream-commit: cfd209fd6eca089fab5d0cb94a81f362b194c978
Component: engine
2014-06-07 17:24:43 -07:00
Victor Vieux
c2d0bb307f
Disable timeout for push
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 8baafacf404265c95753e63d2b7510731359c4b4
Component: engine
2014-06-07 23:48:25 +00:00
unclejack
7eb900ab44
Merge pull request #6258 from crosbymichael/capkill
...
Add CAP_KILL to unprivileged containers
Upstream-commit: a2c08792f0e8477c0c185b93f7d20d59ae74e3ad
Component: engine
2014-06-08 01:37:28 +03:00
Michael Crosby
4f6cc66699
Add CAP_KILL to unprivileged containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: fa72eb3a58ebfec8ef1b27d8e7aa8cbdb41733a2
Component: engine
2014-06-07 15:18:18 -07:00
Victor Vieux
9f4eb42cca
improve trusted location detection
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: daa89c420caac0881b09e2a36feff977ec43d7cd
Component: engine
2014-06-07 21:17:56 +00:00
James Turnbull
63e43e0a44
Merge pull request #6241 from proppy/fix-google-docs
...
docs/google: fix code blocks
Upstream-commit: f7e4546af0daac44deaf59110529ebda483005fb
Component: engine
2014-06-07 09:54:21 -07:00
Solomon Hykes
d889591a8d
Mention bugfixes in 0.12 changelog
...
Upstream-commit: 0c611d9b15945fc6d94cc999684483421709a3df
Component: engine
2014-06-06 13:31:10 -07:00
Johan Euphrosine
de4a43cde3
docs/google: fix code blocks
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: e2119f3050b225ccaf25990e5d6714dae2de7afe
Component: engine
2014-06-06 13:11:21 -07:00
Tibor Vass
72c4f26c6c
Change version to 0.12.0-dev
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: c95f77866c18fcd75507bf72df405bc61ba50bb0
Component: engine
2014-06-06 11:45:57 -07:00
Tibor Vass
6a34dc5f38
Bump version to v0.12.0
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 14680bf724161785d164fd99de36e3eb03a823ef
Component: engine
2014-06-05 17:59:19 -07:00
Tibor Vass
2af79a6c4e
Merge pull request #6228 from vieux/fix_restart_links
...
Fix restart links
Upstream-commit: c06f32a7b9cb1cd40265a1cd42d52ed246cbe1e7
Component: engine
2014-06-05 17:54:27 -07:00
Victor Vieux
5bfe5a532a
add wait4 after kill
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 30ba7546cb5a1ff7e4915c5a25dd8d72b3bf735b
Component: engine
2014-06-06 00:32:14 +00:00
Victor Vieux
1d13810851
start containers after all of them are registered
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 34bd2d622910444ae0d30bd0ac32005e224074c1
Component: engine
2014-06-06 00:31:58 +00:00
James Turnbull
d76b5bb198
Merge pull request #6226 from fredlf/copyedits
...
More minor copy edits, typo fix.
Upstream-commit: 98d44ac491021463636c9f2ce0708f970b77c828
Component: engine
2014-06-05 17:07:18 -07:00
Michael Crosby
4a0a27b9ff
Don't compile nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 3986bc659be9ff83d521f82e3353b1f73b896cbc
Component: engine
2014-06-05 17:03:32 -07:00
Fred Lifton
fbe9e09f01
More minor copy edits, typo fix.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredfl)
Upstream-commit: 762c52850177d0eb9148e5f3a0df90c79043246b
Component: engine
2014-06-05 16:55:32 -07:00
Michael Crosby
1bb9f4a354
Merge pull request #6207 from crosbymichael/nsinit-cli
...
Make nsinit nicer to work with libcontainer
Upstream-commit: acb9f156fdf7f992d73a70c2697b62e3eb17bfc9
Component: engine
2014-06-05 16:51:31 -07:00
Michael Crosby
12d535e2c7
Move remount as private to the graph drivers
...
If this is at the root directory for the daemon you could unmount
somones filesystem when you stop docker and this is actually only needed
for the palces that the graph drivers mount the container's root
filesystems.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 3609b051b88565c0fe0615fd47ddb48eed549d27
Component: engine
2014-06-05 16:02:25 -07:00
Tibor Vass
e7cde49487
Merge pull request #6224 from tiborvass/storage-options
...
Add --storage-opt daemon option and some devicemapper option (with fixes)
Upstream-commit: 9329c0d2e08671e3d152c11595f398ff01e5fa18
Component: engine
2014-06-05 16:00:03 -07:00
unclejack
124f8c9778
Merge pull request #6145 from shykes/pr_out_pkg_testutils_utility_functions_to_facilitate_writing_go_tests
...
pkg/testutils: utility functions to facilitate writing Go tests
Upstream-commit: 2f72fdf6eac43ebb89028308a6d5a5fac0b93ecc
Component: engine
2014-06-06 01:26:53 +03:00
James Turnbull
4092b1735f
Merge pull request #6182 from mheon/fix_manpage_issue
...
Clarify manpages on docker start
Upstream-commit: 19ef3ff1126be62c6dcb0a24a797a09ad251e5bb
Component: engine
2014-06-05 15:15:50 -07:00
Tibor Vass
9fb60c3559
Ensures files get closed properly. Closes #6213
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: b1ac791d8426cd7b6fb5a19f5e918b26c83d83f6
Component: engine
2014-06-05 15:13:43 -07:00
Sven Dowideit
429e3bef53
Merge pull request #6219 from cpuguy83/fix_ssh_example_docs_root_login
...
Fixes broken ssh server example
Upstream-commit: a2c553bd6bb223fb5449f9875a8e2f40abb14994
Component: engine
2014-06-05 15:02:43 -07:00
SvenDowideit
cefcc5a5b7
reflow to 80 columns
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: abcb724ed90a1e68234bd9c1c0d9263557b67026
Component: engine
2014-06-06 07:58:05 +10:00
Fred Lifton
ccac994016
Initial copy edits to home page.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: SvenDowideit)
Upstream-commit: 09b19752e028f91644e3e2801f0fd616c4adc683
Component: engine
2014-06-06 07:58:04 +10:00