toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,353 Commits 3 Branches 295 Tags
be8ea5149d4af916cc38edd7088e6b080488da44
Commit Graph
25353 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester 089ba4264f Update plugin command with defaulttag 
This way, you don't have to specify the ":latest" tag for some command
and not for others

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: cb321e82db662f5190a6d83a90677a9dd9fdcd31
Component: engine
 2016-06-17 10:18:18 -07:00
Derek McGowan 273dfbc1e3 Add tests for rmi 
Add integration test for removing by image id with tag and digest reference to the same repository.
Add integration test to ensure only tag to other repository remains after deleting tag with accompanying digest reference.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 5cff374b140b4a836b7082d009bcfe9a6e96f1af
Component: engine
 2016-06-17 10:15:56 -07:00
Derek McGowan a4ed5a6eee Update rmi logic for canonical references 
Updates the rmi code to treat canonical references as related to tagged references from the same repository during deletion.
Canonical references with a different repository name will be treated as separate references.
Updates the remove by ID logic to still remove an image if there is a single tag reference and only canonical references to the same repository remaining.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: a281be1c11d61deed7cb2853125e6d489f16aa2e
Component: engine
 2016-06-17 10:15:56 -07:00
Tibor Vass eeb8ef5ac1 plugins: fix usage for plugin commands 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 65ed9daf70ccf0027f4eac8049667130deb249ed
Component: engine
 2016-06-17 10:03:30 -07:00
Tibor Vass bc663a35ec plugins: remove automatic mounting of a state dir 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 15ff9de65801178a522c445ff9fb8964e21d12a0
Component: engine
 2016-06-17 10:03:30 -07:00
Tibor Vass dc0392a7ed plugins: install should not automatically accept all permissions 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 4b70d4561e4a9b57d80b70cfebc50831e230735a
Component: engine
 2016-06-17 10:03:30 -07:00
Tibor Vass e5e1b41404 Merge pull request #23675 from anusha-ragunathan/add_disable 
Add disable flag for plugin Install.
Upstream-commit: 906c1dc5a07827d48bede8e73e4b8673f711eea0
Component: engine
 2016-06-17 09:38:26 -07:00
Jana Radhakrishnan def8da9f42 Check if DriverState is valid before using in convert 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 4fea81154b817b09e553308a1595bfd97a8c0582
Component: engine
 2016-06-17 09:17:03 -07:00
Vincent Demeester 297c4a4979 Merge pull request #23663 from albers/completion-swarm-update--cert-expiry 
bash completion for `docker swarm update --cert-expiry`
Upstream-commit: 6d47b06094ffa04a6299b7c5a61beb3cbe2e655b
Component: engine
 2016-06-17 18:15:56 +02:00
Arnaud Porterie 79014c743c Merge pull request #23674 from justincormack/accepted 
Missing line feed after accepting node
Upstream-commit: 83658c5b64413ee6df4c64dcf98acbd407c6f570
Component: engine
 2016-06-17 16:08:37 +00:00
Arnaud Porterie 47cbf38661 Merge pull request #23673 from justincormack/invalud 
fix invalid typo in error message
Upstream-commit: 27e9ae3141b3f3589d6a0e1690ebb4232bf72048
Component: engine
 2016-06-17 16:08:14 +00:00
Anil Madhavapeddy 6ddced327d docker swarm: more consistent CLI help 
This changes `docker swarm help` to be consistent with capitals
and removes full stops.

Before:

```
Commands:
  init        Initialize a Swarm.
  join        Join a Swarm as a node and/or manager.
  update      update the Swarm.
  leave       Leave a Swarm.
  inspect     Inspect the Swarm
```

After:

```
Commands:
  init        Initialize a Swarm
  join        Join a Swarm as a node and/or manager
  update      Update the Swarm
  leave       Leave a Swarm
  inspect     Inspect the Swarm
```

Signed-off-by: Anil Madhavapeddy <anil@docker.com>
Upstream-commit: 0ec78739ac7d8ec1579d1d4fd63cd207dc56e7c8
Component: engine
 2016-06-17 16:34:06 +01:00
Justin Cormack c99aad7fca Missing line feed after accepting node 
Avoids
```
root@swarmatorium:~# docker node accept 3dnh6k13o44np9fwl83e7gh80
Node 3dnh6k13o44np9fwl83e7gh80 accepted in the swarm.root@swarmatorium:~#
```

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: c34d752419f0e9c17aa759df1a8314974b0d17ed
Component: engine
 2016-06-17 15:49:35 +01:00
Anusha Ragunathan a9608bfa10 Add disable flag for plugin Install. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 22e781e8e3ae1d1ab62ddcda983cabfde2e08ad4
Component: engine
 2016-06-17 07:48:43 -07:00
Justin Cormack 71af4dcb33 fix invalid typo in error message 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 2322ccb8fff46a4d3a84f3ef214cb473816374af
Component: engine
 2016-06-17 15:27:54 +01:00
tomwbarlow@gmail.com b282e08783 Change log.printf service creation msg to debug 
Signed-off-by: tomwbarlow@gmail.com <tomwbarlow@gmail.com>
Upstream-commit: eed8d14ed16846f926e2d139e8232fbc2d4641e4
Component: engine
 2016-06-17 15:03:11 +01:00
Harald Albers c653aa3775 fix bash completion for docker service subcommands 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 42f3b1f4adeb251e15ea0ca0af2a1e98cb9a7145
Component: engine
 2016-06-17 09:49:46 +02:00
Ke Xu 3a6f26e8f3 fix #23017, add zsh completion for dockerd 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
Upstream-commit: bd1fc1e5c26b954fb35f7adda46d764d80a1a570
Component: engine
 2016-06-17 16:16:13 +09:00
Harald Albers 6b5e5294c2 bash completion for docker swarm update --cert-expiry 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: dc2fc75d4260767937d98ea81c51fdea148162b2
Component: engine
 2016-06-17 08:49:06 +02:00
Sebastiaan van Stijn f2adde44a9 Merge pull request #23656 from sfsmithcha/check_cmd_line 
update output for node commands, minor edits
Upstream-commit: 8f9c7fab24d777e5ade6ed75f01e15e4b0fde79c
Component: engine
 2016-06-16 22:54:28 -07:00
Charles Smith 913871096c update output for node commands, minor edits 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 3b2132c2c7f277750edfd9fc76d73dbb9142fde2
Component: engine
 2016-06-16 21:44:07 -07:00
Neil Peterson 4977b39f5b Added daemon.json Windows example 
Signed-off-by: Neil Peterson <neilpeterson@outlook.com>
Upstream-commit: 8352089e8c78cdf71ac9eec0c125a35f9bf36ebc
Component: engine
 2016-06-16 21:41:58 -07:00
Tibor Vass 800ec66e2d Merge pull request #23652 from dnephin/better-bundle-load-errors 
Improve the error messages for loading a bundle
Upstream-commit: a3795ca13ef031b6b2a17fad488c839281cd1de2
Component: engine
 2016-06-16 21:40:30 -07:00
Arnaud Porterie f381416006 Merge pull request #23647 from vieux/improve_messages_node_cmds 
improve some messages in the node subcmds
Upstream-commit: 4c5f1a7e5bfb49647eeb76d20628c7daac65ef8d
Component: engine
 2016-06-17 03:20:30 +00:00
Arnaud Porterie bfa982122e Merge pull request #23651 from tonistiigi/cert-expiry 
Add cert-expiry to swarm update
Upstream-commit: f52c807650beb3bb0afe67bafd546792d7fa1422
Component: engine
 2016-06-17 02:50:58 +00:00
Tonis Tiigi 7f08beb5b2 Add integration test for parsing swarm update options 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: a933ac3c27ac88cf69a2bc2bc16ce076486c0206
Component: engine
 2016-06-16 19:50:01 -07:00
Tibor Vass 69096baccb Merge pull request #23532 from swernli/exitCodeFix 
Fixing exit code return on error case in Windows.
Upstream-commit: a590a6b1800778c86f6649b64283d29d14d83024
Component: engine
 2016-06-16 19:01:18 -07:00
Tibor Vass 92262b0c41 Merge pull request #23580 from cpuguy83/plugin_restore 
Fix removing plugins and Implement plugin restore after daemon restart
Upstream-commit: f522ed9752f0075bc856c06639d4a408a23d6e35
Component: engine
 2016-06-16 18:54:57 -07:00
Victor Vieux a992434a69 improve some messages in the node subcmds 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: eb962235fbf1579cf36bb0582347e8639ec47205
Component: engine
 2016-06-16 18:53:24 -07:00
Arnaud Porterie 79ea0079e7 Merge pull request #23644 from tonistiigi/fix-leave-delete 
Fix removing containers on leaving from pending state
Upstream-commit: f4de3f314e1e965056447d5ea6203ca4b66bb6e0
Component: engine
 2016-06-17 01:40:45 +00:00
Arnaud Porterie c1713ee511 Merge pull request #23637 from vieux/add_more_fields_inspect 
add some more fields in docker service inspect -p
Upstream-commit: edfd546a6f8d1d9c80e9ff3abba88a78d4ac3550
Component: engine
 2016-06-17 01:40:26 +00:00
Arnaud Porterie 048ffaf8b1 Merge pull request #23643 from tonistiigi/membership 
Return membership status on join without timeout
Upstream-commit: 0ef720ededc24018ce1f727814b1a9ae93897891
Component: engine
 2016-06-17 01:40:06 +00:00
Tonis Tiigi 1c57d98347 Add cert-expiry to swarm update 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 7d8d51aa9d0c1737ff7f97a3efac0a2ef0975b56
Component: engine
 2016-06-16 18:06:02 -07:00
Arnaud Porterie 433425402a Merge pull request #23549 from dmcgowan/reference-ui-updates 
Do not show empty tags for digest references in output
Upstream-commit: 16a6987a001446c4ff7df3c6c66362dd76685b86
Component: engine
 2016-06-17 00:47:49 +00:00
Stefan J. Wernli c0affdfcf8 Fixing bug in AttachStreams that would fail to close StdIn 
During a docker exec, if no TTY is specified, the code would still leave stdin open instead of closing it. This change adds handling for the execConfig TTY bool that mirrors what is already done for container config. (Updated this change to be Windows only.)

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: 176345435b33ecbb725cac995083fab0462f60e3
Component: engine
 2016-06-16 17:34:45 -07:00
Arnaud Porterie 0cc35ac1ec Merge pull request #23648 from thaJeztah/fix-overlay-overlay2 
fix "overlay" -> "overlay2" in error message
Upstream-commit: 6d9d149f9980cfda8ed3eeed7446c068de7ae8b6
Component: engine
 2016-06-17 00:21:53 +00:00
Arnaud Porterie cfbfd0a0b9 Merge pull request #23570 from vdemeester/change-plugin-install 
Update docker plugin install code…
Upstream-commit: 7ef9aec90f4f129945ab2f1e2c79b961a7af2209
Component: engine
 2016-06-17 00:12:56 +00:00
Sebastiaan van Stijn 8cac554b16 Merge pull request #23646 from thaJeztah/update-docker-info 
Update docker info output example
Upstream-commit: 314d9dc03a1623b40a3dc49a666f720508ea67d4
Component: engine
 2016-06-16 16:45:44 -07:00
Sebastiaan van Stijn d903446499 fix "overlay" -> "overlay2" in error message 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2d4b285a75621604f31058a43cb5ef1d4618533e
Component: engine
 2016-06-16 16:42:40 -07:00
Sebastiaan van Stijn d74065d7d9 Update docker info output example 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 07e1c62bf4a24e8a075e87b38be3bbe7c8282e42
Component: engine
 2016-06-16 16:29:23 -07:00
Victor Vieux 9dba03a4c5 add some more fields in docker service inspect -p 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 4c9e21b674046e8a3819cfbbb96f471bd280fba5
Component: engine
 2016-06-16 16:22:11 -07:00
Michael Crosby 2eb1181d59 Merge pull request #23639 from mavenugo/ln-rc2 
Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
Upstream-commit: eb6cc318023bea909fc72187b47a3cd6ff250e8e
Component: engine
 2016-06-16 16:17:07 -07:00
Tonis Tiigi dae11af952 Fix removing containers on leaving from pending state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 826f6f07031abc4dea6f71ed69d33a4e0789ee11
Component: engine
 2016-06-16 16:08:15 -07:00
Vincent Demeester 97ce44d0ef Update ServiceInspectWithRaw 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4a70cb55710a76ee7dfa059c440c34fd6cb84f16
Component: engine
 2016-06-17 00:47:22 +02:00
Michael Crosby 97c2dadb96 Merge pull request #23641 from justincormack/s390seccomp 
Add the seccomp build tag for s390x now runc updated
Upstream-commit: 2fa38a91441a1b8e610925f41eaba70aa8ca8e58
Component: engine
 2016-06-16 15:46:14 -07:00
Vincent Demeester eaf07b6f62 Update docker plugin install code… 
… for more consistency (api side).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2c82337b0490dc0a5b8329d1f23c6bad00d8551b
Component: engine
 2016-06-17 00:33:21 +02:00
Vincent Demeester 8e11dc51d7 Bump engine-api to c57d0447ea1ae71f6dad83c8d8a1215a89869a0c 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 58529a15535ee2accafdde740214c0d5b595d6e1
Component: engine
 2016-06-17 00:32:58 +02:00
Tonis Tiigi 10f6f936be Return membership status on join without timeout 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 1973cee0cd86da3c7b7002a3fed7af2557df538c
Component: engine
 2016-06-16 15:27:08 -07:00
Michael Crosby f06a10b7f6 Merge pull request #23624 from coolljt0725/fix_restore_sandbox 
check running again before restore active sandbox
Upstream-commit: 74c4834d32516761c56e3caceada1aa6bb6f8b86
Component: engine
 2016-06-16 15:24:58 -07:00
Justin Cormack 4914ef91f7 Add the seccomp build tag for s390x now runc updated 
This was waiting for runc bump see https://github.com/docker/docker/issues/23171
runc was bumped in https://github.com/docker/docker/pull/23603

Fixes #23171

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: f8d970169a7ae6dcf46beb69c0367d35d019294e
Component: engine
 2016-06-16 23:21:08 +01:00