starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-28 02:06:53 -04:00
Code Issues Packages Projects Releases Wiki Activity
26,302 Commits 15 Branches 323 Tags
fa68c3585a53835c9ca0e200c6845be8f9c463bc
Commit Graph
26302 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester 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
Vincent Demeester 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
Adam Walz 59a9a5fe59 Fix swarm manager node fault tolerance table 
In a cluster of 4 nodes, with a majority being 3 nodes, the fault
tolerance should be 1 node.

Signed-off-by: Adam Walz <adam@adamwalz.net>
Upstream-commit: 18d0c3933bec7fc1dc5ee8d4d1bc15235d86eeca
Component: engine
 2016-07-30 21:20:54 -06:00
Yong Tang 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
Sebastiaan van Stijn 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
Yong Tang a1efc2cd7a Output external CAs in swarm mode with docker info 
This fix tries to address the issue raised in 25195 where external
CA configurations are not present in `docker info`.

This fix adds the output of external CAs in `docker info` in swarm
mode.

The test is done manually with:
```
docker run -p 8888:8888 -e CXFSSL_ADDRESS=0.0.0.0 -d fabric8/cfssl
docker swarm init --external-ca protocol=cfssl,url=http://172.17.0.2:8888
```

The `docker info` output:
```
 Managers: 1
 Nodes: 1
 Orchestration:
  Task History Retention Limit: 5
 Raft:
  Snapshot interval: 10000
  Heartbeat tick: 1
  Election tick: 3
 Dispatcher:
  Heartbeat period: 5 seconds
 CA configuration:
  Expiry duration: 3 months
  External CAs:
    cfssl: https://172.17.0.2:8888
```

This fix fixes 25195.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 995128e9ebfc1a84bbfe8765d3642f132a4f630d
Component: engine
 2016-07-30 09:14:16 -07:00
allencloud 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
Vincent Demeester 03a97280a7 Merge pull request #25254 from allencloud/uppercase-output-in-docker-info 
uppercase output in docker info related to swarm mode
Upstream-commit: da168a5469b75959523e73a2871cda6ab1680b1f
Component: engine
 2016-07-30 18:00:04 +02:00
lixiaobing10051267 aedbd97f20 Give the correct link of docker swarm init 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: e8279afb1a9439b482d9e3a66dcc46f155aa5251
Component: engine
 2016-07-30 16:33:43 +08:00
allencloud 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
David Lechner 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
Charles Smith 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
Charles Smith 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
Charles Smith 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
Charles Smith 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
Tibor Vass 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
John Howard 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
Sebastiaan van Stijn 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
Brian Goff 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
Brian Goff 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
allencloud 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
Sebastiaan van Stijn 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
Alexander Morozov 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
Tibor Vass 9bbc0950e9 Merge pull request #25238 from tiborvass/merge_release_1.12.0 
Merge release 1.12.0
Upstream-commit: 295679cabe26010f4d8da3b878022fcb3a9475b2
Component: engine
 2016-07-29 10:44:22 -07:00
Tibor Vass 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
Tibor Vass 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
Tibor Vass 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
Brian Goff 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
Michael Holzheu 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
Christy Perez 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
Sebastiaan van Stijn 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
Bryan Boreham 9111a66ef5 Use the name of the first unix socket in DOCKER_OPTS 
Otherwise the while loop waits forever, checking for
a filename made up of all the names.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: 68dab9bd0910e22c96d5dfcbd4e972f8ce770a88
Component: engine
 2016-07-29 14:04:43 +01:00
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Yanqiang Miao 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
Steve Durrheimer 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
Steve Durrheimer 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
Vincent Demeester 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
Vincent Demeester 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
Vincent Demeester 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
Akihiro Suda 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Daniel Nephin 3564d84153 Remove unnecessary CmdWithArgs 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c0d2f7b33869cf749efcbab003bdb9bd2f665cec
Component: engine
 2016-07-28 20:14:14 -04:00
Daniel Nephin 6486d4730a Remove hack from test name. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0ec20a3c015c998d43925554498a73b52307dc90
Component: engine
 2016-07-28 20:12:36 -04:00
Kenfe-Mickael Laventure 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
Kenfe-Mickael Laventure 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
Kenfe-Mickael Laventure 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
Justin Cormack 8908f2eb82 Merge pull request #24422 from runcom/osxcross-update 
Dockerfile: update osx cross toolchain
Upstream-commit: 2a84206add5298ad6204ea51fda47be167ea0357
Component: engine
 2016-07-29 01:03:28 +01:00