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
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
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
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
James Turnbull
f625565d75
Merge pull request #6282 from jobrieniii/patch-3
...
Update usingdocker.md
Upstream-commit: faeede02003c4ea4bec67b74fad8f74ab77029b8
Component: engine
2014-06-08 12:14:05 -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
James Turnbull
feac29ea8a
Merge pull request #6280 from jobrieniii/patch-1
...
Update dockerizing.md
Upstream-commit: 1ecb170352fc77e1e7ec9cfdf200b1cb163f6a11
Component: engine
2014-06-08 11:51:53 -07:00
John OBrien III
239f418c81
Update dockerizing.md
...
Upstream-commit: d6c494671fbc916aec11f0290fb359dbb4e74c30
Component: engine
2014-06-08 14:37:58 -04:00
James Turnbull
eb864572ee
Merge pull request #6279 from sebastienhouzet/patch-3
...
Update dockervolumes.md
Upstream-commit: 5b85dc3584b0f4ff02874c78e8fb475f26889288
Component: engine
2014-06-08 11:33:06 -07:00
Sébastien
b141ed9bf5
Update dockervolumes.md
...
Error on title note :)
Upstream-commit: 752c3e9208fc44ca25d9698170d41d28a3005cee
Component: engine
2014-06-08 20:31:10 +02:00
James Turnbull
02dc7c114e
Merge pull request #6278 from sebastienhouzet/patch-2
...
Update dockerimages.md
Upstream-commit: 7992fb5911ecbf7e18afdd64f4ead73c0362e927
Component: engine
2014-06-08 11:25:22 -07: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
James Turnbull
c9fed3e72d
Merge pull request #6272 from sebastienhouzet/patch-1
...
Update dockerizing.md
Upstream-commit: 1151f9ef9ec801fa25d2dcd8393d3aeea571ecc7
Component: engine
2014-06-08 08:39:42 -07: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
unclejack
51a1bf0d7b
Merge pull request #6255 from vieux/improve_trusted_detection
...
improve trusted location detection
Upstream-commit: 94dc07c0445b57038fde8d79df06fe4401eca796
Component: engine
2014-06-08 00:28:18 +03: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
Victor Vieux
b1b5a3ab57
Merge pull request #6238 from tiborvass/merge_release_v0.12.0
...
Merge release v0.12.0
Upstream-commit: 5d07362a842a67c48158dfe0edd46aecfd6f66e0
Component: engine
2014-06-06 11:55:50 -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