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
Brandon Philips
4a3b36f443
registry: remove unneeded time.Duration()
...
These constants don't need to use time.Duration(). Fixup this file since
it seems to be the only one using this style.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
2014-06-08 11:04:06 -07: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
Johan Euphrosine
39320f9393
utils: add test for TimeoutConn
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-06-07 15:11:57 -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
Tianon Gravi
a59e1949b5
Update contrib/check-config.sh to check for CGROUP_FREEZER (which is newly required), and to use /proc/mounts for checking if we have a cgroup hierarchy instead of using /proc/$$/mountinfo (which on systemd might not list the cgroup hierarchy)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-07 08:43:40 -06: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
Paul Morie
92f46d233e
Docs: add ApiVersion to /version for remote API 1.12
...
Docker-DCO-1.1-Signed-off-by: Paul Morie <pmorie@gmail.com> (github: pmorie)
2014-06-06 15:13:25 -04: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
Michael Crosby
c624caa949
Merge pull request #6230 from tiborvass/bump_v0.12.0
...
Bump version to v0.12.0
2014-06-06 11:41:06 -07:00
Tibor Vass
14680bf724
Bump version to v0.12.0
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-06-05 17:59:19 -07:00
Tibor Vass
c06f32a7b9
Merge pull request #6228 from vieux/fix_restart_links
...
Fix restart links
2014-06-05 17:54:27 -07:00
Victor Vieux
30ba7546cb
add wait4 after kill
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-06 00:32:14 +00:00
Victor Vieux
34bd2d6229
start containers after all of them are registered
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-06 00:31:58 +00:00
James Turnbull
98d44ac491
Merge pull request #6226 from fredlf/copyedits
...
More minor copy edits, typo fix.
2014-06-05 17:07:18 -07:00
Tianon Gravi
c6dc8275b2
Merge pull request #6227 from crosbymichael/fix-test-compile
...
Don't compile nsinit during tests (it has package main)
2014-06-05 18:06:31 -06:00
Michael Crosby
3986bc659b
Don't compile nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-05 17:03:32 -07:00
Fred Lifton
762c528501
More minor copy edits, typo fix.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
2014-06-05 16:55:32 -07:00
Michael Crosby
acb9f156fd
Merge pull request #6207 from crosbymichael/nsinit-cli
...
Make nsinit nicer to work with libcontainer
2014-06-05 16:51:31 -07:00
Michael Crosby
c239c8ad9d
Merge pull request #6221 from crosbymichael/no-unmount
...
Move remount as private to the graph drivers
2014-06-05 16:51:10 -07:00
Michael Crosby
3609b051b8
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)
2014-06-05 16:02:25 -07:00