Граф коммитов

26202 Коммитов

Автор SHA1 Сообщение Дата
Michael Crosby befb456832 Merge pull request #25296 from thaJeztah/move-david-to-alumni
Move David to alumni
2016-08-01 08:34:08 -07:00
Sebastiaan van Stijn a54858e2fe
Move David to alumni
Unfortunately, combining a job as CTO and maintaining
Docker is too much to combine, so David asked to be
moved to the alumni section.

Thanks for all the awesome work on Docker!

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-01 17:11:17 +02:00
Brian Goff 361de697bb Merge pull request #25271 from yongtang/25141-better-error-IP-address-autodetection
Better error messages when IP address autodetection fails
2016-08-01 11:00:21 -04:00
Vincent Demeester 2b90eaa596 Merge pull request #25258 from yongtang/24547-remove-require-network-from-swarm-tests
Remove testRequires(c, Network) from swarm integration tests
2016-08-01 13:33:36 +02:00
Sebastiaan van Stijn 3a538aca97 Merge pull request #25268 from allencloud/better-container-kill-log
make container kill debug log readable
2016-08-01 11:36:40 +02:00
Vincent Demeester 56cbfc587f Merge pull request #25269 from allencloud/update-remote-api-docs-about-409
add status code 409 in attach in docs
2016-08-01 09:30:07 +02:00
Yong Tang 59db01049a Better error messages when IP address autodetection fails
This fix tries to improve error messages when IP address
autodetection fails, as is specified in 25141.

Previously, error messages only indicate that multiple IPs
exist when autodetection fails. In this fix, if one
interface consists of multiple addresses or multiple
interfaces consist of addresses, the error messages output
the address names and interface names so that end user could
take notice.

This fix is verified manually.
When multiple addresses exist on multiple interfaces:
```
$ sudo docker swarm init
Error response from daemon: could not choose an IP address
to advertise since this system has multiple addresses on different
interfaces (192.168.186.128 on ens33 and 192.168.100.199 on eth10)
 - specify one with --advertise-addr
```
When multiple addresses exist on single interface:
```
$ sudo docker swarm init
Error response from daemon: could not choose an IP address
to advertise since this system has multiple addresses
on interface ens33 (192.168.186.128 and 192.168.55.199)
- specify one with --advertise-addr
```

This fix fixes 25141.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-07-31 20:03:30 -07:00
allencloud b22a291931 add status code 409 in attach in docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-01 01:21:50 +08:00
allencloud 1102ac257b make container kill debug log readable
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-01 01:00:38 +08:00
Sebastiaan van Stijn b38c25ad41 Merge pull request #25224 from michael-holzheu/PR-TestRunSeccompUnconfinedCloneUserns-check
TestRunSeccompUnconfinedCloneUserns: Check for unprivileged_userns_clone
2016-07-31 17:03:36 +01:00
Sebastiaan van Stijn 4640c19a88 Merge pull request #24773 from clnperez/cgroup-warnings
More accurate cgroup error messages
2016-07-31 16:49:47 +01:00
Vincent Demeester 849807d89a Merge pull request #25240 from allencloud/update-command-description-in-CLI
update command description in CLI
2016-07-31 12:56:23 +02:00
Vincent Demeester c7fcf496af Merge pull request #25239 from dlech/patch-1
Make it clear which parmeter is the user
2016-07-31 08:54:53 +02:00
Yong Tang 85c9ef8a47 Remove testRequires(c, Network) from swarm integration tests
Since 24237 has been merged, it is not necessary to require network
for swarm integration tests (`integration-cli/docker_api_swarm_test.go`)
any more.

This fix removes testRequires(c, Network) from swarm integration
tests.

This fix could be verified by disable networking, and all related
tests pass.

This fix is related to 24547, 24490, 24237.

This fix fixes 24547.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-07-30 09:59:30 -07:00
Sebastiaan van Stijn 4554e60651 Merge pull request #25066 from lixiaobing10051267/masterErr
Add checking err for IsWindowsClient()
2016-07-30 17:25:08 +01:00
allencloud 6c5988ed8c update command description in CLI
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-31 00:06:18 +08:00
Vincent Demeester da168a5469 Merge pull request #25254 from allencloud/uppercase-output-in-docker-info
uppercase output in docker info related to swarm mode
2016-07-30 18:00:04 +02:00
allencloud ac13162464 uppercase output in docker info related to swarm mode
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-30 10:14:44 +08:00
David Lechner e10ba68bfd Make it clear which parmeter is the user
Using the environment variable here also has the advantage that it can be copied and pasted directly in a terminal and it will work.

Signed-off-by: David Lechner <david@lechnology.com>
2016-07-29 19:08:20 -05:00
Charles Smith ee355e017d Merge pull request #25182 from sfsmithcha/clarify_join_token
Author Merge add advertise address, clarify join token

CI errors expected.
2016-07-29 16:10:20 -07:00
Charles Smith 1e7219d40f add advertise address, clarify join token
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-29 15:45:34 -07:00
Charles Smith 8b69d50c79 Merge pull request #25197 from sfsmithcha/add_services_guide
author merge: add services guide to manage a swarm
2016-07-29 15:33:34 -07:00
Charles Smith 861d4dc989 add services guide to manage a swarm
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-29 15:01:52 -07:00
Tibor Vass 99525da57c Merge pull request #25243 from allencloud/better-daemon-log-on-graphdriver
use %s instead of %q when format in graphdirver log
2016-07-29 14:33:07 -07:00
John Howard 0eb1323fba Merge pull request #24822 from swernli/skipV1push
Fixing v2 registry restriction for non-linux platforms.
2016-07-29 14:18:47 -07:00
Sebastiaan van Stijn 1e6fd0378b Merge pull request #24081 from Microsoft/jjh/signaltofile
Windows: Stack dump to file
2016-07-29 22:09:35 +02:00
Brian Goff 8841f530a1 Merge pull request #25237 from LK4D4/inc_reconcil_timeout
integration: drain node before stop in TestApiSwarmForceNewCluster
2016-07-29 15:05:16 -04:00
Brian Goff 6bf2db574b Merge pull request #24365 from xianlubird/bug/network-list
Change buildEndpointResource params avoid repeat visits resource
2016-07-29 14:54:05 -04:00
allencloud dec4481e08 use %s instead of %q when format in graphdirver log
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-30 02:12:55 +08:00
Sebastiaan van Stijn 350c0281c5 Merge pull request #24819 from Microsoft/jjh/fix24766
Windows: Block (v2) pulling Linux images
2016-07-29 19:48:38 +02:00
Alexander Morozov 307b7b0d15 integration: drain node before stop in TestApiSwarmForceNewCluster
It's too long to wait for reschedule.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-07-29 10:44:30 -07:00
Tibor Vass 295679cabe Merge pull request #25238 from tiborvass/merge_release_1.12.0
Merge release 1.12.0
2016-07-29 10:44:22 -07:00
Tibor Vass 8af69c7057 Bump VERSION to 1.13.0-dev
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-29 10:25:06 -07:00
Tibor Vass ae33306b14 1.12.0 CHANGELOG to master
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-29 10:24:36 -07:00
Tibor Vass adba074489 Bump VERSION to v1.12.0
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 8eab29edd820017901796eb60d4bea28d760f16f)
2016-07-29 10:23:45 -07:00
Brian Goff 10fcd30a90 Merge pull request #24020 from yongtang/23973-rename-with-linked-container
Fix docker rename with linked containers
2016-07-29 12:24:35 -04:00
Michael Holzheu 87e4e3af68 TestRunSeccompUnconfinedCloneUserns: Check for unprivileged_userns_clone
On Ubuntu and Debian there is a sysctl which allows to block
clone(CLONE_NEWUSER) via "sysctl kernel.unprivileged_userns_clone=0"
for unprivileged users that do not have CAP_SYS_ADMIN.

See: https://lists.ubuntu.com/archives/kernel-team/2016-January/067926.html

The DockerSuite.TestRunSeccompUnconfinedCloneUserns testcase fails if
"kernel.unprivileged_userns_clone" is set to 0:

 docker_cli_run_unix_test.go:1040:
    c.Fatalf("expected clone userns with --security-opt seccomp=unconfined
              to succeed, got %s: %v", out, err)
 ... Error: expected clone userns with --security-opt seccomp=unconfined
              to succeed, got clone failed: Operation not permitted
 : exit status 1

So add a check and skip the testcase if kernel.unprivileged_userns_clone is 0.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-07-29 12:16:03 -04:00
Christy Perez 846f33f93d More accurate cgroup error messages
A kernel may support any of these, but an admin may have unmounted
certain cgroups, so let's include that possibility in the error so
as to avoid users thinking they have a kernel issue.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2016-07-29 09:50:50 -05:00
Sebastiaan van Stijn a71033f8e5 Merge pull request #25210 from miaoyq/delete-a-useless-variable
delete a useless variable
2016-07-29 16:05:39 +02:00
Sebastiaan van Stijn 3b7ea4d8c3 Merge pull request #25208 from sdurrheimer/zsh-completion-service-create-update-container-labels
Add zsh completion for 'docker service {create,update} --container-label{-add,-rm}
2016-07-29 09:59:46 +02:00
Sebastiaan van Stijn d3f32d212b Merge pull request #25207 from sdurrheimer/zsh-completion-remove-swarm-inspect
Remove zsh completion for 'docker swarm inspect'
2016-07-29 09:58:32 +02:00
Yanqiang Miao 87cada6d7f delete a useless variable
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-07-29 15:34:21 +08:00
Steve Durrheimer ab95ec3dd9
Add zsh completion for 'docker service {create,update} --container-label{-add,-rm}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-29 07:54:10 +02:00
Steve Durrheimer f146f6127c
Remove zsh completion for 'docker swarm inspect'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-29 07:41:27 +02:00
Vincent Demeester 3d42bf5f12 Merge pull request #23759 from AkihiroSuda/cobraexec
Migrate exec command to cobra
2016-07-29 07:41:02 +02:00
Vincent Demeester faf9dac22c Merge pull request #24986 from mlaventure/add-live-restore-to-info
Add live restore to info
2016-07-29 07:37:56 +02:00
Vincent Demeester 0fc062d31e Merge pull request #23969 from tkopczynski/20784-builder-dockerfile-dispatchers-2
Builder dispatchers unit tests
2016-07-29 07:26:48 +02:00
Akihiro Suda 9d9dff3d0d Migrate exec command to cobra
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-07-29 02:10:36 +00:00
Sebastiaan van Stijn 498cd17427 Merge pull request #24535 from thaJeztah/minor-docs-fixup
docs: cleanup docker update docs
2016-07-29 02:53:01 +02:00
Sebastiaan van Stijn 246d3cdb9a Merge pull request #25189 from aaronlehmann/service-list-counter
service ls: Show tasks from nodes that are not down, not only "ready" nodes
2016-07-29 02:48:43 +02:00