24a148d384
Merge pull request #11457 from jlhawn/pull_by_digest_verify
...
Add verification of image manifest digests on v2 push/pull
2015-03-20 10:49:16 -07:00
ba6de9121f
Merge pull request #11408 from Mashimiao/fix-wrong-tab-completion
...
fix wrong tab completion
2015-03-20 10:46:26 -07:00
0dca963f40
Merge pull request #11522 from duglin/FixCGroupTests
...
Ignore blank lines in getCgroupPaths
2015-03-20 10:44:57 -07:00
9ececa14ba
Add verification of image manifest digests
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-03-20 09:34:39 -07:00
d2cb3af75b
Merge pull request #11481 from jfrazelle/perms-on-release
...
cleanup docs/release.sh
2015-03-20 10:57:43 -04:00
301bd57b1d
Ignore blank lines in getCgroupPaths
...
w/o this I would see:
```
unexpected file format for /proc/self/cgroup - ""
```
while running the cgroup tests
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-20 05:36:34 -07:00
385d4beaa5
Merge pull request #11512 from vishh/parent-cgroup
...
Update --cgroup-parent cli integration test to use "memory" cgroup instead of "cpu"
2015-03-19 21:28:59 -07:00
844c0f154a
change perms on release and cleanup docs
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-03-19 21:07:02 -07:00
051bdf5c55
Merge pull request #11501 from duglin/TestLabels
...
Add a LABEL cache check testcase
2015-03-19 23:01:29 -04:00
97c573bf02
Add a LABEL cache check testcase
...
Thanks to @tiborvass's review of another PR it was noticed that
we didn't have a testcase to make sure the cache checking for LABEL
was being done properly. This adds a test for it.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-19 19:18:00 -07:00
49cb1a289f
Update --cgroup-parent cli integration test to use "memory" cgroup for detecting the test's
...
cgroups path instead of CPU.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2015-03-20 00:38:19 +00:00
56f483072d
Merge pull request #11456 from tianon/explicit-curl-missing-failure
...
Fail explicitly if curl is missing in contrib/download-frozen-image.sh
2015-03-19 16:23:07 -07:00
f574262ff7
Merge pull request #11470 from albers/events-filter-name
...
Remove 'name' filter from docker events documentation
2015-03-19 16:22:30 -07:00
0d3da36a5f
Merge pull request #11479 from falmp/patch-1
...
Fixed --read-only description indentation
2015-03-19 16:22:08 -07:00
fcc87c0df0
Merge pull request #11498 from jbnunn/patch-1
...
Typo/grammar corrections to dockerizing.md
2015-03-19 16:21:29 -07:00
5d90a8cc83
Merge pull request #11494 from sunyuan3/m2
...
add TestContainerRestartwithGoodContainer test case
2015-03-19 16:16:38 -07:00
5a239c0022
Merge pull request #11507 from crosbymichael/container-state
...
Cleanup libcontainer container state
2015-03-19 16:02:24 -07:00
9e5c0641e9
Merge pull request #11124 from tianon/autoremove-recommends
...
Set "Apt::AutoRemove::RecommendsImportant" to "false" in debootstrap
2015-03-19 16:00:40 -07:00
455a272aef
Merge pull request #11428 from vishh/parent-cgroup
...
Adding '--cgroup-parent' option.
2015-03-19 14:41:57 -07:00
2b12b099b8
Mount libcontainer state dir in tmpfs
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-19 14:27:17 -07:00
06c939e527
Ensure the container state is removed on daemon boot
...
This ensures that the libcontainer state is fully removed for a
container after it is terminated.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-19 14:21:19 -07:00
661c31737d
Merge pull request #11477 from dmcgowan/fix-auth-http-client
...
Update auth client configuration to use proper tls config
2015-03-19 14:17:47 -07:00
65f0ba42f5
Merge pull request #11502 from mrunalp/update_libcontainer
...
Update libcontainer to 4a72e540feb67091156b907c4700e580a99f5a9d
2015-03-19 14:15:35 -07:00
60ef4ae6fc
Update libcontainer to 4a72e540feb67091156b907c4700e580a99f5a9d
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-03-19 14:42:23 -04:00
831c796fb7
Merge pull request #11493 from proppy/patch-13
...
CONTRIBUTING.md: fix markdown formating
2015-03-19 09:15:16 -07:00
a8faba021c
Typo/grammar corrections to dockerizing.md
...
Added commas where necessary, edited typos to improve readability.
Signed-off-by: J. Nunn <jeffnunn@amazon.com>
2015-03-19 10:51:12 -05:00
d338c613bf
Merge pull request #11459 from simonswine/10001-ipv6-tests
...
[WiP] Adds testing for bridge's IPv6 support
2015-03-19 08:37:28 -07:00
b311066d24
Fixed --read-only description indentation
...
The wrong indentation was breaking documentation layout with code blocks.
Signed-off-by: Francisco Lopes <chico.lopes@gmail.com>
2015-03-19 11:53:50 -03:00
fdf49d758f
Merge pull request #11274 from MabinGo/selinux_enable_verify
...
Add logs when Docker enabled selinux (closes #11197 )
2015-03-19 10:34:55 -04:00
9d5eab1873
Merge pull request #11453 from duglin/HideDaemonDots
...
Hide dots on daemon startup when loglevel != info
2015-03-19 10:10:18 -04:00
ae1d3d6d68
Merge pull request #11455 from tianon/minor-formatting-consistency
...
Fix several very minor consistency issues
2015-03-19 09:57:57 -04:00
27fd77cc3b
Merge pull request #11496 from docker/revert-11495-m3
...
Revert "correct comment errors for netlink_linux.go"
2015-03-19 09:38:25 -04:00
d173669fdf
Revert "correct comment errors for netlink_linux.go"
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-03-19 14:38:00 +02:00
70092e5ebb
Merge pull request #11495 from sunyuan3/m3
...
correct comment errors for netlink_linux.go
2015-03-19 08:29:54 -04:00
c5fdc93f89
correct comment errors for netlink_linux.go
...
Signed-off-by: s00318865 <sunyuan3@huawei.com>
2015-03-19 20:29:30 +08:00
1339831906
add TestContainerRestartwithGoodContainer test case
...
Signed-off-by: s00318865 <sunyuan3@huawei.com>
2015-03-19 20:20:04 +08:00
1d9fb2583c
CONTRIBUTING.md: fix markdown formating
...
Signed-off-by: Johan Euphrosine <proppy@google.com>
2015-03-19 01:51:45 -07:00
ec7530afde
Remove 'name' filter from docker events documentation
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-03-19 08:51:36 +01:00
c861231a70
Merge pull request #11488 from stevvooe/address-digest-deadlock
...
Correctly close pipe after error in tarsum verification
2015-03-18 23:00:13 -07:00
33bec0a7f6
Merge pull request #11028 from jstangroome/patch-1
...
Correct IP/MAC address generation docs
2015-03-19 01:44:43 -04:00
c7267017e9
Adding integration tests for --cgroup-parent feature.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2015-03-19 02:34:42 +00:00
f7dd1333b5
Adding documentation for '--cgroup-parent' option.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2015-03-19 02:34:15 +00:00
0b1e2b5a55
Adding '--cgroup-parent' flag to docker run. This feature helps users implement more complex
...
resource isolation policies on top of what native docker provides.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2015-03-19 02:34:15 +00:00
0306a41909
Correctly close pipe after error in tarsum verification
...
This addresses a subtle deadlock where an error during a copy prevented pipe
closure to propagate correctly. By closing down the read end of the pipe rather
than the write end, the waiting writer is properly signaled. A nice side-effect
of this change is that errors encountered by io.Copy are now propagated to the
verifier's Write method.
A test to ensure validation errors for unsupported digest types has been added,
as well.
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-03-18 19:07:55 -07:00
1bf529a456
Add logs when Docker enabled selinux
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-03-19 09:46:53 +08:00
2cde817458
Merge pull request #11410 from cpuguy83/10191_build_resources
...
Allow setting resource constraints for build
2015-03-18 21:44:21 -04:00
e6ae89a45a
Allow setting resource constrains for build
...
Closes #10191
Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-03-18 20:57:13 -04:00
068d343ddf
Merge pull request #11452 from jeffdm/master
...
Adding Kitematic link to Mac OS X install instructions in docs
2015-03-18 17:32:48 -07:00
3ddf5d7517
Adding Kitematic link to Mac OS X install instructions
...
Signed-off-by: Jeffrey Morgan <jeff@kitematic.com>
2015-03-18 16:32:59 -07:00
42f5c87425
Merge pull request #11328 from jfrazelle/fix-docs-release-script
...
Fix clear cache docs release.
2015-03-18 16:06:27 -07:00
Jessie Frazelle
Josh Hawn
Phil Estes
Doug Davis
Michael Crosby
Jessica Frazelle
Doug Davis
Vishnu Kannan
Tianon Gravi
Michael Crosby
Arnaud Porterie
Mrunal Patel
moxiegirl
J. Nunn
Alexander Morozov
falmp
Tibor Vass
unclejack
s00318865
Johan Euphrosine
Harald Albers
James Turnbull
Stephen J Day
Mabin
Brian Goff
Jeffrey Morgan