Граф коммитов

2150 Коммитов

Автор SHA1 Сообщение Дата
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
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
Sebastiaan van Stijn b73b303b1c Merge pull request #23933 from yp-engineering/service-log-typo
Fixing typo on service log output.
2016-06-24 11:56:31 -07:00
Alexander Morozov 159e7341ad cli: fix network create usage
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-06-24 09:32:39 -07:00
Brian Goff 4c2e1a9cb0 Fix panic due to nil bind options
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-06-24 11:57:17 -04:00
Vincent Demeester cf54dfba34 Merge pull request #23875 from tonistiigi/task-node-down
Do not show tasks from down nodes as active in ls
2016-06-24 10:07:25 +02:00
Adam Avilla 7cc6fe5758 Fixing typo on service log output.
Signed-off-by: Adam Avilla <aavilla@yp.com>
2016-06-23 14:54:40 -07:00
John Starks 4acc2c7499 Windows: Always enable VT emulation
Always enable VT output emulation when starting the process so that
non-attaching commands can still output VT codes.

Also remove the version block for using the native console and just rely
on supported flags being present.

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-06-23 13:14:39 -07:00
orkaa 1bdbfa5770 For the lulz! (evalulate -> evaluate)
Signed-off-by: orkaa <orkica@gmail.com>
2016-06-23 16:26:43 +02:00
Tonis Tiigi 5d4401d6d7 Do not show tasks from down nodes as active in ls
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-22 14:49:24 -07:00
Tõnis Tiigi 506234e3f0 Merge pull request #23829 from LK4D4/cleanup_unused
api,daemon: cleanup some unused stuff
2016-06-22 11:58:57 -07:00
Alexander Morozov df6630f6a3 Merge pull request #23832 from tonistiigi/unify-swarm-init-update
Unify swarm init and update options
2016-06-22 11:56:07 -07:00
Yong Tang 9765593c5f 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>
2016-06-22 11:06:44 -07:00
Tonis Tiigi fb3eb1c27e 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>
2016-06-21 16:34:32 -07:00
Alexander Morozov ed5d335e22 api,daemon: cleanup some unused stuff
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-06-21 14:15:19 -07:00
bin liu 950073aabb fix some typos
Signed-off-by: bin liu <liubin0329@gmail.com>
2016-06-21 15:29:25 +08:00
Alexander Morozov e7fd784868 Merge pull request #23399 from tkopczynski/23211-info-command
Migrate info command to cobra
2016-06-20 09:38:53 -07:00
Daniel Nephin cacaeab9db Remove dead code from node update.
Also share mode code between update commands
and use flag constants

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-20 11:05:48 -04:00
Daniel Nephin c08a50dbd1 Use flag constants for swarm flag.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-20 11:04:37 -04:00
Daniel Nephin 9d1f3373b3 add more flag constants to service update.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-20 11:03:36 -04:00
Sebastiaan van Stijn 70e47c4f75 Merge pull request #23731 from WeiZhang555/fix-help
Make --help information consistent
2016-06-19 16:12:09 -07:00
Zhang Wei 0e53976336 Make --help information consistent
Other docker command always print "[OPTIONS]" right after `docker
COMMAND`, but `build` and `push` has inconsistent help message.

This commit will fix help information format.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-06-19 16:26:23 +08:00
Yong Tang 6e86733b47 Fix `docker start` error with renamed container
This fix tries to fix the issue raised in #23716 where `docker start`
causes an error of `No such container:` if the container has been
renamed before `docker start` returns.

The issue is that `docker start` use container name passed at the
beginning to check for exit code at the end of the `docker start`.

This fix addresses the issue by always use container's `ID` to get
the information during `docker start`.

Additional integration tests have been added to cover this fix.

This fix fixes #23716.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-18 16:43:30 -07:00
Arnaud Porterie a3b6ab04f6 Merge pull request #23703 from tiborvass/carry-23694
Carry 23694: Default port for listen addr
2016-06-18 06:25:57 +00:00
Sebastiaan van Stijn 3911644782 Merge pull request #23708 from vieux/lower_mode
accept uppercase endpoint mode
2016-06-17 23:20:17 -07:00
Dong Chen 72f7cebfb0 Block service mode change.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-06-17 23:04:37 -07:00
Daniel Nephin c544649874 Add tests for AutoAcceptOption
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-17 19:43:38 -07:00
Daniel Nephin 595e79b805 Support a listen addr without a port, and add tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-17 19:43:38 -07:00
Victor Vieux 8a0c5f1578 accept uppercase endpoint mode
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-06-17 19:06:12 -07:00
Arnaud Porterie (icecrime) 1f8ab93b44
Change `docker service update` semantics
Change `docker service update` to replace attributes of the target
service rather than augment them. One particular occurrence where the
previous behavior proved problematic is when trying to update a port
mapping: the merge semantics provided no way of removing published
ports, but strictly of adding more.

The utility merge* functions where renamed accordingly to update*.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-06-17 17:09:40 -07:00
Tomasz Kopczynski ac7a663c0b Migrate info command to cobra
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-06-17 22:11:33 +02:00
Arnaud Porterie 28768a6296 Merge pull request #23692 from icecrime/tweak_pretty_service
Improve `docker service inspect --pretty`
2016-06-17 20:08:08 +00:00
Tibor Vass 061bbaf7a4 Merge pull request #23681 from tiborvass/plugins-fixes
Plugins fixes
2016-06-17 12:58:36 -07:00
Arnaud Porterie (icecrime) 3c60b7b984
Improve `docker service inspect --pretty`
Remove capitalization in placement, and remove spurious `\t`.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-06-17 11:38:19 -07:00
Tibor Vass 82c9410c41 Merge pull request #23688 from tonistiigi/nl
Add newline to promote/demote message
2016-06-17 11:04:25 -07:00
Tonis Tiigi 3386e3570a Add newline to promote/demote message
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-17 10:58:11 -07:00
Tibor Vass 2bd34b858d Merge pull request #23676 from avsm/swarm-cli-consistency
`docker swarm`: more consistent CLI help
2016-06-17 10:55:15 -07:00
Vincent Demeester cb321e82db Update plugin command with defaulttag
This way, you don't have to specify the ":latest" tag for some command
and not for others

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-17 10:18:18 -07:00
Tibor Vass 65ed9daf70 plugins: fix usage for plugin commands
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-06-17 10:03:30 -07:00
Tibor Vass 4b70d4561e plugins: install should not automatically accept all permissions
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-06-17 10:03:30 -07:00