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

2086 Commits

Author SHA1 Message Date
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
Vincent Demeester
e4dfc2d04c Validate hostname starting from 1.24 API. 
In order to keep a little bit of "sanity" on the API side, validate
hostname only starting from v1.24 API version.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6daf3d2a783fd042e870c8af8bbd19fc28989505
Component: engine
 2016-07-06 09:13:59 +02: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
Arnaud Porterie
48bf87974d Merge pull request #24158 from mavenugo/smissues 
Fixed a few network UI issues in swarm-mode
Upstream-commit: 5b4131681595b6f5304f3d94868a1642f92f2998
Component: engine
 2016-07-05 20:28:20 +00:00
Brian Goff
bf5c518081 Merge pull request #24013 from dmcgowan/atomic-libtrust-key-file-write 
Atomically save libtrust key file
Upstream-commit: 97aebe9a6c301bd7836042a171bfaae5652979fd
Component: engine
 2016-07-05 15:28:41 -04: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
Alexander Morozov
cfca5f9c64 Merge pull request #24298 from allencloud/fix-stdout-and-stderr-in-api-client 
fix stdout and stderr in api client
Upstream-commit: a44e0fedc2b69944f764dc82134e8aa0d12bde5d
Component: engine
 2016-07-05 09:58:25 -07:00
Alexander Morozov
4306c5def3 Merge pull request #24191 from tonistiigi/mask-secrets 
Mask swarm secrets from daemon logs
Upstream-commit: 55b8216279b40f6712ccdd46a6e2ac73c4bdbba0
Component: engine
 2016-07-05 08:56:33 -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
Tonis Tiigi
c8d0fdbe96 Mask swarm secrets from daemon logs 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8b8f86aec95ec73881c2dfb6e990784014d61e6e
Component: engine
 2016-06-30 17:11:09 -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
Madhu Venugopal
3b186ee015 Fixed a few network UI issues in swarm-mode 
* Detect name conflicts on network creation
* Detect and prevent network connect/disconnect for managed containers

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 0ce5158a2a9a3f10a62d3c1ea289c55e524cdac5
Component: engine
 2016-06-29 18:08:55 -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
Vincent Demeester
8a1b995558 Merge pull request #23946 from dnephin/service-update-args 
Fixes for `service update` of Args
Upstream-commit: 1e7ba55494eff0f38aa503b81576519b7b383644
Component: engine
 2016-06-29 20:24:07 +02: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
Vincent Demeester
4850c6643f Return an empty network list if nothing matches filter 
Initializing the network list struct in order to return an empty list
instead of a nil object.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a7043ac5c423cf68d4f92024e694887099640d91
Component: engine
 2016-06-29 00:06:44 +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
Derek McGowan
e64726fd44 Atomically save libtrust key file 
The libtrust keyfile which is used to set the "ID" property of a daemon must be generated or loaded on every startup.
If the process crashes during startup this could cause the file to be incomplete causing future startup errors.
Ensure that the file is written atomically to ensure the file is never in an incomplete state.

Fixes #23985

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 9836162446bd0deadecbf0eed38ef3c134754f16
Component: engine
 2016-06-27 15:54:39 -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
Sebastiaan van Stijn
1d708b7135 Merge pull request #23933 from yp-engineering/service-log-typo 
Fixing typo on service log output.
Upstream-commit: b73b303b1c974ea6d168eebdc2011b0802999ff1
Component: engine
 2016-06-24 11:56:31 -07:00