Commit Graph
5652 Commits
Author SHA1 Message Date
Michael Crosby 951b0a97af Merge pull request #22641 from cpuguy83/build_finalization
Adds ability to flatten image after build
Upstream-commit: 09caa1ae97
Component: cli
2016-11-01 14:30:18 -07:00
Brian Goff fad42b5770 Adds ability to squash image after build
Allow built images to be squash to scratch.
Squashing does not destroy any images or layers, and preserves the
build cache.

Introduce a new CLI argument --squash to docker build
Introduce a new param to the build API endpoint `squash`

Once the build is complete, docker creates a new image loading the diffs
from each layer into a single new layer and references all the parent's
layers.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b90c048804
Component: cli
2016-11-01 13:41:59 -04:00
Sebastiaan van Stijn 6edad79979 Update deprecation versions for "email" and colon in "security options"
These features were originally scheduled
for removal in docker 1.13, but we changed
our deprecation policy to keep features
for three releases instead of two.

This updates the deprecation version
to match the deprecation policy.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ac7d79389a
Component: cli
2016-11-01 09:12:27 -07:00
Zhang Wei ca8b6d0b28 Replace all "Filter" field with "Filters" for consistency
In file `api/types/client.go`, some of the "*Options{}" structs own a
`Filters` field while some else have the name of `Filter`, this commit
will rename all `Filter` to `Filters` for consistency. Also `Filters`
is consistent with API with format `/xxx?filters=xxx`, that's why
`Filters` is the right name.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 9eceaa926f
Component: cli
2016-11-01 23:09:30 +08:00
Zhang Wei c7196b3968 Replace all "Filter" field with "Filters" for consistency
In file `api/types/client.go`, some of the "*Options{}" structs own a
`Filters` field while some else have the name of `Filter`, this commit
will rename all `Filter` to `Filters` for consistency. Also `Filters`
is consistent with API with format `/xxx?filters=xxx`, that's why
`Filters` is the right name.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: d121e14ccd
Component: cli
2016-11-01 23:09:30 +08:00
Doug Davis 3f0d4ebbb3 Merge pull request #27930 from YuPengZTE/devLogout
Align with other cli descriptions
Upstream-commit: e7e5e6138f
Component: cli
2016-11-01 08:39:04 -04:00
yupeng a70e23cbcd Align with other cli descriptions
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: f1b1e55f7a
Component: cli
2016-11-01 13:41:49 +08:00
yupeng 1b6c8e9cf6 Align with other cli descriptions
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 89db77511c
Component: cli
2016-11-01 13:41:49 +08:00
Daniel Nephin 7d5d39c4f3 Refactor client/request
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5f066ed250
Component: cli
2016-10-31 17:36:49 -04:00
Sebastiaan van Stijn ee6accd430 Merge pull request #27901 from ripcurld00d/load_stdin_valid
Validate docker-load receives a tar file
Upstream-commit: 256b9c6011
Component: cli
2016-10-31 14:23:18 -07:00
Sebastiaan van Stijn 44be9bdb95 Merge pull request #26683 from yuexiao-wang/update-inspect
Modify short and flags for docker inspect
Upstream-commit: 36e66d54c9
Component: cli
2016-10-31 13:39:59 -07:00
Daniel Nephin fe94d78afa Generate ContainerWait response from the swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 85a0bd062d
Component: cli
2016-10-31 11:19:53 -04:00
Daniel Nephin e10d258b88 generate AuthResponse type from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ca7404a80a
Component: cli
2016-10-31 11:16:03 -04:00
Daniel Nephin 5175d100a2 Generate container create response from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e7e0837702
Component: cli
2016-10-31 11:16:02 -04:00
Daniel Nephin 4a62b2cc8e Generate container update response from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 598e3a4874
Component: cli
2016-10-31 11:16:02 -04:00
Daniel Nephin bc55ba3a44 Use IDResponse for container create response.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f8cdc5ae71
Component: cli
2016-10-31 11:16:02 -04:00
Daniel Nephin 71efaf6beb Add an IDResponse type
Generated from a swagger spec and use it for container exec response

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d4d914bd52
Component: cli
2016-10-31 11:16:02 -04:00
Daniel Nephin 9557c883f5 Generate container create response from swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e0f7f8d0dd
Component: cli
2016-10-31 11:16:02 -04:00
Daniel Nephin 1dc49df012 Use a config to generate swagger api types
Moves the resposne types to a package under api/types

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 010023c3c6
Component: cli
2016-10-31 11:13:41 -04:00
Daniel Nephin d817915a4e Use a config to generate swagger api types
Moves the resposne types to a package under api/types

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6dc945ab36
Component: cli
2016-10-31 11:13:41 -04:00
Daniel Nephin f382f98092 Generate VolumesCreateRequest from the swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 120c5f9964
Component: cli
2016-10-31 11:13:41 -04:00
Daniel Nephin 6fb78dfac2 Generate VolumesCreateRequest from the swagger spec.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0325c474b8
Component: cli
2016-10-31 11:13:41 -04:00
Daniel Nephin daa7c9a587 Generate VolumeList response from the swagger spec
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3e13296c4e
Component: cli
2016-10-31 11:13:41 -04:00
Boaz Shuster f73b440c5c Validate docker-load receives a tar file
To load an image from a tar file, you can specify
the tar file in the -i/--input option:
docker load -i image_1.tar

or using stdin:

docker load < image_1.tar
cat image_1.tat | docker load

If the image file isn't given the `docker load`
command gets stuck.

To avoid that, the load makes sure the CLI input is
not a terminal or the `--input` option was set.
If not then an error message is shown.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: fdbf29e1fa
Component: cli
2016-10-31 15:30:55 +02:00
yuexiao-wang 0473c568d7 Modify short and flags for docker inspect
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 6027424adf
Component: cli
2016-10-31 18:11:25 +08:00
Qiang Huang f6256ed04b Fix bunch of typos
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: faac177285
Component: cli
2016-10-29 15:03:26 +08:00
Lily Guo f65dcbf8f4 Service create --group param
--group-add was used for specifying groups for both service create
and service update. For create it was confusing since we don't have
an existing set of groups. Instead I added --group to create, and
moved --group-add to service update only, like --group-rm
This deals with issue 27646

Signed-off-by: Lily Guo <lily.guo@docker.com>

Update flag documentation

Specify that --group, --group-add and --groupd-rm refers to
supplementary user groups

Signed-off-by: Lily Guo <lily.guo@docker.com>

Fix docs for groups and update completion scripts

Signed-off-by: Lily Guo <lily.guo@docker.com>
Upstream-commit: 378ae7234a
Component: cli
2016-10-28 13:26:31 -07:00
Vincent Demeester 22661cb3e1 Merge pull request #27369 from cezarsa/hc
Add --health-* flags to service create and update
Upstream-commit: 4403644a9e
Component: cli
2016-10-28 21:59:52 +02:00
Vincent Demeester e527c56131 Add StatsFormat to the config.json file
As for `ps`, `images`, `network ls` and `volume ls`, this makes it
possible to define a custom default format.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 908aa5b408
Component: cli
2016-10-28 11:48:25 -07:00
Michael Crosby 831fa2006f Merge pull request #27394 from Microsoft/jjh/runelevated
Windows: Hint to run client elevated
Upstream-commit: e9089b55ee
Component: cli
2016-10-28 11:25:04 -07:00
Cezar Sa Espinola 2d1410ba92 Add --health-* commands to service create and update
A HealthConfig entry was added to the ContainerSpec associated with the
service being created or updated.

Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com>
Upstream-commit: 87e916a171
Component: cli
2016-10-28 15:19:08 -02:00
boucher 5099913cf9 Allow providing a custom storage directory for docker checkpoints
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: 5ddcbc3c00
Component: cli
2016-10-28 07:56:05 -04:00
boucher 40e9e05c74 Allow providing a custom storage directory for docker checkpoints
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: a38761aba4
Component: cli
2016-10-28 07:56:05 -04:00
Vincent Demeester af072edbe5 Merge pull request #27654 from gaocegege/add-quiet-mode-to-service-ps
Add -q option to `docker service ps`
Upstream-commit: 4b65bdd802
Component: cli
2016-10-28 05:21:03 +02:00
Ce Gao 64087d642d fixes #27643
Signed-off-by: Ce Gao <ce.gao@outlook.com>
Upstream-commit: 4c1560e987
Component: cli
2016-10-28 08:02:57 +08:00
Sebastiaan van Stijn 4671c52f80 Merge pull request #26988 from thaJeztah/remove-service-update-name-flag
Remove service update name flag
Upstream-commit: 881831531a
Component: cli
2016-10-27 16:55:47 -07:00
Sebastiaan van Stijn a467ba4b3e Merge pull request #27701 from ripcurld00d/unit_test_formatter_stats
Add unit tests to cli/command/formatter/stats.go
Upstream-commit: 090093bdbf
Component: cli
2016-10-27 15:10:47 -07:00
Kenfe-Mickaël Laventure dbd3d8d8d3 Merge pull request #26718 from ncdc/add-logs-to-container-attach-options
Add Logs to ContainerAttachOptions
Upstream-commit: 4c7160ed7b
Component: cli
2016-10-27 13:32:50 -07:00
Yong Tang 01d713986a Add --env-file flag to docker create service
This fix tries to address the issue in 24712 and add
`--env-file` file to `docker create service`.

Related documentation has been updated.

An additional integration has been added.

This fix fixes 24712.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 1250d2afae
Component: cli
2016-10-27 11:48:32 -07:00
Sebastiaan van Stijn 9dc55b4321 Remove --name flag from service update
The --name flag was inadvertently added to
docker service update, but is not supported,
as it has various side-effects (e.g., existing
tasks are not renamed).

This removes the flag from the service update
command.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6c80d2bb83
Component: cli
2016-10-27 09:16:29 -07:00
Boaz Shuster 1ca668ac55 Add unit tests to cli/command/formatter/stats.go
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: c1da6dc7ac
Component: cli
2016-10-27 18:00:38 +03:00
Sebastiaan van Stijn 38aff80fff Merge pull request #27759 from Microsoft/jjh/fixstats
Windows: Fix stats CLI
Upstream-commit: 3b4084cb50
Component: cli
2016-10-26 18:17:18 -07:00
Tibor Vass d6afd26ba8 Merge pull request #26402 from qudongfang/ensure_client_transport_be_closed
ensure transport.Client be closed
Upstream-commit: 49fa58a2e9
Component: cli
2016-10-26 11:51:51 -07:00
Erik St. Martin 46742b9fba Implementing support for --cpu-rt-period and --cpu-rt-runtime so that
containers may specify these cgroup values at runtime. This will allow
processes to change their priority to real-time within the container
when CONFIG_RT_GROUP_SCHED is enabled in the kernel. See #22380.

Also added sanity checks for the new --cpu-rt-runtime and --cpu-rt-period
flags to ensure that that the kernel supports these features and that
runtime is not greater than period.

Daemon will support a --cpu-rt-runtime flag to initialize the parent
cgroup on startup, this prevents the administrator from alotting runtime
to docker after each restart.

There are additional checks that could be added but maybe too far? Check
parent cgroups to ensure values are <= parent, inspecting rtprio ulimit
and issuing a warning.

Signed-off-by: Erik St. Martin <alakriti@gmail.com>
Upstream-commit: 4f320d7c2a
Component: cli
2016-10-26 11:33:06 -04:00
Sebastiaan van Stijn 835f605280 Merge pull request #27702 from tonistiigi/net-builder0
add --network option for docker build
Upstream-commit: 4c4545c92f
Component: cli
2016-10-25 21:50:33 -07:00
Sebastiaan van Stijn e2164724b1 Merge pull request #27702 from tonistiigi/net-builder0
add --network option for docker build
Upstream-commit: 70fbc5e0bb
Component: cli
2016-10-25 21:50:33 -07:00
John Howard 84e8a755f4 Windows: Fix stats CLI
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: dff7842790
Component: cli
2016-10-25 19:57:47 -07:00
sandyskies 8446b1acdf add --network option for docker build
Signed-off-by: sandyskies <chenmingjie0828@163.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 3c9dff2f75
Component: cli
2016-10-25 10:25:36 -07:00
sandyskies 1ba89e2590 add --network option for docker build
Signed-off-by: sandyskies <chenmingjie0828@163.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 01832cc0ab
Component: cli
2016-10-25 10:25:36 -07:00
Akihiro Suda c4d3e691e1 add docker network prune
`docker network prune` prunes unused networks, including overlay ones.
`docker system prune` also prunes unused networks.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: d5d520f0d7
Component: cli
2016-10-25 06:43:54 +00:00