beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
24077 commits 14 branches 412 tags 338 MiB
Commit graph

24077 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Crosby
6889c3276c Fix containerd proto for connection 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-05-09 15:17:10 -07:00
Michael Crosby
cfb9764386 Update runc and containerd deps 
containerd:     57b7c3da915ebe943bd304c00890959b191e5264
runc:           d49ece5a83da3dcb820121d6850e2b61bd0a5fbe

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-05-09 15:05:44 -07:00
unclejack
eb52730570 Merge pull request #22506 from cpuguy83/no_chroot 
Use pivot_root instead of chroot for chrootarchive
 2016-05-06 14:21:23 -07:00
Vincent Demeester
16d0a89593 Merge pull request #22485 from tkopczynski/test-utils 
Builder unit tests refactoring
 2016-05-06 22:05:02 +02:00
Alexander Morozov
a603fa33d5 Merge pull request #22317 from cyli/bump-notary-version 
Bump notary version to v0.3.0-RC1
 2016-05-06 12:54:53 -07:00
Aaron Lehmann
b16fac959b Merge pull request #22316 from brettdh/registry-socks-proxy 
Respect ALL_PROXY during registry operations
 2016-05-06 11:29:01 -07:00
Alexander Morozov
ebc5a61593 Merge pull request #22076 from thtanaka/rpmbuild-error 
DWZ problem with multiple golang binary caused OL7 RPM build to fail
 2016-05-06 11:22:27 -07:00
Alexander Morozov
4531c01509 Merge pull request #22236 from kencochrane/remove_git_from_rpm 
Exclude .git directories from the source RPMS and debian packages
 2016-05-06 11:16:12 -07:00
cyli
d869d2b0a0 Update trust.go to reflect NotaryRepository API changes: 
- Update now returns only an error
 - NewNotaryRepository now takes a trustpinning configuration - we will provide an empty one for now.

Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-05-06 10:59:28 -07:00
cyli
4710ed6304 Remove the pkcs11 build tag from the s390x Dockerfile, since it is using GCCGo 5.3, which 
is still on the Go 1.4 library, whereas the Notary Yubikey library needs interfaces from
Go 1.5

Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-05-06 10:59:28 -07:00
cyli
88c6675ed2 Bump notary version to v0.3.0-RC1 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-05-06 10:59:26 -07:00
Alexander Morozov
cf319e295a Merge pull request #22537 from tophj-ibm/test-seccomp 
ppc64le: build seccomp in dockerfile
 2016-05-06 10:05:55 -07:00
Sebastiaan van Stijn
83a6508af9 Merge pull request #22542 from thaJeztah/fix-outdated-supervisor-example 
docs: update supervisord example
 2016-05-06 14:58:13 +02:00
Doug Davis
cc01017bcf Merge pull request #22550 from allencloud/fix-typos 
fix typos in comments
 2016-05-06 08:56:33 -04:00
allencloud
3f77baf2ce fix typos 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-05-06 18:23:11 +08:00
Sebastiaan van Stijn
9a9ebc7f85 Merge pull request #22046 from cpuguy83/containerd_stdio 
Set containerd pdeathsig
 2016-05-06 09:26:16 +02:00
Vincent Demeester
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
Antonio Murdaca
a7d6a6c8a8 Merge pull request #22538 from mrunalp/update_engine_api 
Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09
 2016-05-06 09:06:51 +02:00
Brian Goff
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
Sebastiaan van Stijn
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
Mrunal Patel
97d95604e0 Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-05-05 18:36:09 -04:00
Alexander Morozov
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
Christopher Jones
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
Kenfe-Mickael Laventure
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
Vincent Demeester
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
Brian Goff
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
Vincent Demeester
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
objectified
c7e738d641 remove trailing comma from top command 
Signed-off-by: objectified <objectified@gmail.com>
 2016-05-05 13:18:23 +02:00
Vincent Demeester
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
Vincent Demeester
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
Vincent Demeester
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
Vincent Demeester
378a8e7175 Merge pull request #22508 from Microsoft/jjh/arg 
Windows: Support ARG in builder
 2016-05-05 09:09:55 +02:00
Zhu Guihua
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
Kenfe-Mickael Laventure
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
Brian Goff
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
Sebastiaan van Stijn
6870d9789a Merge pull request #22166 from moxiegirl/device-mapper-update 
Device mapper update
 2016-05-05 00:02:02 +02:00
Sebastiaan van Stijn
6dcadaa465 Merge pull request #22512 from tkopczynski/typos-supervisor 
Docs: fixing typos in admin/supervisor
 2016-05-04 23:57:55 +02:00
Sebastiaan van Stijn
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
Tibor Vass
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
John Howard
6b5c83bf18 Windows: Support ARG in builder 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-05-04 14:32:23 -07:00
Tomasz Kopczynski
74d382ff8d Docs: fixing typos in admin/supervisor 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
 2016-05-04 22:35:57 +02:00
Alexander Morozov
e4a4570369 Merge pull request #22475 from Microsoft/jjh/twoconcurrentcontainers 
Reduce time for TestRunTwoConcurrentContainers
 2016-05-04 12:38:13 -07:00
Chun Chen
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
Michael Holzheu
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
Antonio Murdaca
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
Antonio Murdaca
305ebfda8b vendor docker/distribution 9ec0d742d69f77caa4dd5f49ceb70c3067d39f30 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-05-04 18:57:35 +02:00
Antonio Murdaca
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
Brian Goff
973d6f0820 Merge pull request #22422 from cpuguy83/vendor_engine-api 
Update engine-api
 2016-05-04 10:12:29 -04:00
Sebastiaan van Stijn
e7584a7fdf Merge pull request #22499 from duglin/removeQuotes 
Remove unnecessary double-double quotes
 2016-05-04 15:35:45 +02:00
Sebastiaan van Stijn
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