docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-25 03:42:05 +03:00
Code Activity
27,239 Commits 12 Branches 297 Tags
5a9205e2eb49ca1eae8ece53f1ee495b2e3432cb
Commit Graph

5961 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
b3b358d207 Merge pull request #26526 from lixiaobing10051267/masterSymble 
fix some incorrect symbols before executing command
Upstream-commit: 9e9ba1e1c1235c3bdb7a70a0a9d0c5932d5afe9e
Component: engine
 2016-09-14 17:48:43 +02:00
lixiaobing10051267
849847f7b2 fix some incorrect symbols before executing command 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 7b73b5fd6acf7a8fc3e9cee3437221794879b7c6
Component: engine
 2016-09-14 22:28:09 +08:00
Sebastiaan van Stijn
422892f89b Merge pull request #25540 from estesp/ro-plus-userns 
Remove --read-only restriction when user ns enabled
Upstream-commit: 8ac2000f5065b887753ffe32d2b793bb4bbd84c5
Component: engine
 2016-09-14 13:53:58 +02:00
Victoria Bialas
04ccb628a7 fixed on-page links 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: c073404af855b172febf7fbd8cf0cd17968a0b59
Component: engine
 2016-09-13 16:20:05 -07:00
Anusha Ragunathan
3f481b7c53 Merge pull request #26216 from vieux/plugin_manifest 
add some plugin manifest reference doc
Upstream-commit: 8aa454dfc8192094221d9ffae5a48d642ea865e4
Component: engine
 2016-09-13 14:03:20 -07:00
Brian Goff
06b2219a87 Add new HostConfig field, Mounts. 
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).

The new API follows exactly the services mount API.

Example usage of `Mounts`:

```
$ curl -XPOST localhost:2375/containers/create -d '{
  "Image": "alpine:latest",
  "HostConfig": {
    "Mounts": [{
      "Type": "Volume",
      "Target": "/foo"
      },{
      "Type": "bind",
      "Source": "/var/run/docker.sock",
      "Target": "/var/run/docker.sock",
      },{
      "Type": "volume",
      "Name": "important_data",
      "Target": "/var/data",
      "ReadOnly": true,
      "VolumeOptions": {
	"DriverConfig": {
	  Name: "awesomeStorage",
	  Options: {"size": "10m"},
	  Labels: {"some":"label"}
	}
      }]
    }
}'
```

There are currently 2 types of mounts:

  - **bind**: Paths on the host that get mounted into the
    container. Paths must exist prior to creating the container.
  - **volume**: Volumes that persist after the
    container is removed.

Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: fc7b904dced4d18d49c8a6c47ae3f415d16d0c43
Component: engine
 2016-09-13 09:55:35 -04:00
Sebastiaan van Stijn
73717df772 Merge pull request #25817 from sfsmithcha/update_glossary 
add swarm mode terms to the glossary
Upstream-commit: 027e7be3482ff314f22dafcb7a4a2ab26b1a7ad7
Component: engine
 2016-09-13 12:08:32 +02:00
Sebastiaan van Stijn
afc1ccd008 Merge pull request #25466 from justincormack/deprecate-maintainer 
Begin process of deprecating MAINTAINER
Upstream-commit: 4d187df277153bf704868d9a67b1e4fa29abf873
Component: engine
 2016-09-13 12:07:04 +02:00
Vincent Demeester
9ac54a66eb Merge pull request #26489 from yuexiao-wang/update-exec 
update option for docker exec
Upstream-commit: 0c90f777b745263deb4be55250ac3d19ddd91cf2
Component: engine
 2016-09-13 11:16:22 +02:00
Justin Cormack
3fe1e84cec Merge pull request #26496 from riyazdf/trust-sandbox-fix 
Use latest version of notary server in trust sandbox docs
Upstream-commit: 6fafd07282f950799613c2ffc8eac6ff86d48206
Component: engine
 2016-09-12 23:56:41 +01:00
Riyaz Faizullabhoy
7d2bc2d40d Use latest version of notary server in trust sandbox docs 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 40f823ccd8ce0c07a27a287f665b4cc0c0084569
Component: engine
 2016-09-12 09:42:12 -07:00
Brian Goff
23e3dc0dcd Merge pull request #26472 from yongtang/09112016-docker-build-step-0 
Fix documentation for `Step 0` to `Step 1` in `docker build`
Upstream-commit: e41839e8a154f1336b3a995dba3f5912dde7e0fe
Component: engine
 2016-09-12 09:08:35 -04:00
yuexiao-wang
4e9a7b27fc update option for docker commands 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 7084aa24c77bde6ed46b2a0b727d049b86ecffec
Component: engine
 2016-09-12 19:10:45 +08:00
Sven Dowideit
ec2041215e Merge pull request #26306 from deployable/patch-1 
Remote API documentation consistancy
Upstream-commit: 2cce7bf33a1af566670ec0fb2deeff8056b2798d
Component: engine
 2016-09-12 10:52:30 +10:00
Sven Dowideit
4472545a05 Merge pull request #26458 from sfsmithcha/fix_vip_diagram 
updates swarm overlay network diagram
Upstream-commit: ae4582dc28ba33f80f17e2cf47e62e464aac7ec5
Component: engine
 2016-09-12 10:11:08 +10:00
Yong Tang
70a2fe1d7b Fix documentation for Step 0 to Step 1 in docker build 
The indexing of steps in the output of `docker build` starts with `Step 1`.
However, there are several places in the docs that start with `Step 0`.

This fix addresses the issue and changes `Step 0` to `Step 1` (and subsequent steps).

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 256dbe4b752ba1fde88e6fad76e3a6b08e4a8816
Component: engine
 2016-09-11 10:52:40 -07:00
Vincent Demeester
c47747e33c Merge pull request #26426 from sfsmithcha/carry_pry_25414 
Carry pr 25414
Upstream-commit: e6f76800f5880652382a6f9180bfdefe6aaad577
Component: engine
 2016-09-10 11:50:28 +02:00
Matt Hoyle
f9b7ffdb90 Keep headings consistant in API documentation 
The "Stream details" sections are currently a part of the Status codes list.

This change moves them out to the same level as other surrounding sections.

Use () for a paramaters

Remove query param from end point heading

Signed-off-by: Matt Hoyle <matt@deployable.co>
Upstream-commit: e0a552504e64192946c86d3bdd517ae7b3af348f
Component: engine
 2016-09-10 12:27:41 +10:00
Charles Smith
0b9d5f508c carries and closes 25414 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: e7e85c7e067167f6ed14866b66afa461d2de32ba
Component: engine
 2016-09-09 15:57:53 -07:00
Charles Smith
c4f625455b updates swarm overlay network diagram 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 48f3aa7805fc935d1c07f9c697edcb6b274252da
Component: engine
 2016-09-09 15:18:53 -07:00
Charles Smith
5ae8996c81 add swarm mode terms to the glossary 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 498f18de26cb8142323c64683699d9e6f10946ea
Component: engine
 2016-09-09 11:18:30 -07:00
Phil Estes
c9069cbf6e Remove --read-only restriction when user ns enabled 
The restriction is no longer necessary given changes at the runc layer
related to mount options of the rootfs. Also cleaned up the docs on
restrictions left for userns enabled mode. Re-enabled tests related to
--read-only when testing a userns-enabled daemon in integration-cli.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 6062ae5742e49ec1a79073c327f3d1343c218a12
Component: engine
 2016-09-09 13:23:41 -04:00
Richard Mathie
3ad3cbeebe Update service_create.md 
More info on endpoint setting, and service discovery on swarm mode overlay network.

Signed-off-by: Richard Mathie <richard.mathie@amey.co.uk>
Upstream-commit: 21a9c64b77bd10969dde7376060d5750c6b65aac
Component: engine
 2016-09-08 12:11:48 -07:00
Michael Crosby
574f281ca0 Merge pull request #26224 from q384566678/test-zhou 
Modify rename function use tips
Upstream-commit: 061cc417591217c4bcf735267c2de18f2a8189c0
Component: engine
 2016-09-08 11:22:21 -07:00
Vincent Demeester
77b48e7428 Merge pull request #26252 from leslau/master 
Fixed custom daemon options on systemd docs still using -H fd://
Upstream-commit: 7baa09faa02ad93dcb0e103abde3c45862fc903c
Component: engine
 2016-09-08 17:15:13 +02:00
Brian Goff
774225b30e Merge pull request #26228 from lixiaobing10051267/masterPluginRm 
check inconsistant command in docs/reference/commandline
Upstream-commit: e96c0fafa0465e7d1a3a12fda820c16d0449f814
Component: engine
 2016-09-08 11:09:18 -04:00
Sven Dowideit
33561ab95c Merge pull request #24586 from farcaller/gcplogs 
Added optional flags to init gcp logger metadata
Upstream-commit: 5be6ccc433e8c9207c67087304dfb72fa00ba544
Component: engine
 2016-09-08 13:47:48 +10:00
Charles Smith
2280ed4544 Merge pull request #26256 from mstanleyjones/rewrite_understanding_docker 
Rewrites to Understanding Docker topic for clarity
Upstream-commit: 426a0af0759798d8e3332b38236ee40df6d14798
Component: engine
 2016-09-07 11:36:58 -07:00
Misty Stanley-Jones
5133a883a8 Rewrites to Understanding Docker topic for clarity 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 12b740b65c88f6225241fe9a73575ec083ddba5d
Component: engine
 2016-09-07 11:02:03 -07:00
Charles Smith
e42ce8aa21 Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage 
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905)
Upstream-commit: 6f0502b89b29a7d23b02363d02104ec531a36e4a
Component: engine
 2016-09-07 10:38:59 -07:00
Daniel Nephin
a8af3835c4 Merge pull request #26269 from yuexiao-wang/remove-option 
Remove the option for the command service rm
Upstream-commit: 20607e2cc20662453226938e4fe0d7ca40fc6ae7
Component: engine
 2016-09-07 11:31:11 -04:00
Sven Dowideit
64292ad8e2 Merge pull request #26218 from frosforever/fix_run_reference_typo 
Correct typo in run reference docs that use the create command
Upstream-commit: e73e37f11206a346d2a552c5d133112cd103d562
Component: engine
 2016-09-07 22:18:26 +10:00
Victor Vieux
528f2cdf29 add some plugin manifest reference doc 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 44a16acff15b5da3103fd002ad5064cb7b375106
Component: engine
 2016-09-07 02:35:03 -07:00
lixiaobing10051267
94b406a933 rectify some response information while execute ifconfig in container 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 97bbfc353450602b358dfa6231faf240744b9967
Component: engine
 2016-09-07 13:19:46 +08:00
lixiaobing10051267
4de3f43e65 remove some incorrect bash symbols 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 2d1d4684f0fc752aae7e41af03a0f1589f11ee00
Component: engine
 2016-09-07 11:44:54 +08:00
Charles Smith
0908488188 Merge pull request #26288 from sfsmithcha/add_tls 
author merge: addressed @diogomonica ' remark: add how pki works topic
Upstream-commit: 75c36bcc64a5597919a16a7d43463f7e7c5e1499
Component: engine
 2016-09-06 10:41:46 -07:00
Charles Smith
565ec12cc7 add how pki works topic 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 5ca3e6e61f5537fa637de9436881402a929bea77
Component: engine
 2016-09-06 10:39:52 -07:00
Michael Crosby
656be9ef36 Merge pull request #26294 from petrsvihlik/updated-windows-mounting-example 
Updated Windows mounting example
Upstream-commit: 368a27a8d80337918d465c8c98100a4e22d9ef1a
Component: engine
 2016-09-06 09:05:50 -07:00
Michael Crosby
773fd0e328 Merge pull request #26212 from rhvgoyal/xfs-enospc 
devmapper: Set xfs max_retries to 0 upon ENOSPC
Upstream-commit: 0d03c060c7e6800e60833c4462b917ee9b081440
Component: engine
 2016-09-06 09:03:09 -07:00
Vincent Demeester
8226c5b8ed Merge pull request #26307 from AkihiroSuda/fix-doc-26291 
fix docs about `sudo docker login`
Upstream-commit: da763602afbb25ea4428e1d608af5ee017a0b94e
Component: engine
 2016-09-06 17:47:46 +02:00
Misty Stanley-Jones
56f38b6496 Add response to swarm/init example (fixes #25625 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: a2a0a03e2b801545b2e3fb9e8476c76370da9175
Component: engine
 2016-09-06 08:39:53 -07:00
Vincent Demeester
87b65ede10 Merge pull request #26293 from lixiaobing10051267/masterDockerAttach 
fix the wrong option info while specifying the command with the "--help"
Upstream-commit: d8e151535017b4bb4ee5aa8281f1b9bb7bffa397
Component: engine
 2016-09-06 15:44:44 +02:00
Vincent Demeester
1092bf17b8 Merge pull request #26313 from yongtang/26312-network-ls-help-output-volume 
Fix incorrect help output in `docker network ls`
Upstream-commit: 1325cde252cd3f117c56a51fd2292194e9f68631
Component: engine
 2016-09-05 19:13:09 +02:00
Yong Tang
c53f181a9b Fix incorrect help output in docker network ls 
As is raised in 26312, in `docker network ls`, the help output was
mistaken to `volume names`:
```
-q, --quiet Only display volume names
```

This fix changes the help output to:
```
-q, --quiet Only display network IDs
```

This fix also updates the documentation in:
`docs/reference/commandline/network_ls.md`

This fix fixes 26312.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: b9e46235fadc6b390e2c04c44b6a865e4ea97cb8
Component: engine
 2016-09-05 08:24:22 -07:00
Vincent Demeester
a5e3c6ff62 Merge pull request #26292 from lixiaobing10051267/masterDockerPull 
modify output info for docker pull centos
Upstream-commit: 175188d8b0eb976cceb6c46de439186eec98e40e
Component: engine
 2016-09-05 15:44:01 +02:00
unclejack
f4b10db50e docs: mention NFS support for contiv volume plugin 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: faaccf26e3936fd34c049267a17b6a34e06a2b4d
Component: engine
 2016-09-05 12:38:50 +03:00
Vincent Demeester
aabe996fb1 Merge pull request #26236 from yuexiao-wang/remove-h-option 
Remove -h option for docker cli
Upstream-commit: 01fe5639bc46ea6cc2efe7b9333bb4d1abb1894b
Component: engine
 2016-09-05 09:52:18 +02:00
Akihiro Suda
c84cf3cf3a fix docs about sudo docker login 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: d6007b4db0c2dc788fc0b1d2e2c5e95a5fa0701f
Component: engine
 2016-09-05 04:44:18 +00:00
Sven Dowideit
509edc829c Merge pull request #26302 from vdemeester/health_status-in-event-docs 
Add health status as action on events documentations
Upstream-commit: b468df9eac16d73c9b8e4853411df1fafea37d1f
Component: engine
 2016-09-05 10:03:14 +10:00
Sven Dowideit
f1e49b9e9a Merge pull request #26245 from dbdd4us/master 
add volumes, networks, nodes and services into label doc
Upstream-commit: 384de833c0f7e20d6a36b6786d1f2e2e67b90d2f
Component: engine
 2016-09-05 10:02:35 +10:00