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

1297 Commits

Author SHA1 Message Date
Vincent Demeester
f5a13a7cbe Use "on-failure" for both containers and services 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a859a336475f39c7b7d7739c58a1dae40df86a86
Component: engine
 2016-07-07 11:32:19 +02:00
Vincent Demeester
c201e7c4a2 Merge pull request #24053 from cpuguy83/mounts_default_writable 
Change defaults for mount writable and volume copying
Upstream-commit: 50674ec107a300067ded77912a2e39de88678c2c
Component: engine
 2016-07-07 11:18:14 +02:00
Brian Goff
7ac01fb32e Use newer default values for mounts CLI 
In the API:
`Writable` changed to `ReadOnly`
`Populate` changed to `NoCopy`

Corresponding CLI options updated to:
`volume-writable` changed to `volume-readonly`
`volume-populate` changed to `volume-nocopy`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 56f3422468a0b43da7bae7a01762ce4f0a92d9ff
Component: engine
 2016-07-06 22:34:39 -04:00
Brian Goff
892399249d re-vendor engine-api 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 140ec59db6e413de5025fb8686b97bf80b66c519
Component: engine
 2016-07-06 21:14:14 -04:00
Anil Madhavapeddy
b214ee32d9 make docker service --help text for --endpoint-mode more consistent 
Previously:

```
      --constraint value             Placement constraints (default [])
      --endpoint-mode string         Endpoint mode(Valid values: vip, dnsrr)
<snip>
      --restart-condition string     Restart when condition is met (none, on_failure, or any)
```

Now:

```
      --constraint value             Placement constraints (default [])
      --endpoint-mode string         Endpoint mode (vip or dnsrr)
<snip>
      --restart-condition string     Restart when condition is met (none, on_failure, or any)
```

Signed-off-by: Anil Madhavapeddy <anil@docker.com>
Upstream-commit: 2de9585f5ea798cbff23045d9d19ba239d5e5431
Component: engine
 2016-07-06 12:10:28 +01:00
Alexander Morozov
5cc35f4af8 Merge pull request #24351 from allencloud/add-file-close-in-loadBundlefile 
fix severe fd leak in stack
Upstream-commit: ad44f49470bec84143ce73f51698bc9bbb501425
Component: engine
 2016-07-05 17:45:34 -07:00
allencloud
16a17d551d fix severe fd leak in stack 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 0af04b613220060ef1fc21ca2f1d551f8f868af8
Component: engine
 2016-07-06 07:00:39 +08:00
Alexander Morozov
f3ff9e9f18 Merge pull request #24173 from vdemeester/tasks-filter-service-node-by-name 
Allow service and node filter to be name in `tasks` subcommands 
Upstream-commit: db75aa029d1843b3fdabb16c5cd9e1b3a99f39b2
Component: engine
 2016-07-05 12:16:57 -07:00
allencloud
60d7b2e452 fix stdout and stderr in api client 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 533bd82e41fee352962cb5ae0a49b9edbdebc25e
Component: engine
 2016-07-05 23:07:40 +08:00
Shoubhik Bose
66c27a36a6 23837 Added long flag to docker ps for checking latest n containers. Updated to "--last" 
Signed-off-by: Shoubhik Bose <sbose78@gmail.com>
Upstream-commit: 256edc24fc8f32a93a0572e5d05f3ca1389238da
Component: engine
 2016-07-02 19:15:01 +00:00
Sebastiaan van Stijn
96e6b59e3f Improve timestamp formatting 
lowercase the output, to prevent "About" halfway,
and add "ago" to the output, as timestamps are always
in the past.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 04c94a013ccba1690933156830efdc314de67ef8
Component: engine
 2016-07-01 17:55:52 -07:00
Vincent Demeester
db7f1cc524 Merge pull request #24128 from thaJeztah/rename-desired_state-filter 
rename desired_state filter to desired-state
Upstream-commit: b8988824616017a7ff4a13475dde23f7677aa21c
Component: engine
 2016-07-01 18:34:02 +02:00
Tonis Tiigi
bda6fa8f54 Add support for external CAs 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 11085b2260a78b3248f3e98e0a1e3203431fae22
Component: engine
 2016-06-30 17:22:47 -07:00
Tonis Tiigi
b73379e968 Update to new swarmkit/engine-api 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 9b652738363d92fbe6e43b3981cdcc94bdb72c76
Component: engine
 2016-06-30 17:22:47 -07:00
Tõnis Tiigi
e32550579c Merge pull request #23584 from nishanttotla/private-images-swarm-services 
Passing registry auth token for service create, update
Upstream-commit: 8fe6480c8a26f80fe174ae93e1b380bb7ec6083c
Component: engine
 2016-06-30 17:18:59 -07:00
Nishant Totla
9f0a770513 Adding a flag to specify sending of registry auth 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 538bac39d7fe93562922b89e9a294096be48fb59
Component: engine
 2016-06-30 14:59:32 -07:00
Sebastiaan van Stijn
6b4b42d73a rename desired_state filter to desired-state 
For consistency with other filters (such as
"is-official"), this renames the desired_state
filter to "desired-state".

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d761719eb4e45fbd6f092f6d0b4eb42206e298f6
Component: engine
 2016-06-30 14:49:46 -07:00
Tibor Vass
c93d8a8a0f Merge pull request #24125 from vdemeester/24117-node-task-filter 
Fix --filter=desired_state behaviour
Upstream-commit: 9d18fda08d3ae4d9654f1fc1ec7a1f8afefebf75
Component: engine
 2016-06-30 14:08:05 -07:00
Vincent Demeester
36333fbd7e Merge pull request #24175 from allencloud/fix-comments-and-handle-err 
fix comments and handle err
Upstream-commit: cbc4fd2131d06c0342a330843a02632034f1db7b
Component: engine
 2016-06-30 19:22:47 +02:00
Alexander Morozov
edfdc3750d Merge pull request #24159 from yongtang/24090-docker-node-list-hostname 
Use HOSTNAME in the output of `docker node ls`
Upstream-commit: 0f687aafafb1b3f3503e71e6a04e766cc85f4372
Component: engine
 2016-06-30 09:28:57 -07:00
Vincent Demeester
5af62950c4 Merge pull request #24174 from runcom/fix-grammar 
fix warn message typos
Upstream-commit: e84b91d8f5859778f43b03890e79b02610d82841
Component: engine
 2016-06-30 17:05:06 +02:00
Vincent Demeester
9ea890bdf9 Merge pull request #24171 from allencloud/make-cmd-short-consistency 
make cmd short consistency
Upstream-commit: 294791e9ed36eff4b93d6cec0da9ed3ed805d549
Component: engine
 2016-06-30 16:59:32 +02:00
allencloud
24d57a19bb fix comments and handle err 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: cc054f3195308da471c252d755dacfe446cb1066
Component: engine
 2016-06-30 21:53:20 +08:00
allencloud
939b820305 make cmd short short consistency and change docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 184afb92bf0bda1f47b5e1812ee1134328e272e2
Component: engine
 2016-06-30 21:17:51 +08:00
Antonio Murdaca
169947bdeb fix warn message typos 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: a4143e6756d697323d560396dff6b90168a1e56c
Component: engine
 2016-06-30 15:17:37 +02:00
Vincent Demeester
a50f4824a7 Allow service and node filter to be name… 
… on `docker node tasks` and `docker service tasks` commands.
This changes is mainly server-side (between engine api and
swarmkit). There is just a check in `api/client/service/tasks.go` to
handle the special *self* meaning.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b0fc5a21f1138f48e0431a550c936e8908d72840
Component: engine
 2016-06-30 15:09:03 +02:00
Lei Jitang
ac805da5d2 Remove dm.no_warn_on_loop_devices in info warning 
I think we doesn't provide dm.no_warn_on_loop_devices option
at all. I didn't found any code to handle this option.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2aa01e0fbc76ecb8cf1a1b608e254e6cb8821ff7
Component: engine
 2016-06-30 14:57:46 +08:00
Yong Tang
8038d9fddd Use HOSTNAME in the output of docker node ls 
This fix tries to address an issue raised in #24090 where
the title field of `docker node ls` use NAME instead of
HOSTNAME. Yet the content of this field is actually
hostname.

The fix makes needed changes for the output of
`docker node ls`.

An additional test has been added to cover the change in
this fix.

This fix fixes #24090.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 4bc91ceeb750db6a6270b2f1821cb0b2f30117fc
Component: engine
 2016-06-29 19:54:16 -07:00
Nishant Totla
cddb6e635c Updating header name and executor 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: af5df117a805c8df661c7efa58c57680019b5752
Component: engine
 2016-06-29 13:26:19 -07:00
Daniel Nephin
beffe0658c Fix mount opts error message. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c8659d3cc501449a69a7e0b79994b42799750f29
Component: engine
 2016-06-29 15:14:55 -04:00
Daniel Nephin
943b955f19 Fix service update of Args 
add a unit test

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 07b59ef210490df19f65da950d7d41176d104a31
Component: engine
 2016-06-29 12:41:57 -04:00
Vincent Demeester
a758d1d64d Fix --filter=desired_state behaviour 
Just like `docker service tasks`, we should add `desired_state` filters
only in case there is no provided filters.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3c194bd2a4fb4693deba366b3400c2efeeb90369
Component: engine
 2016-06-29 17:40:34 +02:00
Nishant Totla
b75c9d3100 Passing registry auth token for service create and update 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 93ec5cda55e78dbb683b59bde244a7984b323574
Component: engine
 2016-06-28 13:53:01 -07:00
Brian Goff
48b4d2f0b1 Merge pull request #23697 from dongluochen/blockServiceModeChange 
Do not allow service mode change
Upstream-commit: e2a26744f987199dca7eacf93e3e236764c87f5e
Component: engine
 2016-06-27 10:53:53 -04:00
allencloud
aba19163d1 uppercase output in node inspect to keep consistency 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 89582e1a34a570c27232cd394d38f7fddf7e6520
Component: engine
 2016-06-27 18:29:27 +08:00
Vincent Demeester
f48a15762d Merge pull request #23945 from aanand/update-bundle-extension 
Update bundle extension
Upstream-commit: 58f1ae1641b81e3117a0e602e70464a139dcf74d
Component: engine
 2016-06-25 17:00:33 +02:00
Alexander Morozov
20c3dc512a Merge pull request #23934 from cpuguy83/23862_fix_bind_opts 
Fix panic due to nil bind options
Upstream-commit: b2ba44b11d7d05c43f3710946dbb9960c7b0adc7
Component: engine
 2016-06-24 16:17:38 -07:00
Sebastiaan van Stijn
33bb05c194 Merge pull request #23281 from yongtang/23211-spf13-cobra-update 
Use spf13/cobra for docker update
Upstream-commit: e5a8a7747ef8b9ac6ed4e508cd16a5cf2a44485c
Component: engine
 2016-06-24 14:31:53 -07:00
Brian Goff
e535398871 Merge pull request #23935 from LK4D4/fix_net_create_use 
cli: fix network create usage
Upstream-commit: 824290a37e09f3411ceec439566c1e6c968a80ed
Component: engine
 2016-06-24 16:55:12 -04:00
Aanand Prasad
ec40967812 Update bundle extension 
It's now .dab, for Distributed Application Bundle

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: 61e2d4240ba266518d0a9a862a88201e54502a88
Component: engine
 2016-06-24 12:32:35 -07:00
Alexander Morozov
41c3862b06 cli: fix network create usage 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 159e7341ad80d6926fd9c09585afcc2abda25415
Component: engine
 2016-06-24 09:32:39 -07:00
Brian Goff
97e724b6b5 Fix panic due to nil bind options 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 4c2e1a9cb04614d360e91a81959cb196380283b1
Component: engine
 2016-06-24 11:57:17 -04:00
Vincent Demeester
645bbecbd4 Merge pull request #23875 from tonistiigi/task-node-down 
Do not show tasks from down nodes as active in ls
Upstream-commit: cf54dfba349627a24c6f7b8e035367a7a9f68f84
Component: engine
 2016-06-24 10:07:25 +02:00
orkaa
59b0cca4d4 For the lulz! (evalulate -> evaluate) 
Signed-off-by: orkaa <orkica@gmail.com>
Upstream-commit: 1bdbfa57709586f9fa747c2323bc3cd3b03e90f0
Component: engine
 2016-06-23 16:26:43 +02:00
Tonis Tiigi
a185c1fb92 Do not show tasks from down nodes as active in ls 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 5d4401d6d72c647fa61501c40949b2d67c3f958b
Component: engine
 2016-06-22 14:49:24 -07:00
Tõnis Tiigi
c04403422d Merge pull request #23829 from LK4D4/cleanup_unused 
api,daemon: cleanup some unused stuff
Upstream-commit: 506234e3f0f6d8f8a0629e09f38dfe96ada025c2
Component: engine
 2016-06-22 11:58:57 -07:00
Alexander Morozov
266d9f9808 Merge pull request #23832 from tonistiigi/unify-swarm-init-update 
Unify swarm init and update options
Upstream-commit: df6630f6a3c08548f355a255e18f01c9fcb0ad86
Component: engine
 2016-06-22 11:56:07 -07:00
Yong Tang
82ca53bf58 Use spf13/cobra for docker update 
This fix is part of the effort to convert commands to spf13/cobra #23211.

Thif fix coverted command `docker update` to use spf13/cobra

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9765593c5f7cdd3ef16dbd0cae35bb68cf5542ef
Component: engine
 2016-06-22 11:06:44 -07:00
Tonis Tiigi
8c9dd4362c Unify swarm init and update options 
Add api side validation and defaults for init and
join requests.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: fb3eb1c27ef5520571c599ead8a72b343748db39
Component: engine
 2016-06-21 16:34:32 -07:00
Alexander Morozov
44cb4a4db6 api,daemon: cleanup some unused stuff 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ed5d335e22143b35f928e5a8740b046c21db808b
Component: engine
 2016-06-21 14:15:19 -07:00