dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-02 22:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,572 Commits 19 Branches 591 Tags
1e0b7538fa2aba4aa252e423362171f1bbfa166c
Commit Graph

2087 Commits

Author SHA1 Message Date
Vincent Demeester
a859a33647 Use "on-failure" for both containers and services 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-07 11:32:19 +02:00
Vincent Demeester
50674ec107 Merge pull request #24053 from cpuguy83/mounts_default_writable 
Change defaults for mount writable and volume copying
 2016-07-07 11:18:14 +02:00
Brian Goff
56f3422468 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>
 2016-07-06 22:34:39 -04:00
Brian Goff
140ec59db6 re-vendor engine-api 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-07-06 21:14:14 -04:00
Anil Madhavapeddy
2de9585f5e 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>
 2016-07-06 12:10:28 +01:00
Vincent Demeester
6daf3d2a78 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>
 2016-07-06 09:13:59 +02:00
Alexander Morozov
ad44f49470 Merge pull request #24351 from allencloud/add-file-close-in-loadBundlefile 
fix severe fd leak in stack
 2016-07-05 17:45:34 -07:00
allencloud
0af04b6132 fix severe fd leak in stack 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-07-06 07:00:39 +08:00
Arnaud Porterie
5b41316815 Merge pull request #24158 from mavenugo/smissues 
Fixed a few network UI issues in swarm-mode
 2016-07-05 20:28:20 +00:00
Brian Goff
97aebe9a6c Merge pull request #24013 from dmcgowan/atomic-libtrust-key-file-write 
Atomically save libtrust key file
 2016-07-05 15:28:41 -04:00
Alexander Morozov
db75aa029d Merge pull request #24173 from vdemeester/tasks-filter-service-node-by-name 
Allow service and node filter to be name in `tasks` subcommands
 2016-07-05 12:16:57 -07:00
Alexander Morozov
a44e0fedc2 Merge pull request #24298 from allencloud/fix-stdout-and-stderr-in-api-client 
fix stdout and stderr in api client
 2016-07-05 09:58:25 -07:00
Alexander Morozov
55b8216279 Merge pull request #24191 from tonistiigi/mask-secrets 
Mask swarm secrets from daemon logs
 2016-07-05 08:56:33 -07:00
allencloud
533bd82e41 fix stdout and stderr in api client 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-07-05 23:07:40 +08:00
Shoubhik Bose
256edc24fc 23837 Added long flag to docker ps for checking latest n containers. Updated to "--last" 
Signed-off-by: Shoubhik Bose <sbose78@gmail.com>
 2016-07-02 19:15:01 +00:00
Sebastiaan van Stijn
04c94a013c 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>
 2016-07-01 17:55:52 -07:00
Vincent Demeester
b898882461 Merge pull request #24128 from thaJeztah/rename-desired_state-filter 
rename desired_state filter to desired-state
 2016-07-01 18:34:02 +02:00
Tonis Tiigi
11085b2260 Add support for external CAs 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-30 17:22:47 -07:00
Tonis Tiigi
9b65273836 Update to new swarmkit/engine-api 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-30 17:22:47 -07:00
Tõnis Tiigi
8fe6480c8a Merge pull request #23584 from nishanttotla/private-images-swarm-services 
Passing registry auth token for service create, update
 2016-06-30 17:18:59 -07:00
Tonis Tiigi
8b8f86aec9 Mask swarm secrets from daemon logs 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-30 17:11:09 -07:00
Nishant Totla
538bac39d7 Adding a flag to specify sending of registry auth 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-06-30 14:59:32 -07:00
Sebastiaan van Stijn
d761719eb4 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>
 2016-06-30 14:49:46 -07:00
Tibor Vass
9d18fda08d Merge pull request #24125 from vdemeester/24117-node-task-filter 
Fix --filter=desired_state behaviour
 2016-06-30 14:08:05 -07:00
Vincent Demeester
cbc4fd2131 Merge pull request #24175 from allencloud/fix-comments-and-handle-err 
fix comments and handle err
 2016-06-30 19:22:47 +02:00
Alexander Morozov
0f687aafaf Merge pull request #24159 from yongtang/24090-docker-node-list-hostname 
Use HOSTNAME in the output of `docker node ls`
 2016-06-30 09:28:57 -07:00
Vincent Demeester
e84b91d8f5 Merge pull request #24174 from runcom/fix-grammar 
fix warn message typos
 2016-06-30 17:05:06 +02:00
Vincent Demeester
294791e9ed Merge pull request #24171 from allencloud/make-cmd-short-consistency 
make cmd short consistency
 2016-06-30 16:59:32 +02:00
allencloud
cc054f3195 fix comments and handle err 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-06-30 21:53:20 +08:00
allencloud
184afb92bf make cmd short short consistency and change docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-06-30 21:17:51 +08:00
Antonio Murdaca
a4143e6756 fix warn message typos 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-06-30 15:17:37 +02:00
Vincent Demeester
b0fc5a21f1 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>
 2016-06-30 15:09:03 +02:00
Lei Jitang
2aa01e0fbc 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>
 2016-06-30 14:57:46 +08:00
Yong Tang
4bc91ceeb7 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>
 2016-06-29 19:54:16 -07:00
Madhu Venugopal
0ce5158a2a 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>
 2016-06-29 18:08:55 -07:00
Nishant Totla
af5df117a8 Updating header name and executor 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-06-29 13:26:19 -07:00
Daniel Nephin
c8659d3cc5 Fix mount opts error message. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-29 15:14:55 -04:00
Vincent Demeester
1e7ba55494 Merge pull request #23946 from dnephin/service-update-args 
Fixes for `service update` of Args
 2016-06-29 20:24:07 +02:00
Daniel Nephin
07b59ef210 Fix service update of Args 
add a unit test

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-29 12:41:57 -04:00
Vincent Demeester
3c194bd2a4 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>
 2016-06-29 17:40:34 +02:00
Vincent Demeester
a7043ac5c4 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>
 2016-06-29 00:06:44 +02:00
Nishant Totla
93ec5cda55 Passing registry auth token for service create and update 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-06-28 13:53:01 -07:00
Derek McGowan
9836162446 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)
 2016-06-27 15:54:39 -07:00
Brian Goff
e2a26744f9 Merge pull request #23697 from dongluochen/blockServiceModeChange 
Do not allow service mode change
 2016-06-27 10:53:53 -04:00
allencloud
89582e1a34 uppercase output in node inspect to keep consistency 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-06-27 18:29:27 +08:00
Vincent Demeester
58f1ae1641 Merge pull request #23945 from aanand/update-bundle-extension 
Update bundle extension
 2016-06-25 17:00:33 +02:00
Alexander Morozov
b2ba44b11d Merge pull request #23934 from cpuguy83/23862_fix_bind_opts 
Fix panic due to nil bind options
 2016-06-24 16:17:38 -07:00
Sebastiaan van Stijn
e5a8a7747e Merge pull request #23281 from yongtang/23211-spf13-cobra-update 
Use spf13/cobra for docker update
 2016-06-24 14:31:53 -07:00
Brian Goff
824290a37e Merge pull request #23935 from LK4D4/fix_net_create_use 
cli: fix network create usage
 2016-06-24 16:55:12 -04:00
Aanand Prasad
61e2d4240b Update bundle extension 
It's now .dab, for Distributed Application Bundle

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-06-24 12:32:35 -07:00