259d714b93
Merge pull request #6235 from zdover23/06_Jun_2014
...
Fixed docker commit man page typos
2014-06-07 23:15:39 -07:00
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
cfd209fd6e
Merge pull request #6260 from vieux/disable_timeout_on_push
...
Disable timeout for push
2014-06-07 17:24:43 -07:00
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
a2c08792f0
Merge pull request #6258 from crosbymichael/capkill
...
Add CAP_KILL to unprivileged containers
2014-06-08 01:37:28 +03:00
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
94dc07c044
Merge pull request #6255 from vieux/improve_trusted_detection
...
improve trusted location detection
2014-06-08 00:28:18 +03:00
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
f7e4546af0
Merge pull request #6241 from proppy/fix-google-docs
...
docs/google: fix code blocks
2014-06-07 09:54:21 -07:00
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
0c611d9b15
Mention bugfixes in 0.12 changelog
2014-06-06 13:31:10 -07:00
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
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
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
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
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
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
c06f32a7b9
Merge pull request #6228 from vieux/fix_restart_links
...
Fix restart links
2014-06-05 17:54:27 -07:00
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
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
98d44ac491
Merge pull request #6226 from fredlf/copyedits
...
More minor copy edits, typo fix.
2014-06-05 17:07:18 -07:00
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
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
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
acb9f156fd
Merge pull request #6207 from crosbymichael/nsinit-cli
...
Make nsinit nicer to work with libcontainer
2014-06-05 16:51:31 -07:00
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
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
9329c0d2e0
Merge pull request #6224 from tiborvass/storage-options
...
Add --storage-opt daemon option and some devicemapper option (with fixes)
2014-06-05 16:00:03 -07:00
2f72fdf6ea
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
2014-06-06 01:26:53 +03:00
19ef3ff112
Merge pull request #6182 from mheon/fix_manpage_issue
...
Clarify manpages on docker start
2014-06-05 15:15:50 -07:00
b1ac791d84
Ensures files get closed properly. Closes #6213
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-06-05 15:13:43 -07:00
a2c553bd6b
Merge pull request #6219 from cpuguy83/fix_ssh_example_docs_root_login
...
Fixes broken ssh server example
2014-06-05 15:02:43 -07:00
64ce33268c
Merge pull request #6222 from SvenDowideit/pr_out_reflow_to_80_columns
...
Initial edits to home page
2014-06-05 14:58:29 -07:00
abcb724ed9
reflow to 80 columns
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-06-06 07:58:05 +10:00
09b19752e0
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)
2014-06-06 07:58:04 +10:00
6be75947ab
Merge pull request #6223 from jamtur01/rl
...
Revert "Initial links for Docker Hub rename"
2014-06-05 14:56:12 -07:00
fad14eda3a
Revert "Initial links for Docker Hub rename"
...
This reverts commit 2819677c21
2014-06-05 14:52:06 -07:00
6fa3acc96c
Merge pull request #6156 from jamtur01/links
...
Initial link update for Docs
2014-06-05 14:46:33 -07:00
cedab4d06a
Merge pull request #6220 from vieux/fix_redirect
...
Only forward auth to trusted locations
2014-06-05 14:34:37 -07:00
f362153157
Update for nsenter
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-05 14:31:16 -07:00
1a3d43c23e
Update nsinit to be nicer to work with and test
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-05 14:13:02 -07:00
a124531863
only forward auth to trusted locations
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-05 19:47:33 +00:00
d08c965e2c
Clarify effect of docker start on started container in CLI docs
...
This behavior changed from v0.9 to v0.10, so document it to prevent
any confusion.
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
2014-06-05 15:08:54 -04:00
04620e0154
Fixes broken ssh server example
...
Docker-DCO-1.1-Signed-off-by: cpuguy83 <cpuguy83@gmail.com> (github: cpuguy83)
2014-06-05 14:10:52 -04:00
734d108ed2
Merge pull request #6215 from cpuguy83/fix_volumes_from_api_doc
...
Fixes incorrect API spec for items moved to HostConfig
2014-06-05 10:33:16 -07:00
8c646ebf16
Fixes incorrect API spec for items moved to HostConfig
...
DNS and VolumesFrom were moved to HostConfig and as such are part of the
container start and not create.
For some reason 0.10 docs are correct (except for a missing quote in the
JSON") but 0.11 and latest are not.
Docker-DCO-1.1-Signed-off-by: cpuguy83 <cpuguy83@gmail.com> (github: cpuguy83)
2014-06-05 09:50:27 -04:00
0434a2ce64
devmapper: Add blkdiscard option and disable it on raw devices
...
The blkdiscard hack we do on container/image delete is pretty slow, but
required to restore space to the "host" root filesystem. However, it
is pretty useless on raw devices, and you may not need it in development
either.
In a simple test of the devicemapper backend on loopback the time to
delete 20 container went from 11 seconds to 0.4 seconds with
--storage-opt blkdiscard=false.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-06-05 11:45:59 +02:00
a226168a8b
devmapper: Add options for specifying block devices
...
This adds dm.datadev and dm.metadatadev options that you can use with
--storage-opt to set to specific devices to use for the thin
provisioning pool.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-06-05 11:45:55 +02:00
807bc2cd04
devmapper: Allow specifying filesystem for thin devices
...
This adds the following --storage-opts for the daemon:
dm.fs: The filesystem to use for the base image
dm.mkfsarg: Add an argument to the mkfs command for the base image
dm.mountopt: Add a mount option for devicemapper mount
Currently supported filesystems are xfs and ext4.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-06-05 11:25:06 +02:00
10083f4140
devicemapper: Probe what filesystem to use when mounting
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-06-05 11:03:19 +02:00
O.S. Tezer
Zac Dover
Michael Crosby
Victor Vieux
unclejack
Michael Crosby
James Turnbull
Tianon Gravi
Solomon Hykes
Johan Euphrosine
Paul Morie
Victor Vieux
Tibor Vass
Fred Lifton
Sven Dowideit
SvenDowideit
Matthew Heon
cpuguy83
Alexander Larsson