Commit Graph

8780 Commits

Author SHA1 Message Date
Michael Crosby
d9939758e6 Merge pull request #6303 from crosbymichael/bump_v1.0.0
Bump version to v1.0.0
2014-06-09 07:12:42 -07:00
Michael Crosby
63fe64c471 Bump to version v1.0.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-08 16:42:30 -07:00
Michael Crosby
9722c66dad Merge branch 'master' into bump_v1.0.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-08 16:40:19 -07:00
unclejack
e570987c4f Merge pull request #6293 from vieux/fix_version_decode
Fix version numbering
2014-06-09 02:23:27 +03:00
Sven Dowideit
c740c76017 Merge pull request #6294 from SvenDowideit/simplify-windows-networking-docs
Simplify the windows docs and fix formatting
2014-06-08 16:14:54 -07:00
SvenDowideit
744d39a466 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)
2014-06-09 09:10:41 +10:00
Sven Dowideit
23cc3e5c63 Merge pull request #6292 from ostezer/docs-merge-on-builds
Docs: Fix merge issue on docker-hub/builds.md
2014-06-08 16:09:56 -07:00
Victor Vieux
e975687b9a fix version numbering
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-08 23:06:47 +00:00
O.S. Tezer
c37b4828dd Docs: Fix merge issue on docker-hub/builds.md
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
2014-06-08 16:05:07 -07:00
Sven Dowideit
23bdb3b3a6 Merge pull request #6291 from jamtur01/mac
Fixed issues in Mac or Windows
2014-06-08 15:56:52 -07:00
James Turnbull
bb7baf1835 Fixed issues in Mac or Windows
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-06-08 15:53:20 -07:00
Sven Dowideit
4dc5315e3b Merge pull request #6289 from jamtur01/dev
Removed re-appearing production warnings
2014-06-08 15:36:17 -07:00
James Turnbull
7842630480 Removed re-appearing production warnings
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-06-08 15:35:32 -07:00
James Turnbull
d87fdaa1e3 Merge pull request #6287 from jamtur01/userguide
Initial links
2014-06-08 14:57:40 -07:00
James Turnbull
ef364f7e1f Initial links
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-06-08 14:54:32 -07:00
James Turnbull
c9f216d2fa Merge pull request #6284 from SvenDowideit/remove-table-of-contents-eyebrow
Remove the 'TABLE OF CONTENTS' header
2014-06-08 14:22:09 -07:00
James Turnbull
b737837882 Merge pull request #6264 from SvenDowideit/add-osx-boot2docker-start
add an image to show the use of the Docker OSX applet
2014-06-08 14:03:42 -07:00
Thatcher
3cb59c5140 Merge pull request #6285 from ostezer/docs-new-style-improvements
Docs: Remove unused font and fix navigation links
2014-06-08 13:59:49 -07:00
O.S. Tezer
55d645246a Docs: Remove unused font and fix navigation links
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
2014-06-08 13:57:34 -07:00
Sven Dowideit
90251a488d 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)
2014-06-09 06:51:13 +10:00
Sven Dowideit
f72a31ae31 Merge pull request #6283 from huslage/doc-videos
Videos for installing b2d
2014-06-08 13:44:21 -07:00
SvenDowideit
8e851aaa27 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)
2014-06-09 06:21:07 +10:00
Aaron Huslage
fa7946a510 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)
2014-06-08 13:11:50 -07:00
James Turnbull
faeede0200 Merge pull request #6282 from jobrieniii/patch-3
Update usingdocker.md
2014-06-08 12:14:05 -07:00
John OBrien III
862d3eb284 Update usingdocker.md
Added container name `nostalgic_morse` to end of `inspect -f` example
2014-06-08 15:12:00 -04:00
James Turnbull
8ac4261263 Merge pull request #6281 from jobrieniii/patch-2
Update usingdocker.md
2014-06-08 12:05:36 -07:00
James Turnbull
8349e282a9 Merge pull request #6275 from ostezer/docs-design-dev
Docker Docs styling overhaul
2014-06-08 12:03:59 -07:00
John OBrien III
2337f52999 Update usingdocker.md
Just noticed `sudo` missing on line 232.  (Learning so doing lots of copying / pasting)
2014-06-08 14:58:13 -04:00
James Turnbull
1ecb170352 Merge pull request #6280 from jobrieniii/patch-1
Update dockerizing.md
2014-06-08 11:51:53 -07:00
John OBrien III
d6c494671f Update dockerizing.md 2014-06-08 14:37:58 -04:00
James Turnbull
5b85dc3584 Merge pull request #6279 from sebastienhouzet/patch-3
Update dockervolumes.md
2014-06-08 11:33:06 -07:00
Sébastien
752c3e9208 Update dockervolumes.md
Error on title note :)
2014-06-08 20:31:10 +02:00
James Turnbull
7992fb5911 Merge pull request #6278 from sebastienhouzet/patch-2
Update dockerimages.md
2014-06-08 11:25:22 -07:00
O.S. Tezer
38daa47ee2 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)
2014-06-08 11:18:24 -07:00
Sébastien
5f9a673025 Update dockerimages.md
Error on title Note.
2014-06-08 20:15:31 +02:00
James Turnbull
1151f9ef9e Merge pull request #6272 from sebastienhouzet/patch-1
Update dockerizing.md
2014-06-08 08:39:42 -07:00
Sébastien
31e8993d57 Update dockerizing.md
Error on title Note :)
2014-06-08 17:25:53 +02:00
O.S. Tezer
259d714b93 Merge pull request #6235 from zdover23/06_Jun_2014
Fixed docker commit man page typos
2014-06-07 23:15:39 -07:00
Zac Dover
8f99875d03 BZ#1104401
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)
2014-06-08 14:15:37 +10:00
Michael Crosby
cfd209fd6e Merge pull request #6260 from vieux/disable_timeout_on_push
Disable timeout for push
2014-06-07 17:24:43 -07:00
Victor Vieux
8baafacf40 Disable timeout for push
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-07 23:48:25 +00:00
unclejack
a2c08792f0 Merge pull request #6258 from crosbymichael/capkill
Add CAP_KILL to unprivileged containers
2014-06-08 01:37:28 +03:00
Michael Crosby
fa72eb3a58 Add CAP_KILL to unprivileged containers
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-07 15:18:18 -07:00
unclejack
94dc07c044 Merge pull request #6255 from vieux/improve_trusted_detection
improve trusted location detection
2014-06-08 00:28:18 +03:00
Victor Vieux
daa89c420c improve trusted location detection
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-07 21:17:56 +00:00
James Turnbull
f7e4546af0 Merge pull request #6241 from proppy/fix-google-docs
docs/google: fix code blocks
2014-06-07 09:54:21 -07:00
Solomon Hykes
0c611d9b15 Mention bugfixes in 0.12 changelog 2014-06-06 13:31:10 -07:00
Johan Euphrosine
e2119f3050 docs/google: fix code blocks
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-06-06 13:11:21 -07:00
Victor Vieux
5d07362a84 Merge pull request #6238 from tiborvass/merge_release_v0.12.0
Merge release v0.12.0
2014-06-06 11:55:50 -07:00
Tibor Vass
c95f77866c Change version to 0.12.0-dev
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-06-06 11:45:57 -07:00