p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,196 Commits 2 Branches 295 Tags
247fa65d005bd1e65dbf3875c99745954b63c843
Commit Graph

23 Commits

Author SHA1 Message Date
Brian Goff
b5c88cd04e Merge pull request #32504 from dongluochen/healthcheck_duration 
do not allow duration less than 1 ms in healthcheck parameters
Upstream-commit: a7519152d9be7a0dd6941d529ea4b83cf4b7f1d4
Component: engine
 2017-04-27 23:54:00 -04:00
Dong Chen
47f6ff572e do not allow duration less than 1 ms in healthcheck parameters 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: 5fc912d2c87c1986e830a7d4f6b62bec385e9a14
Component: engine
 2017-04-12 10:48:31 -07:00
Antonio Murdaca
6e350af41d remove --init-path from client 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: a18d103b5ed4ed6ef95b2e4b582872a82022cceb
Component: engine
 2017-04-10 16:49:43 +02:00
Elias Faxö
e25f6c5a1b Added start period option to health check. 
Signed-off-by: Elias Faxö <elias.faxo@gmail.com>
Upstream-commit: e401f63735d8ebcff387c571d1f61ce52bdea86e
Component: engine
 2017-04-06 12:35:34 +02:00
Akihiro Suda
6c1668c7bd cli: add --mount to docker run 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 77fe35b3b903831bd9cfb60a806d056195dc14b6
Component: engine
 2017-04-05 04:52:08 +00:00
Vincent Demeester
69182c0d50 Merge pull request #31709 from dnephin/better-errors 
Replace fmt.Errorf() with errors.Errorf() in the cli
Upstream-commit: 99aaf6b9233d0a0a577e79f536288bca36794c50
Component: engine
 2017-03-28 10:17:46 +02:00
Daniel Nephin
7cc7eec39f Replace fmt.Errorf() with errors.Errorf() in the cli 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 7b7ea8ab810190018346cb7d84c161bb94f7ca60
Component: engine
 2017-03-24 16:58:07 -04:00
John Howard (VM)
50d77b4c9e Windows: Remove --credentialspec flag 
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
Upstream-commit: 53d6aadda5f5bef3af7fb1f9362dbd81189e8374
Component: engine
 2017-03-23 10:01:04 -07:00
Daniel Nephin
0bac9da8c9 Refactor container run cli command. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6a21a127ab5437f12731576653c751a9758aabb8
Component: engine
 2017-03-13 16:05:51 -04:00
Boaz Shuster
da38e7fbf1 Hide command options that are related to Windows 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 7199522ea2e77c77bf931474eca92aa502ce0031
Component: engine
 2017-03-12 08:47:17 +02:00
Vincent Demeester
3a3dfe3c77 Merge pull request #31582 from dnephin/misc-flag-cleanup 
Cleanup some memory flags used in the CLI
Upstream-commit: 83e29a5d87e3c1a0d4a9ae0d6dfe14a9ceb9bb20
Component: engine
 2017-03-10 14:16:42 +01:00
Harald Albers
0d16f73693 Fix description of docker run|create --stop-signal in help message 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: b303e229ca6ec61e43b1b7a93f6ff034a3945644
Component: engine
 2017-03-09 09:32:16 +01:00
Daniel Nephin
ba46ce307c Use opts.MemBytes for flags. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: afcaeedbd4249009811ba1c11767173c23ae0814
Component: engine
 2017-03-07 10:32:49 -05:00
Brian Goff
38bc957cc1 Merge pull request #30203 from allencloud/validate-healthcheck-params-in-daemon-side 
validate healthcheck params in daemon side
Upstream-commit: bb0a532fc21cb6b9390fb7e5eb0054bdc8045bbc
Component: engine
 2017-02-01 21:19:30 -05:00
Vincent Demeester
ba31fcddc2 Merge pull request #29692 from yongtang/29492-daemon-shm-size 
Add daemon option `--default-shm-size`
Upstream-commit: 354bd4aaddc3072dbe9ead45b22a1eaccda6a506
Component: engine
 2017-02-01 16:56:10 +01:00
Vincent Demeester
313335dc3d Merge pull request #22563 from mlaventure/cgroup-devices 
Allow adding rules to cgroup devices.allow on container create/run
Upstream-commit: 27f90acd61f4937f1f722082793e806261e527f7
Component: engine
 2017-02-01 16:29:34 +01:00
allencloud
5c27e35fbb validate healthcheck params in daemon side 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: e399c558e6eeef519a84a2e0bb11dade5a345014
Component: engine
 2017-01-29 13:35:32 +08:00
Yong Tang
f890132120 Update opts.MemBytes to disable default, and move docker run/create/build to use opts.MemBytes 
This fix made several updates:
1. Update opts.MemBytes so that default value will not show up.
   The reason is that in case a default value is decided by daemon,
   instead of client, we actually want to not show default value.
2. Move `docker run/create/build` to use opts.MemBytes for `--shm-size`
   This is to bring consistency between daemon and docker run
3. docs updates.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d1982862cacb74fb28f8103d0774960fd59a5373
Component: engine
 2017-01-27 12:17:06 -08:00
Kenfe-Mickael Laventure
b35799c15f Allow adding rules to cgroup devices.allow on container create/run 
This introduce a new `--device-cgroup-rule` flag that allow a user to
add one or more entry to the container cgroup device `devices.allow`

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 1756af6fafabd9197feb56c0324e49dd7d30b11f
Component: engine
 2017-01-26 07:20:45 -08:00
Sebastiaan van Stijn
be728731d1 Add version annotation to various flags added in 1.13 
Pull request https://github.com/docker/docker/pull/27745 added support for the
client to talk to older versions of the daemon. Various flags were added to
docker 1.13 that are not compatible with older daemons.

This PR adds annotations to those flags, so that they are automatically hidden
if the daemon is older than docker 1.13 (API 1.25).

Not all new flags affect the API (some are client-side only). The following
PR's added new flags to docker 1.13 that affect the API;

- https://github.com/docker/docker/pull/23430 added `--cpu-rt-period`and `--cpu-rt-runtime`
- https://github.com/docker/docker/pull/27800 / https://github.com/docker/docker/pull/25317 added `--group` / `--group-add` / `--group-rm`
- https://github.com/docker/docker/pull/27702 added `--network` to `docker build`
- https://github.com/docker/docker/pull/25962 added `--attachable` to `docker network create`
- https://github.com/docker/docker/pull/27998 added `--compose-file` to `docker stack deploy`
- https://github.com/docker/docker/pull/22566 added `--stop-timeout` to `docker run` and `docker create`
- https://github.com/docker/docker/pull/26061 added `--init` to `docker run` and `docker create`
- https://github.com/docker/docker/pull/26941 added `--init-path` to `docker run` and `docker create`
- https://github.com/docker/docker/pull/27958 added `--cpus` on `docker run` / `docker create`
- https://github.com/docker/docker/pull/27567 added `--dns`, `--dns-opt`, and `--dns-search` to `docker service create`
- https://github.com/docker/docker/pull/27596 added `--force` to `docker service update`
- https://github.com/docker/docker/pull/27857 added `--hostname` to `docker service create`
- https://github.com/docker/docker/pull/28031 added `--hosts`, `--host-add` / `--host-rm` to `docker service create` and `docker service update`
- https://github.com/docker/docker/pull/28076 added `--tty` on `docker service create` / `docker service update`
- https://github.com/docker/docker/pull/26421 added `--update-max-failure-ratio`, `--update-monitor` and `--rollback` on `docker service update`
- https://github.com/docker/docker/pull/27369 added `--health-cmd`, `--health-interval`, `--health-retries`, `--health-timeout` and `--no-healthcheck` options to `docker service create` and `docker service update`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bbbddeebba5fb8856dc977eada90c22f1f20c394
Component: engine
 2017-01-16 18:21:20 +01:00
Sebastiaan van Stijn
c249c5ced8 Don't use AutoRemove on older daemons 
Docker 1.13 moves the `--rm` flag to the daemon,
through an AutoRemove option in HostConfig.

When using API 1.24 and under, AutoRemove should not be
used, even if the daemon is version 1.13 or above and
"supports" this feature.

This patch fixes a situation where an 1.13 client,
talking to an 1.13 daemon, but using the 1.24 API
version, still set the AutoRemove property.

As a result, both the client _and_ the daemon
were attempting to remove the container, resulting
in an error:

    ERRO[0000] error removing container: Error response from daemon:
    removal of container ce0976ad22495c7cbe9487752ea32721a282164862db036b2f3377bd07461c3a
    is already in progress

In addition, the validation of conflicting options
is moved from `docker run` to `opts.parse()`, so
that conflicting options are also detected when
running `docker create` and `docker start` separately.

To resolve the issue, the `AutoRemove` option is now
always set to `false` both by the client and the
daemon, if API version 1.24 or under is used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0ea7b143b0a8366799c83a955be676aaf1345214
Component: engine
 2017-01-15 01:59:57 +01:00
yuexiao-wang
47aebadce2 keep network option consistent between network connect and run 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 4f9b076e8eecb19083b3875b7cacbc3b660fde75
Component: engine
 2017-01-04 19:54:03 +08:00
Vincent Demeester
0de1da63ca Clean some stuff from runconfig that are cli only… 
… or could be in `opts` package. Having `runconfig/opts` and `opts`
doesn't really make sense and make it difficult to know where to put
some code.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c424be21b7aa732681ed019b5e547a99fdc2afa5
Component: engine
 2016-12-24 13:16:00 +01:00