88c6675ed2
Bump notary version to v0.3.0-RC1
...
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-05-06 10:59:26 -07:00
cf319e295a
Merge pull request #22537 from tophj-ibm/test-seccomp
...
ppc64le: build seccomp in dockerfile
2016-05-06 10:05:55 -07:00
83a6508af9
Merge pull request #22542 from thaJeztah/fix-outdated-supervisor-example
...
docs: update supervisord example
2016-05-06 14:58:13 +02:00
cc01017bcf
Merge pull request #22550 from allencloud/fix-typos
...
fix typos in comments
2016-05-06 08:56:33 -04:00
3f77baf2ce
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-06 18:23:11 +08:00
54d09c6c2d
close http response body when attaching
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-06 16:58:22 +08:00
9a9ebc7f85
Merge pull request #22046 from cpuguy83/containerd_stdio
...
Set containerd pdeathsig
2016-05-06 09:26:16 +02:00
f65f4dc761
Merge pull request #22501 from michael-holzheu/22477-TestApiStatsContainerGetMemoryLimit-add-mem-cgroup-test
...
TestApiStatsContainerGetMemoryLimit: Add cgroup memory test
2016-05-06 09:12:27 +02:00
a7d6a6c8a8
Merge pull request #22538 from mrunalp/update_engine_api
...
Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09
2016-05-06 09:06:51 +02:00
e9bef66021
Merge pull request #21961 from yongtang/21956-docker-inspect-log-default-options
...
Docker inspect gave default log options even when the option is emtpy.
2016-05-05 21:02:39 -04:00
e38678e660
docs: update supervisord example
...
This updates the supervisor example documentation
to use an up-to-date version of Ubuntu.
Also reduced the use of "royal We", and tweaked some
language.
Finally, added some language hints for code-highlighting.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-06 01:52:51 +02:00
97d95604e0
Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-05-05 18:36:09 -04:00
68ba274d22
Merge pull request #22535 from mlaventure/fix-oraclelinux-6-rpm
...
Fix rpm generation on oraclelinux-6
2016-05-05 14:56:41 -07:00
107db89b6e
ppc64le: build seccomp in dockerfile
...
This pr adds in building seccomp to ppc64le.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-05-05 16:33:09 -04:00
05dec0b032
Fix rpm generation on oraclelinux-6
...
The uek kernel needs to be install first in order to get the correct
btrfs tools version.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-05-05 12:12:49 -07:00
bb125650c9
Merge pull request #21015 from cpuguy83/add_opaque_mount_id
...
When calling volume driver Mount, send opaque ID
2016-05-05 18:00:15 +02:00
0d3d8d6416
Merge pull request #22505 from runcom/authz-load-import
...
integration-cli: test load/import with authz plugins
2016-05-05 11:37:20 -04:00
c37ca913ff
Merge pull request #22529 from objectified/22528-remove-trailing-comma-from-top-command
...
Documentation: docker volumes: remove trailing comma from top command
2016-05-05 17:26:06 +02:00
c7e738d641
remove trailing comma from top command
...
Signed-off-by: objectified <objectified@gmail.com>
2016-05-05 13:18:23 +02:00
af916d316a
Merge pull request #22519 from mlaventure/add-dockerd-to-rpm-packaged-files
...
Add dockerd to the list of files included in generated rpms
2016-05-05 13:16:06 +02:00
6dd4c3569c
Merge pull request #19651 from zhuguihua/add_disk_quota_for_btrfs
...
Add disk quota support for btrfs
2016-05-05 13:15:45 +02:00
4de672690c
Merge pull request #22270 from runcom/too-many-login
...
distribution: errors: do not retry if too many login attempts
2016-05-05 09:44:09 +02:00
378a8e7175
Merge pull request #22508 from Microsoft/jjh/arg
...
Windows: Support ARG in builder
2016-05-05 09:09:55 +02:00
401c8d1767
Add disk quota support for btrfs
...
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
2016-05-05 14:35:13 +08:00
6118952e44
Add dockerd to the list of files included in generated rpms
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-05-04 20:45:22 -07:00
85988b33d2
Use pivot_root instead of chroot for chrootarchive
...
This fixes one issue with Docker running under a grsec kernel, which
denies chmod and mknod under chroot.
Note, if pivot_root fails it will still fallback to chroot.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-05-04 19:55:34 -04:00
6870d9789a
Merge pull request #22166 from moxiegirl/device-mapper-update
...
Device mapper update
2016-05-05 00:02:02 +02:00
6dcadaa465
Merge pull request #22512 from tkopczynski/typos-supervisor
...
Docs: fixing typos in admin/supervisor
2016-05-04 23:57:55 +02:00
1fe9715f30
Merge pull request #22423 from mlaventure/rm-containers-if-rm-in-progress-on-restart
...
Reset RemovalInProgress flag on daemon restart
2016-05-04 23:57:16 +02:00
0c68402887
Merge pull request #22403 from mlaventure/fix-docker-build-pkgs
...
Update build-deb to make correct use of DOCKER_BUILD_PKGS
2016-05-04 17:55:20 -04:00
6b5c83bf18
Windows: Support ARG in builder
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-04 14:32:23 -07:00
74d382ff8d
Docs: fixing typos in admin/supervisor
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-05-04 22:35:57 +02:00
e4a4570369
Merge pull request #22475 from Microsoft/jjh/twoconcurrentcontainers
...
Reduce time for TestRunTwoConcurrentContainers
2016-05-04 12:38:13 -07:00
a7b2f87b06
Add docs about how to extend devicemapper thin pool
...
Signed-off-by: Chun Chen <ramichen@tencent.com>
Update to device mapper
Entering comments
Signed-off-by: Mary Anthony <mary@docker.com>
2016-05-04 12:32:14 -07:00
8ba8189ee6
TestApiStatsContainerGetMemoryLimit: Add cgroup memory test
...
Currently on kernels booted without the "cgroup_enable=memory" kernel
parameter the testcase TestApiStatsContainerGetMemoryLimit fails with:
FAIL: docker_api_stats_test.go:231: TestApiStatsContainerGetMemoryLimit.pN52_github_com_docker_docker_integration_cli.DockerSuite
docker_api_stats_test.go:256:
c.Assert(fmt.Sprintf("%d", v.MemoryStats.Limit), checker.Equals, fmt.Sprintf("%d", info.MemTotal))
... obtained string = "0"
... expected string = "33759145984"
Fix this and skip the testcase if the kernel does not support cgroup memory
limit. In that case the output would be:
SKIP: docker_api_stats_test.go:231:
TestApiStatsContainerGetMemoryLimit.pN52_github_com_docker_docker_integration_cli.DockerSuite
(Test requires an environment that supports cgroup memory limit.)
ChangeLog:
----------
v4: Move TestApiStatsContainerGetMemoryLimit to docker_api_stats_unix_test.go
v3: Use existing "memoryLimitSupport" from requirements_unix.go
v2: Move check to requirements.go
Fixes #22477
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-05-04 20:46:41 +02:00
66fbc0c2a3
distribution: errors: do not retry on too many requests from registry
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-04 18:57:55 +02:00
305ebfda8b
vendor docker/distribution 9ec0d742d6
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-04 18:57:35 +02:00
9613acbe5c
integration-cli: test load/import with authz plugins
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-04 18:45:22 +02:00
084c72e760
Update contrib/mkimage/debootstrap to account for Debian LTS changes
...
See https://www.debian.org/News/2016/20160425 and https://wiki.debian.org/LTS/Using for more details.
> For Debian 7 "Wheezy" LTS there will be no requirement to add a separate wheezy-lts suite to your sources.list any more. In fact you will not notice the switch to LTS because after the official security support by the Debian Security Team ends, security updates will be provided via security.debian.org 's wheezy/updates.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-05-04 08:39:45 -07:00
973d6f0820
Merge pull request #22422 from cpuguy83/vendor_engine-api
...
Update engine-api
2016-05-04 10:12:29 -04:00
e7584a7fdf
Merge pull request #22499 from duglin/removeQuotes
...
Remove unnecessary double-double quotes
2016-05-04 15:35:45 +02:00
c14b1e3964
Merge pull request #22336 from thaJeztah/carry-21174-update-docker-info-docs
...
Updated docker-info output and documentation
2016-05-04 15:33:21 +02:00
4c88c67058
Merge pull request #21947 from boynux/fix-filter-exited
...
exited=0 in filter shouldn't show "Created" ones
2016-05-04 15:21:59 +02:00
1c1947dd29
Merge pull request #22386 from wenchma/dockerd
...
Update the `docker daemon` to `dockerd` for document
2016-05-04 15:07:53 +02:00
8eb2188bd9
Remove unnecessary double-double quotes
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-05-04 05:15:57 -07:00
9f29f66c29
Merge pull request #22498 from Windfarer/patch-1
...
fix typo in docs
2016-05-04 13:37:28 +02:00
176e9e2ffc
fix typo
...
fix typo
Signed-off-by: Qizhao Yang <windfarer@gmail.com>
2016-05-04 19:18:38 +08:00
9c52a04f38
Merge pull request #22446 from thaJeztah/add-daemon-reload
...
Add support for reloading daemon configuration through systemd
2016-05-04 12:38:40 +02:00
82141a28f5
Merge pull request #22482 from anujbahuguna/master
...
Adding Rita Levi-Montalcini and Claude Shannon to name generator
2016-05-03 22:28:16 +02:00
5892083a8f
Merge pull request #22442 from thaJeztah/remove-issue-template-from-contributing
...
minor contributing.md cleanup
2016-05-03 13:15:26 -07:00
cyli
Alexander Morozov
Sebastiaan van Stijn
Doug Davis
allencloud
Vincent Demeester
Antonio Murdaca
Brian Goff
Sebastiaan van Stijn
Mrunal Patel
Christopher Jones
Kenfe-Mickael Laventure
objectified
Zhu Guihua
Tibor Vass
John Howard
Tomasz Kopczynski
Chun Chen
Michael Holzheu
Antonio Murdaca
Tianon Gravi
Doug Davis
Eric Yang