dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-07-15 03:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,745 Commits 19 Branches 583 Tags
3fc9a9ccb8ec8783bfcc02b7e4dfd7ee6468fa86
Commit Graph

2117 Commits

Author SHA1 Message Date
Vincent Demeester
83f232e186 Merge pull request #23773 from dnephin/allow-remove-during-update 
Add remove flags for service update
 2016-07-14 11:10:30 +02:00
Sebastiaan van Stijn
ffd03708e9 Merge pull request #24615 from aaronlehmann/spaces-not-tabs 
Use spaces, not tabs, to format sample "swarm join" command
 2016-07-14 11:07:12 +02:00
Dong Chen
08ae4e544d Fix service inspect --pretty. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-07-14 00:11:29 -07:00
Aaron Lehmann
6de8fcb2f2 Use spaces, not tabs, to format sample "swarm join" command 
Using tabs here seems to cause copy/paste problems in some terminals.
Using spaces is safer.

Fixes #24609

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-07-13 19:31:05 -06:00
Tibor Vass
1c6a8715ab Merge pull request #24592 from thaJeztah/remove-dead-code 
Remove dead code for "inspect --pretty"
 2016-07-13 14:46:42 -07:00
Daniel Nephin
3249c1d0e7 Fix multi-remove during service update. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-13 16:11:08 -04:00
Daniel Nephin
4c6faa4340 Change the add/update flags to include 'add' 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-13 16:06:25 -04:00
Daniel Nephin
ead1f62aba PR feedback 
improve help text for service update remove flags
implement proper merge update of placement flag
more code re-use in update functions using a toRemove set.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-13 16:06:25 -04:00
Daniel Nephin
dc33fc1ff4 Add remove flags for service update 
with unit tests

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-13 16:06:25 -04:00
Tibor Vass
fd8269b8f6 Merge pull request #24195 from dnephin/service-update-better-args-and-command 
Update service `args` with a single flag (shlex)
 2016-07-13 13:02:19 -07:00
Sebastiaan van Stijn
4d87f9083b Remove dead code for "inspect --pretty" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-13 18:56:02 +02:00
Sebastiaan van Stijn
7bf0faf423 Remove shorthand flags for "mount", "pretty", and "no-resolve" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-13 18:47:29 +02:00
Daniel Nephin
674d227445 Merge service command and args as a string. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-13 12:31:16 -04:00
Arnaud Porterie
58624acf11 Merge pull request #24525 from vdemeester/24196-remove-command-flag-on-service-update 
Remove --command flag for service update
 2016-07-13 16:01:11 +00:00
Vincent Demeester
e4a024d590 Remove --command flag for service update 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-13 16:19:21 +02:00
Vincent Demeester
92b1577871 Merge pull request #24562 from thaJeztah/carry-24499-swarm-info-consistency 
[carry 24499] Remove "Yes"/"No" and use "true"/"false" consistently in `docker info`
 2016-07-13 15:13:58 +02:00
Sebastiaan van Stijn
ea365e4cb3 Make labels human readable 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-13 01:08:54 +02:00
Sebastiaan van Stijn
7da11b1afd Merge pull request #24146 from johnharris85/fix-swarm-update-auto-accept 
Add comma-separated --auto-accept support.
 2016-07-12 16:29:21 +02:00
Tibor Vass
880484992c Merge pull request #24501 from hqhq/remove_exec_driver 
Remove execution driver
 2016-07-11 16:54:36 -07:00
johnharris85
8e14882773 Add support for comma-separated --auto-accept syntax. 
Signed-off-by: John Harris <john@johnharris.io>
 2016-07-11 15:47:04 -07:00
Vincent Demeester
46649755f8 Merge pull request #24051 from allencloud/return-err-when-stack-name-nonexist 
output some details when stack name does not exist
 2016-07-11 20:43:09 +02:00
allencloud
416613f2e5 return err when stack name does not exist 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-07-12 00:59:30 +08:00
Akihiro Suda
c6b7bd1aa6 Remove "Yes"/"No" and use "true"/"false" consistently in docker info 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-07-11 06:55:30 +00:00
Qiang Huang
1fb1136fec Remove execution driver 
We use containerd and there is no execution driver anymore.

Addresses: https://github.com/docker/docker/issues/24461

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-07-11 14:52:27 +08:00
Sebastiaan van Stijn
db435560b3 Merge pull request #24389 from Microsoft/jjh/silentsecurity 
Windows: No security warning on quiet
 2016-07-08 11:06:33 -07:00
John Howard
a9b3c1d720 Windows: No security warning on quiet 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-07-07 16:00:08 -07:00
Sebastiaan van Stijn
b98ba9a1d6 Merge pull request #24291 from vdemeester/docs-cli-reference-updates 
Updates on cli reference documentation
 2016-07-07 14:28:54 -07:00
Vincent Demeester
f4cfc6b983 Updates on cli reference documentation 
- Update ps with `--last` flag
- Update commands with current output
- Make sure hugo does not detect the wrong language
- Update usage for `tag` command to be more coherent with the other ones

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-07 20:43:18 +02:00
Tõnis Tiigi
db67db98d8 Merge pull request #24349 from aaronlehmann/swarm-secrets-by-default 
Generate a swarm joining secret if none is specified
 2016-07-07 11:43:08 -07:00
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
Aaron Lehmann
7342e42fce Generate a swarm joining secret if none is specified 
The current behavior of `docker swarm init` is to set up a swarm that
has no secret for joining, and does not require manual acceptance for
workers. Since workers may sometimes receive sensitive data such as pull
credentials, it makes sense to harden the defaults.

This change makes `docker swarm init` generate a random secret if none
is provided, and print it to the terminal. This secret will be needed to
join workers or managers to the swarm. In addition to improving access
control to the cluster, this setup removes an avenue for
denial-of-service attacks, since the secret is necessary to even create
an entry in the node list.

`docker swarm init --secret ""` will set up a swarm without a secret,
matching the old behavior. `docker swarm update --secret ""` removes the
automatically generated secret after `docker swarm init`.

Closes #23785

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-07-06 13:04:50 -07: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