70aa42709e
Merge pull request #25271 from yongtang/25141-better-error-IP-address-autodetection
...
Better error messages when IP address autodetection fails
Upstream-commit: 361de697bbf62e8b1134cd54dc90bf0204473e5e
Component: engine
2016-08-01 11:00:21 -04:00
8c0fcc0e8f
Merge pull request #25258 from yongtang/24547-remove-require-network-from-swarm-tests
...
Remove testRequires(c, Network) from swarm integration tests
Upstream-commit: 2b90eaa596ee9429222973d3208da1c1f172c4e0
Component: engine
2016-08-01 13:33:36 +02:00
b68ed83409
Merge pull request #25268 from allencloud/better-container-kill-log
...
make container kill debug log readable
Upstream-commit: 3a538aca97dd206b22dc20c9f8f0981e63ac3771
Component: engine
2016-08-01 11:36:40 +02:00
2e1ae9907c
Merge pull request #25269 from allencloud/update-remote-api-docs-about-409
...
add status code 409 in attach in docs
Upstream-commit: 56cbfc587f3e30d7587a4a4969d5497aa07edc06
Component: engine
2016-08-01 09:30:07 +02:00
91f37c3194
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 >
Upstream-commit: 59db01049ac6a8e54490565dc44661f780c13734
Component: engine
2016-07-31 20:03:30 -07:00
35c6396c21
add status code 409 in attach in docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: b22a2919311fe0aaeb8802756f55486b8b020b2a
Component: engine
2016-08-01 01:21:50 +08:00
7b08c028b4
make container kill debug log readable
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 1102ac257b551feb3e048c731e4aa854e19011a2
Component: engine
2016-08-01 01:00:38 +08:00
ebd25734a8
Merge pull request #25224 from michael-holzheu/PR-TestRunSeccompUnconfinedCloneUserns-check
...
TestRunSeccompUnconfinedCloneUserns: Check for unprivileged_userns_clone
Upstream-commit: b38c25ad4108dadc6d92930b20a989aaea891767
Component: engine
2016-07-31 17:03:36 +01:00
aa6b958a56
Merge pull request #24773 from clnperez/cgroup-warnings
...
More accurate cgroup error messages
Upstream-commit: 4640c19a8854ed4efb365e6e0c7592ec1326983a
Component: engine
2016-07-31 16:49:47 +01:00
6b17dbd4f5
Merge pull request #25240 from allencloud/update-command-description-in-CLI
...
update command description in CLI
Upstream-commit: 849807d89a349db0f869a37c393203d812109d58
Component: engine
2016-07-31 12:56:23 +02:00
c5445bc4bb
Merge pull request #25239 from dlech/patch-1
...
Make it clear which parmeter is the user
Upstream-commit: c7fcf496af8f7f5a6f3ab5397857ecfe91cbc192
Component: engine
2016-07-31 08:54:53 +02:00
8eb814c15b
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 >
Upstream-commit: 85c9ef8a47fcf552ae9f436e7c00340dacf03030
Component: engine
2016-07-30 09:59:30 -07:00
e8a4996d93
Merge pull request #25066 from lixiaobing10051267/masterErr
...
Add checking err for IsWindowsClient()
Upstream-commit: 4554e6065100d493dd9cd2935901b8532a0dc504
Component: engine
2016-07-30 17:25:08 +01:00
b87e70e358
update command description in CLI
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 6c5988ed8c654527ee8dbae26d5618297f038cef
Component: engine
2016-07-31 00:06:18 +08:00
b84877b065
uppercase output in docker info related to swarm mode
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: ac13162464f4f80a274d075dca41c2da4d3d73be
Component: engine
2016-07-30 10:14:44 +08:00
6867071d80
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 >
Upstream-commit: e10ba68bfdbedb47b7e92c3aee5e66e5884d16c3
Component: engine
2016-07-29 19:08:20 -05:00
5473a6ca58
Merge pull request #25182 from sfsmithcha/clarify_join_token
...
Author Merge add advertise address, clarify join token
CI errors expected.
Upstream-commit: ee355e017d210bef02771a8de4733f820ae6b717
Component: engine
2016-07-29 16:10:20 -07:00
a28554905f
add advertise address, clarify join token
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 1e7219d40fcd3b9e3ef6d224e2926d5562fb7b74
Component: engine
2016-07-29 15:45:34 -07:00
95e7541ee8
Merge pull request #25197 from sfsmithcha/add_services_guide
...
author merge: add services guide to manage a swarm
Upstream-commit: 8b69d50c79f75f670fdc87e3e19c651551726605
Component: engine
2016-07-29 15:33:34 -07:00
48f7f6f55e
add services guide to manage a swarm
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 861d4dc989ae738a1c219291a96333a7577b1699
Component: engine
2016-07-29 15:01:52 -07:00
cfcf9ae655
Merge pull request #25243 from allencloud/better-daemon-log-on-graphdriver
...
use %s instead of %q when format in graphdirver log
Upstream-commit: 99525da57cc93706b380910e7f499a999036baca
Component: engine
2016-07-29 14:33:07 -07:00
bac80b795e
Merge pull request #24822 from swernli/skipV1push
...
Fixing v2 registry restriction for non-linux platforms.
Upstream-commit: 0eb1323fba5a46209e4aa99282129b0673c491e3
Component: engine
2016-07-29 14:18:47 -07:00
74764063d5
Merge pull request #24081 from Microsoft/jjh/signaltofile
...
Windows: Stack dump to file
Upstream-commit: 1e6fd0378b431425180bad9fe2c38b296c1bc5bf
Component: engine
2016-07-29 22:09:35 +02:00
6346058d77
Merge pull request #25237 from LK4D4/inc_reconcil_timeout
...
integration: drain node before stop in TestApiSwarmForceNewCluster
Upstream-commit: 8841f530a1e7c7b3c52a943b19e8b24accff9f42
Component: engine
2016-07-29 15:05:16 -04:00
e8d1954574
Merge pull request #24365 from xianlubird/bug/network-list
...
Change buildEndpointResource params avoid repeat visits resource
Upstream-commit: 6bf2db574bb7482b7abce23ef992ff15b6011458
Component: engine
2016-07-29 14:54:05 -04:00
658a5f6d39
use %s instead of %q when format in graphdirver log
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: dec4481e08179bb9fa9ae5adc5b8aa14f2fb5087
Component: engine
2016-07-30 02:12:55 +08:00
4baacc0926
Merge pull request #24819 from Microsoft/jjh/fix24766
...
Windows: Block (v2) pulling Linux images
Upstream-commit: 350c0281c5b7a00f7186925bd0effc09bc55ca6e
Component: engine
2016-07-29 19:48:38 +02:00
3e830fffcd
integration: drain node before stop in TestApiSwarmForceNewCluster
...
It's too long to wait for reschedule.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 307b7b0d151e949024e7ab7ad276b174802a75f2
Component: engine
2016-07-29 10:44:30 -07:00
458a96bbea
Bump VERSION to 1.13.0-dev
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 8af69c705720f7b4feec48dee092bdeeadf39e14
Component: engine
2016-07-29 10:25:06 -07:00
664efad9ed
1.12.0 CHANGELOG to master
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: ae33306b14ce3c156c6a3fb3dd67a1aeae426f16
Component: engine
2016-07-29 10:24:36 -07:00
0b9c568fe7
Bump VERSION to v1.12.0
...
Signed-off-by: Tibor Vass <tibor@docker.com >
(cherry picked from commit 8eab29edd820017901796eb60d4bea28d760f16f)
Upstream-commit: adba074489a5a0cd5671686303150839a66ee60f
Component: engine
2016-07-29 10:23:45 -07:00
481a5ed3bf
Merge pull request #24020 from yongtang/23973-rename-with-linked-container
...
Fix docker rename with linked containers
Upstream-commit: 10fcd30a905b527d99c1a2f82f2e67b100594d95
Component: engine
2016-07-29 12:24:35 -04:00
ca5f5427a8
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 >
Upstream-commit: 87e4e3af68741afcebf11499d1dcbc91b655b349
Component: engine
2016-07-29 12:16:03 -04:00
76803189a4
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 >
Upstream-commit: 846f33f93d9cd32ed90680d106cd5d9eb96b0ddd
Component: engine
2016-07-29 09:50:50 -05:00
d5baf8c1b5
Merge pull request #25210 from miaoyq/delete-a-useless-variable
...
delete a useless variable
Upstream-commit: a71033f8e5a0ab0b0e37438dc0ab15b81bdde24a
Component: engine
2016-07-29 16:05:39 +02:00
bbd602ff18
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}
Upstream-commit: 3b7ea4d8c3c217f1efc303d3b5e97c3743db6fe0
Component: engine
2016-07-29 09:59:46 +02:00
53ba6397c0
Merge pull request #25207 from sdurrheimer/zsh-completion-remove-swarm-inspect
...
Remove zsh completion for 'docker swarm inspect'
Upstream-commit: d3f32d212b042e369bd6af5e9c3064c429c6f9b7
Component: engine
2016-07-29 09:58:32 +02:00
e347f2b7f4
delete a useless variable
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 87cada6d7f62589ce77dc0557ad97f4140b49c70
Component: engine
2016-07-29 15:34:21 +08:00
d93ece1752
Add zsh completion for 'docker service {create,update} --container-label{-add,-rm}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ab95ec3dd927d5c0c303410519f07631c8c99a4e
Component: engine
2016-07-29 07:54:10 +02:00
e73302a349
Remove zsh completion for 'docker swarm inspect'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: f146f6127ce5c7a5f579b78f00bd06f68198ce0f
Component: engine
2016-07-29 07:41:27 +02:00
bb300af70f
Merge pull request #23759 from AkihiroSuda/cobraexec
...
Migrate exec command to cobra
Upstream-commit: 3d42bf5f120b6cbd38b54f71dff4343c316939a0
Component: engine
2016-07-29 07:41:02 +02:00
feb2160968
Merge pull request #24986 from mlaventure/add-live-restore-to-info
...
Add live restore to info
Upstream-commit: faf9dac22c902701eeae26cabaedea6d91e01bd5
Component: engine
2016-07-29 07:37:56 +02:00
1c72cebc59
Merge pull request #23969 from tkopczynski/20784-builder-dockerfile-dispatchers-2
...
Builder dispatchers unit tests
Upstream-commit: 0fc062d31ea00286c49d2310e245b6bb7b4a16e1
Component: engine
2016-07-29 07:26:48 +02:00
d22f93678b
Migrate exec command to cobra
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 9d9dff3d0d9e92adf7c2e59f94c63766659d1d47
Component: engine
2016-07-29 02:10:36 +00:00
c45216ee6a
Merge pull request #24535 from thaJeztah/minor-docs-fixup
...
docs: cleanup docker update docs
Upstream-commit: 498cd1742789481b5c9d75537d29d5f92ed9f20c
Component: engine
2016-07-29 02:53:01 +02:00
880aee0b42
Merge pull request #25189 from aaronlehmann/service-list-counter
...
service ls: Show tasks from nodes that are not down, not only "ready" nodes
Upstream-commit: 246d3cdb9adcbcbbc2aa9ed5027228e8cc742299
Component: engine
2016-07-29 02:48:43 +02:00
9b3fd45051
Merge pull request #22911 from vdemeester/20033-default-logging-tag-value
...
Standardize default logging tag value
Upstream-commit: 48569e0a35934c566b60b99c5c40ac13df517cac
Component: engine
2016-07-29 02:18:57 +02:00
c68f19845d
Add live-restore state to daemon reload event
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: ff62681d59231489e1ef01767a4db66efd54cf2f
Component: engine
2016-07-28 17:10:40 -07:00
e1f42120bb
Add live-restore state to docker info output
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 189aaf8aea953c591f36ac340ad96def1131e869
Component: engine
2016-07-28 17:10:40 -07:00
eec8319268
Rename config LiveRestore to LiveRestoreEnabled
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: b94542239313bbf960e6718c6b54bbbcbacdfffa
Component: engine
2016-07-28 17:10:40 -07:00
