p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,283 Commits 2 Branches 295 Tags
8d7175a239fc8dbfb3d05efaf3e44cb294f5d8ff
Commit Graph

723 Commits

Author SHA1 Message Date
Vincent Demeester
3a3dfe3c77 Merge pull request #31582 from dnephin/misc-flag-cleanup 
Cleanup some memory flags used in the CLI
Upstream-commit: 83e29a5d87e3c1a0d4a9ae0d6dfe14a9ceb9bb20
Component: engine
 2017-03-10 14:16:42 +01:00
Harald Albers
0d16f73693 Fix description of docker run|create --stop-signal in help message 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: b303e229ca6ec61e43b1b7a93f6ff034a3945644
Component: engine
 2017-03-09 09:32:16 +01:00
Sebastiaan van Stijn
6d40d2a062 Merge pull request #31443 from james-nesbitt/export-more-compose-methods 
exported add. cli compose loader parsing methods
Upstream-commit: fb024df8f0d18fdeff4b73979d51b44f268aeb6b
Component: engine
 2017-03-08 15:12:42 +01:00
Brian Goff
e901de0def Merge pull request #31258 from dnephin/fix-override-default-stack-network 
Support customizing the default network for a stack
Upstream-commit: dd221a1e1727b8db2f7094605f91c15384ac5df6
Component: engine
 2017-03-07 14:28:16 -05:00
James Nesbitt
26dbe98c09 exported cli compose loader parsing methods 
Signed-off-by: James Nesbitt <james.nesbitt@wunderkraut.com>
Upstream-commit: a1560a0cf2401ccf37d6b6859b57a9eecd339089
Component: engine
 2017-03-07 17:36:35 +02:00
Daniel Nephin
ba46ce307c Use opts.MemBytes for flags. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: afcaeedbd4249009811ba1c11767173c23ae0814
Component: engine
 2017-03-07 10:32:49 -05:00
Daniel Nephin
aa4b36806a Some things just need to be line wrapped. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2e9f9d2c347186a29fc558e1c95d5246fad66c2a
Component: engine
 2017-03-06 16:01:57 -05:00
Sebastiaan van Stijn
e9ce01080a Merge pull request #31543 from chawlanikhil24/master 
Replaced "err" with  "nil" & added a comment
Upstream-commit: 3cfc3e30a886aef1a5e767d5b2a9a7b2c156c5f9
Component: engine
 2017-03-06 15:11:14 +01:00
Nikhil Chawla
8e858ae994 Fixed the typo in the code 
Signed-off-by: Nikhil Chawla <chawlanikhil24@gmail.com>
Upstream-commit: 73309aa009702dbcb5ac0c32499c984797ba9f4b
Component: engine
 2017-03-06 17:31:04 +05:30
Aaron Lehmann
d82df5d4ba Implement server-side rollback, for daemon versions that support this 
Server-side rollback can take advantage of the rollback-specific update
parameters, instead of being treated as a normal update that happens to
go back to a previous version of the spec.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: f9bd8ec8b268581f93095c5a80679f0a8ff498bf
Component: engine
 2017-03-03 16:33:34 -08:00
Aaron Lehmann
ac66308e6c Add support for rollback flags 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 3a88a24d23e6eb1ca521cd9ab6e306d4ba1c1464
Component: engine
 2017-03-03 16:33:34 -08:00
Aaron Lehmann
0c390668f1 Add support for the "rollback" failure action 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: cc9d04647a68cf49e66bf26f10908387b99dae1a
Component: engine
 2017-03-03 16:33:34 -08:00
Yong Tang
146a801e5a Fix error caused by overlapping merge of 30733 
This fix fixes build error caused by overlapping merge of 30733 and 28213.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f2197b679401627610a7efc8adb9ddc27b5af02f
Component: engine
 2017-03-03 13:26:00 -08:00
Kenfe-Mickaël Laventure
8d9c7cbbe3 Merge pull request #30733 from yongtang/02022017-formatter-header 
Allow `--format` to use different delim in `table` format
Upstream-commit: 9369acc776be47eb4163ee97153aefa0a4e647a0
Component: engine
 2017-03-03 11:25:19 -08:00
Sebastiaan van Stijn
d4d27bb5d4 Merge pull request #30725 from aaronlehmann/topology 
Topology-aware scheduling
Upstream-commit: 3a5a1c3f3d1638c35891ee630ba20eda0bef560f
Component: engine
 2017-03-03 15:01:12 +01:00
Brian Goff
302e2c7325 Merge pull request #31409 from yuexiao-wang/fix-version 
'docker daemon' deprecation message doesn't use the new version
Upstream-commit: 55b955d9ffc14571fa6b5a1a6369a8be8d053853
Component: engine
 2017-03-02 22:02:09 -05:00
yuexiao-wang
31865190c5 'docker daemon' deprecation message doesn't use the new versioning scheme 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 5a9cee7bb57e7da7f2793fbb290498bba0531105
Component: engine
 2017-03-03 17:26:49 +08:00
Sebastiaan van Stijn
13f20b59db Merge pull request #30754 from yongtang/25696-stop-signal 
Add `--stop-signal` for `service create` and `service update`
Upstream-commit: bb9f19503cbb0153a0da01b1e91691cd63f48dd9
Component: engine
 2017-03-01 18:10:57 +01:00
Sebastiaan van Stijn
d88605d898 Merge pull request #31124 from vdemeester/volume-unit-tests 
Add unit tests to cli/command/volume package
Upstream-commit: 822abee15132259226ae4bd4523737330164ec58
Component: engine
 2017-03-01 14:13:47 +01:00
Vincent Demeester
6581f592f2 Merge pull request #31290 from thaJeztah/print-d_type_warning 
add d_type warning to docker info, and optimize output
Upstream-commit: 38d985a1c120834647d15ac87fa2e3e40f0dd0aa
Component: engine
 2017-02-28 16:35:00 +01:00
Aaron Lehmann
737f03c444 Topology-aware scheduling 
This adds support for placement preferences in Swarm services.

- Convert PlacementPreferences between GRPC API and HTTP API
- Add --placement-pref, --placement-pref-add and --placement-pref-rm to CLI
- Add support for placement preferences in service inspect --pretty
- Add integration test

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 17288c611a4f3f75ecb3bbb4533820b1836c55a6
Component: engine
 2017-02-27 13:29:54 -08:00
Vincent Demeester
94ee188d27 Add unit tests to cli/command/volume package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6da111b3bbf01106feed7cb609fd0fcbb82c5800
Component: engine
 2017-02-27 18:39:35 +01:00
Sebastiaan van Stijn
12aa0347d6 Merge pull request #30383 from TDAbboud/30096-add-host-docker-build 
Add --add-host for docker build
Upstream-commit: a64ea37753fd9a94dfa3ab81f67f46df7bd641f8
Component: engine
 2017-02-27 12:42:18 +01:00
Akihiro Suda
458406a7f3 Merge pull request #31212 from fate-grand-order/fixed 
use t.Fatal() to output the err message and fix typo
Upstream-commit: a6576b8a2bff0feeb67918403caa3df0c4c37673
Component: engine
 2017-02-27 12:26:35 +09:00
Genki Takiuchi
ee40a8603d Fixed typo. 
Signed-off-by: Genki Takiuchi <genki@s21g.com>
Upstream-commit: d654c3d83152a4bf879ddf04ae637d1e424453ee
Component: engine
 2017-02-26 12:59:18 +09:00
Daniel Nephin
c96952c905 Support customizing the default network for a stack. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b7577dd2ad6fbb2cf21baf7ee082d2f605157b2a
Component: engine
 2017-02-24 17:32:23 -05:00
Sebastiaan van Stijn
1798e7e8be add d_type warning to docker info, and optimize output 
The overlay(2) drivers were moved up in the list of storage drivers,
and are known to have problems if the backing filesystem does not
support d_type.

Commit 2e20e63da2a8a0ffbbb3f2146f87559e17f43046 added a warning,
which is logged in the daemon logs, however, many users do not
check those logs, and may overlook this warning.

This patch adds the same warning to the output of `docker info`
so that the warning is more easily found.

In addition, the output of warnings printed by `docker info` is
optimized, by;

- moving all warnings to the _end_ of the output, instead of
  mixing them with the regular output
- wrapping the storage-driver warnings, so that they are more
  easily readable

Example output with this patch applied
============================================

devicemapper using loopback devices:

    ...
    Insecure Registries:
     127.0.0.0/8
    Live Restore Enabled: false

    WARNING: devicemapper: usage of loopback devices is strongly discouraged for production use.
             Use `--storage-opt dm.thinpooldev` to specify a custom block storage device.
    WARNING: bridge-nf-call-iptables is disabled
    WARNING: bridge-nf-call-ip6tables is disabled

overlay2 on xfs without d_type support;

    ...
    Insecure Registries:
     127.0.0.0/8
    Live Restore Enabled: false

    WARNING: overlay2: the backing xfs filesystem is formatted without d_type support, which leads to incorrect behavior.
             Reformat the filesystem with ftype=1 to enable d_type support.
             Running without d_type support will not be supported in future releases.
    WARNING: bridge-nf-call-iptables is disabled

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 19215597982232f65dcbc873e54e632b99cddecc
Component: engine
 2017-02-23 13:36:57 +01:00
yupengzte
718b046537 Delete dots to align with other commands description 
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: ec95ad7353b240542f73076dde975e392c281748
Component: engine
 2017-02-23 16:46:08 +08:00
fate-grand-order
9632b0f1e8 use t.Fatal() to output the err message where the values used for formatting 
text does not appear to contain a placeholder

Signed-off-by: Helen Xie <chenjg@harmonycloud.cn>
Upstream-commit: 2a8d6368d4a930203b93f75914173ab65bf3b0bc
Component: engine
 2017-02-23 10:16:22 +08:00
Yong Tang
5050030ffa Add --stop-signal for service create and service update 
This fix tries to address the issue raised in 25696 where
it was not possible to specify `--stop-signal` for `docker service create`
and `docker service update`, in order to use special signal to stop
the container.

This fix adds `--stop-signal` and update the `StopSignal` in `Config`
through `service create` and `service update`.

Related docs has been updated.

Integration test has been added.

This fix fixes 25696.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c2d49ec214649b0025f7060429334893350fbaee
Component: engine
 2017-02-21 15:19:45 -08:00
Victor Vieux
25f196e2c2 Merge pull request #31206 from xuzhenglun/master 
fix wrong print format
Upstream-commit: 19795b934cac6f90b75f973ba59ece153c3df2cb
Component: engine
 2017-02-21 14:13:32 -08:00
Reficul
a8278abaf1 fix wrong print format 
Signed-off-by: Reficul <xuzhenglun@gmail.com>
Upstream-commit: 9b1ceecd8a44e72ad773f7016df09a4b285258b8
Component: engine
 2017-02-21 10:26:06 +08:00
Sebastiaan van Stijn
301cc805aa Merge pull request #30814 from YuPengZTE/devSwarmCliExplain 
fix the type
Upstream-commit: 25500d56a5f3a94456bd8172a64bf119cc36dd7f
Component: engine
 2017-02-21 00:59:58 +01:00
Tony Abboud
7dba33b4e7 Add --add-host for docker build 
Signed-off-by: Tony Abboud <tdabboud@hotmail.com>
Upstream-commit: 7a962e4577628c357f96153eca07e527813fb42b
Component: engine
 2017-02-20 17:32:28 -05:00
Victor Vieux
6446421ffd add missing API changes 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: a7e6d2ca1fd30a6122a65558507135e7079ae6a7
Component: engine
 2017-02-19 01:33:43 -08:00
Anusha Ragunathan
b7f72f988d Merge pull request #28213 from yongtang/11062016-service-ps-format 
Add `--format` to `docker service ps`
Upstream-commit: b1debf1374ca7be7e7b4d4fcd41eceaf8b7cf153
Component: engine
 2017-02-17 10:23:18 -08:00
Alexander Morozov
ffcecda259 Merge pull request #31114 from allencloud/split-compose-stack-deploy-from-deploydotgo 
split compose deploy from deploy.go
Upstream-commit: f00514a1d0cb883229e8388ef0c8bd91efcca6dd
Component: engine
 2017-02-17 08:48:51 -08:00
Vincent Demeester
7fdc39f1fc Merge pull request #30848 from nishanttotla/suppress-digest-docker-ps 
Suppressing image digest in docker ps
Upstream-commit: 40532143c2c4cf1359fd8484789b81c1f1f59d98
Component: engine
 2017-02-17 10:27:49 +01:00
allencloud
5f5d704cba split compose deploy from deploy.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: f46a14f7b611276256c7e8148e87c1d570201d74
Component: engine
 2017-02-17 17:13:31 +08:00
Brian Goff
000b690000 Merge pull request #31088 from xulike666/make-code-readable-again 
Typo fixed and this time I provide my cSpell.json
Upstream-commit: 8e5769445211f71635432dcdba17d31f2571e52a
Component: engine
 2017-02-16 22:04:27 -05:00
Nishant Totla
5361825be7 Suppressing image digest in docker ps 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: b04536f61fe9d8e9827832e0cef02cc2c5cef003
Component: engine
 2017-02-16 18:11:56 -08:00
Brian Goff
fd3b01be58 Merge pull request #31006 from vdemeester/30991-secret-mode-in-stack-deploy 
Set 0444 as default secret mode in stack deploy
Upstream-commit: a12454d7a964b99921adabdb8f741da5a94a0e66
Component: engine
 2017-02-16 20:34:21 -05:00
Aaron.L.Xu
29e3dcbbb0 why there are so many mistakes in our repo (up to /cmd) 
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
Upstream-commit: f8a40477960976f12dbbb72e5b133b5b0f05f9b3
Component: engine
 2017-02-17 00:32:48 +08:00
Vincent Demeester
492545a1db Sort docker stack ls by name 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 97d85127c231d1b0823a3459d638dbd4f0ba1460
Component: engine
 2017-02-16 14:30:39 +01:00
Vincent Demeester
55b4b2547e Set 0444 as default secret mode in stack deploy 
Change the default secret mode to match the default one used in
`service` subcommands.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f2b68c6cc1664ca0c60457b8c713eec52902a2d2
Component: engine
 2017-02-16 11:26:05 +01:00
Alexander Morozov
2da555a6fc Merge pull request #29819 from vdemeester/service-validate-publish-simple-syntax 
Make sure we validate simple syntax on service commands
Upstream-commit: f18bc25fa1449ececeac3f8e4691934bd07abb75
Component: engine
 2017-02-15 12:31:46 -08:00
bingshen.wbs
a3ebb4bd61 fix docker stack volume's nocopy parameter 
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
Upstream-commit: 4fe611958cc7d44a2a9d95ab892340349ed02072
Component: engine
 2017-02-15 19:46:27 +08:00
yupengzte
a532e48c46 fix the type 
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: d735972d3150fa4e286ce468f033156fa22fddb7
Component: engine
 2017-02-14 09:54:27 +08:00
Vincent Demeester
96d98e23ed Merge pull request #30900 from YuPengZTE/devPublisedPort 
Add "=" before the value of PublishedPort
Upstream-commit: c110abfa9f4c1ec33dc223570fad50c5f6afc00d
Component: engine
 2017-02-12 21:56:43 +01:00
Sebastiaan van Stijn
a4e64b5e9f Merge pull request #30476 from yongtang/30447-port-config-long-syntax 
Support expanded syntax of ports in `docker stack deploy`
Upstream-commit: e5066ef66637967dd0e433daaca5d8f957f4c022
Component: engine
 2017-02-11 11:13:54 -08:00