p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
25,182 Commits 2 Branches 295 Tags
09d393de2ec194574aed29933f5ec9a8d68a46ae
Commit Graph

2023 Commits

Author SHA1 Message Date
Alexander Morozov
17b17e3e6c Merge pull request #23399 from tkopczynski/23211-info-command 
Migrate info command to cobra
Upstream-commit: e7fd7848688719221853886e9871baa5b09953c1
Component: engine
 2016-06-20 09:38:53 -07:00
Daniel Nephin
7768ca41d3 Remove dead code from node update. 
Also share mode code between update commands
and use flag constants

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: cacaeab9db51f42c33872c6cce1adc3e55f1c9c5
Component: engine
 2016-06-20 11:05:48 -04:00
Daniel Nephin
22e8ff931c Use flag constants for swarm flag. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c08a50dbd1bac8a0bf1c9be5e617273c19a54a2e
Component: engine
 2016-06-20 11:04:37 -04:00
Daniel Nephin
c30cfa209c add more flag constants to service update. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9d1f3373b3678033c1be197fafc55010cc8531dd
Component: engine
 2016-06-20 11:03:36 -04:00
Sebastiaan van Stijn
225672de47 Merge pull request #23731 from WeiZhang555/fix-help 
Make --help information consistent
Upstream-commit: 70e47c4f75589e2ca46934b0f3c07b3ad87eb92d
Component: engine
 2016-06-19 16:12:09 -07:00
Zhang Wei
3ab13e9c6a Make --help information consistent 
Other docker command always print "[OPTIONS]" right after `docker
COMMAND`, but `build` and `push` has inconsistent help message.

This commit will fix help information format.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 0e5397633628ab154fae33152de7dc1fd4e122db
Component: engine
 2016-06-19 16:26:23 +08:00
Yong Tang
b8c843c318 Fix docker start error with renamed container 
This fix tries to fix the issue raised in #23716 where `docker start`
causes an error of `No such container:` if the container has been
renamed before `docker start` returns.

The issue is that `docker start` use container name passed at the
beginning to check for exit code at the end of the `docker start`.

This fix addresses the issue by always use container's `ID` to get
the information during `docker start`.

Additional integration tests have been added to cover this fix.

This fix fixes #23716.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 6e86733b47faf0d7629751987346022544b65cb7
Component: engine
 2016-06-18 16:43:30 -07:00
Arnaud Porterie
da04c716c2 Merge pull request #23703 from tiborvass/carry-23694 
Carry 23694: Default port for listen addr 
Upstream-commit: a3b6ab04f6b53454282beaee548e8f1630ccd70c
Component: engine
 2016-06-18 06:25:57 +00:00
Sebastiaan van Stijn
d329d8c654 Merge pull request #23708 from vieux/lower_mode 
accept uppercase endpoint mode
Upstream-commit: 3911644782e7fdcbd8fae7a3fc86ffd4d99f191d
Component: engine
 2016-06-17 23:20:17 -07:00
Daniel Nephin
480d3f4e51 Add tests for AutoAcceptOption 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c544649874bfecf2e6b8a00a0b25db309d81cf94
Component: engine
 2016-06-17 19:43:38 -07:00
Daniel Nephin
5fe17becef Support a listen addr without a port, and add tests. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 595e79b805fd6e96d2e6c8876f7c9734164f5db7
Component: engine
 2016-06-17 19:43:38 -07:00
Victor Vieux
015b610f8c accept uppercase endpoint mode 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 8a0c5f157892efdfd5119410adedf0f04c9c16cf
Component: engine
 2016-06-17 19:06:12 -07:00
Arnaud Porterie (icecrime)
89ce4731a6 Change docker service update semantics 
Change `docker service update` to replace attributes of the target
service rather than augment them. One particular occurrence where the
previous behavior proved problematic is when trying to update a port
mapping: the merge semantics provided no way of removing published
ports, but strictly of adding more.

The utility merge* functions where renamed accordingly to update*.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: 1f8ab93b4422a88ef3053105c17acf1933576fbe
Component: engine
 2016-06-17 17:09:40 -07:00
Tomasz Kopczynski
65c6cdf69c Migrate info command to cobra 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: ac7a663c0b0ae147f42048dbc19e933635e22f75
Component: engine
 2016-06-17 22:11:33 +02:00
Arnaud Porterie
a8956dca4d Merge pull request #23692 from icecrime/tweak_pretty_service 
Improve `docker service inspect --pretty`
Upstream-commit: 28768a6296a4ba370dbec8751179ab0bc88ad661
Component: engine
 2016-06-17 20:08:08 +00:00
Tibor Vass
81bc9e5cf8 Merge pull request #23681 from tiborvass/plugins-fixes 
Plugins fixes
Upstream-commit: 061bbaf7a4b363ffa9b2b04b8277761f28a4a289
Component: engine
 2016-06-17 12:58:36 -07:00
Arnaud Porterie (icecrime)
4c5a5698fd Improve docker service inspect --pretty 
Remove capitalization in placement, and remove spurious `\t`.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: 3c60b7b9843276082c0ba4b868f354b9b44e9627
Component: engine
 2016-06-17 11:38:19 -07:00
Tibor Vass
516f943b0e Merge pull request #23688 from tonistiigi/nl 
Add newline to promote/demote message
Upstream-commit: 82c9410c41c7e34939d17fa5edcba2d1d0e4d686
Component: engine
 2016-06-17 11:04:25 -07:00
Tonis Tiigi
5687ad8aed Add newline to promote/demote message 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 3386e3570a1251bbea5302d8b8e639aaf68436c3
Component: engine
 2016-06-17 10:58:11 -07:00
Tibor Vass
82e43b2685 Merge pull request #23676 from avsm/swarm-cli-consistency 
`docker swarm`: more consistent CLI help
Upstream-commit: 2bd34b858d7cc374169433eb0538a4dbe48cff3f
Component: engine
 2016-06-17 10:55:15 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
Daniel Nephin
b2b2e47716 Add some tests for bundlefile and improve the error messages for LoadFile 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c0ea589c1b27f8b68e84cfe6692a7639da52ce6d
Component: engine
 2016-06-16 18:18:25 -04:00
Tibor Vass
dc3dc99c53 Merge pull request #23520 from yongtang/23500-docker-info-security 
Add security info to `docker info`
Upstream-commit: 6b4e2ad90be9dd642219982d7591f73bd5abaae9
Component: engine
 2016-06-16 15:15:33 -07:00
Tibor Vass
bc035d4fca Merge pull request #23640 from stevvooe/update-not-upate 
api/client/service: fix minor spelling error in service inspect
Upstream-commit: 6dc58a1d58a476ed5dee42781aa3313a9472f566
Component: engine
 2016-06-16 15:12:47 -07:00
Stephen J Day
73e75a98de api/client/service: fix minor spelling error in service inspect 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 920e65ccbca0423c43579c9ce3b9331efe14c97b
Component: engine
 2016-06-16 14:54:41 -07:00
Tõnis Tiigi
40a223da0a Merge pull request #23613 from stevvooe/running-over-replicas 
api/client/service: list running services over replicas
Upstream-commit: 70c7328d9e97ab271bd4529480bdc7cc202faccf
Component: engine
 2016-06-16 14:34:13 -07:00
Tõnis Tiigi
7b4f900246 Merge pull request #23606 from vieux/fix_secrets 
fix docker swarm init/update --secret
Upstream-commit: 657703178798ac497a82c16b4fd9f1c0728c60f9
Component: engine
 2016-06-16 14:24:35 -07:00
Daniel Nephin
8220c21f1c Fix String() for some option types 
and add unit tests for them.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c26e7d8c9105e16048268a01dd1e556af43902cd
Component: engine
 2016-06-16 10:09:14 -04:00
Vincent Demeester
5445763ee1 Merge pull request #23583 from anusha-ragunathan/accept-perms 
Add accept-permissions flag for install.
Upstream-commit: 6253c294947ef8ec64092bb612aafa45ff07f076
Component: engine
 2016-06-16 12:44:37 +02:00
Vincent Demeester
d1beb37828 Merge pull request #23612 from icecrime/default_parallelism 
Service `--update-parallelism` defauls to 0
Upstream-commit: 0d8ad60e086aa48dd16fbae3bfdf842d3b974c5a
Component: engine
 2016-06-16 12:32:30 +02:00
Arnaud Porterie
dea0c27b09 Merge pull request #23572 from tombee/volume-opts-typo 
Change 'invald' to 'invalid' in volume opts errors
Upstream-commit: e65c5b603e71245ffb2c2630fe986865d4d70f46
Component: engine
 2016-06-16 05:17:30 +00:00
Stephen J Day
b8b934f883 api/client/service: list running services over replicas 
To provide users a view of service status, list the number of running
task over the requested number of replicas.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: b86cb293ecc67e76ec90ec60766f52dad6903eac
Component: engine
 2016-06-15 21:53:23 -07:00