Commit Graph

24153 Commits

Author SHA1 Message Date
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 9ec0d742d6
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
Tianon Gravi 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
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
Vincent Demeester 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
Vincent Demeester 1c1947dd29 Merge pull request #22386 from wenchma/dockerd
Update the `docker daemon` to `dockerd` for document
2016-05-04 15:07:53 +02:00
Doug Davis 8eb2188bd9 Remove unnecessary double-double quotes
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-05-04 05:15:57 -07:00
Sebastiaan van Stijn 9f29f66c29 Merge pull request #22498 from Windfarer/patch-1
fix typo in docs
2016-05-04 13:37:28 +02:00
Eric Yang 176e9e2ffc fix typo
fix typo

Signed-off-by: Qizhao Yang <windfarer@gmail.com>
2016-05-04 19:18:38 +08:00
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Alexander Morozov 5892083a8f Merge pull request #22442 from thaJeztah/remove-issue-template-from-contributing
minor contributing.md cleanup
2016-05-03 13:15:26 -07:00
Alexander Morozov 3b0a166b10 Merge pull request #22478 from Microsoft/jjh/clirunsleepingcontainer
runSleepingContainer consistency
2016-05-03 13:11:27 -07:00
Anuj Bahuguna fd8a6775f5 Adding Rita Levi-Montalcini and Claude Shannon to name generator
Signed-off-by: Anuj Bahuguna "anujbahuguna.dev@gmail.com"

Signed-off-by: Anuj Bahuguna <abahuguna@fiberlink.com>
2016-05-04 00:14:09 +05:30
John Howard 481cc6716f RunSleepingContainer consistency
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-03 11:39:29 -07:00
John Howard 94f1e574b6 Reduce time for TestRunTwoConcurrentContainers
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-03 10:55:20 -07:00
Sebastiaan van Stijn 61d265964f Merge pull request #22468 from thaJeztah/fix-dotcloud-link
Fix dotCloud link
2016-05-03 19:30:13 +02:00
Tomasz Kopczynski ab2baf08f0 Builder unit tests refactoring
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-05-03 19:00:35 +02:00
Alexander Morozov 73a8b6e3aa Merge pull request #22441 from tkopczynski/20784-builder-remote-tests
Unit test for builder/remote.go
2016-05-03 09:51:19 -07:00
Vincent Demeester 9837ec4da5 Merge pull request #22461 from tonistiigi/fix-implicit-pull-test-arm
Move implicit pull test to use local registry
2016-05-03 11:56:29 +02:00
Sebastiaan van Stijn f2fd765450
Fix dotCloud link
dotCloud no longer exists, and since this part of the
readme is refering to "where it all started", replaced
the link with an archive link around the time that
Docker was publicly announced.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-03 11:43:43 +02:00
Tomasz Kopczynski e00ad7227e Unit test for builder/remote.go
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-05-03 10:20:10 +02:00
Yong Tang 4b5404f15e Docker inspect gave default log options even when the option is emtpy.
This fix tries to addess the issue in #21956 where `docker inspect`
will overwrite the log config options with default option even when
the `--log-driver` is not empty and `--log-opt` is empty. In this
situation, `docker inspect` and `docker run` is different.

With the introduction of #21153, the `HostConfig` will always have
the correct log-driver and log-opt values.

However, the previous processing of `docker inspect` was not updated
after the change in #21153. This results in the incorrect behavior.

This fix addresses this issue by updating `docker inspect` to conform
to #21153 so the the behavior of `docker inspect` and `docker run` is
consistent.

A integration test has been added to cover this fix.

This fix fixes #21956. This fix is related to #21153.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-02 21:14:42 -07:00
Tonis Tiigi 641c1808e1 Move implicit pull test to use local registry
Using hub only works for amd64 platforms.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-05-02 18:14:13 -07:00
Sven Dowideit 1c0edf6c39 Merge pull request #22394 from SvenDowideit/use-docs-base-oss
convert docs Dockerfiles to use docs/base:oss
2016-05-03 10:48:29 +10:00
Aaron Lehmann ca95f64968 Merge pull request #22457 from LK4D4/fix_error_format
image/tarexport: fix error formatting
2016-05-02 17:27:27 -07:00
Brian Goff 227c83826a Merge pull request #21945 from rhvgoyal/export-min-free-space
Export Mininum Thin Pool Free Space through docker info
2016-05-02 20:20:08 -04:00
Sebastiaan van Stijn 8d4ccd1925 Merge pull request #22459 from twistlock/authorization_docs_fix
Remove response modification sections from authorization design doc
2016-05-02 23:43:05 +02:00
Alexander Morozov 1c1a1280ac Merge pull request #22458 from estesp/betty-junods-cast
Add Joan & Samuel Curran, Welsh scientist and Irish physicist couple
2016-05-02 14:30:32 -07:00
Brian Goff 75e63c942e Merge pull request #21153 from mountkin/log-validator
inherit the daemon log options when creating containers
2016-05-02 16:12:43 -04:00
Liron Levin 638096431a Remove response modification sections from authorization design doc
Signed-off-by: Liron Levin <liron@twistlock.com>
2016-05-02 22:19:23 +03:00
Phil Estes 62bd539629 Add Joan & Samuel Curran, Welsh scientest and Irish physicist couple
In honor of Betty Junod's cast, and her tweet about Joan Curran:
https://twitter.com/BettyJunod/status/727194712956784641

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2016-05-02 14:50:16 -04:00
Brian Goff d4559313d5
Set Pdeathsig for containerd on SIGKILL
Makes sure containerd exits (when started by docker) if docker gets
SIGKILL'd.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-05-02 14:23:38 -04:00