8d1480427f
Merge pull request #25781 from sfsmithcha/add_ingress_guide
...
author merge: add ingress / publish port guide
Upstream-commit: dee30443368b9ed8046733242410b8c32550ce0d
Component: engine
2016-08-25 10:06:11 -07:00
96374eb25c
add ingress / publish port guide
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 465fd93f1ca474320f8ef0082483b05c3bb48d7b
Component: engine
2016-08-25 09:24:45 -07:00
a0d759f31d
Merge pull request #25786 from splunk/splunk-logging-driver-raw-format-using-json
...
Splunk Logging Driver: formats and verifyconnection
Upstream-commit: 78771b62255456bef110a3e310eb20165e5ece9f
Component: engine
2016-08-25 09:12:31 -07:00
c65cef03da
Replace docker command from 'docker daemon' to 'dockerd'
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 530668cb2262fc89e60a23d9a0f6555498b0171b
Component: engine
2016-08-25 17:04:44 +08:00
9759475f7f
Modify incorrect repository URL
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: ad4efd334962b21f287cf02f2685403ae64a3659
Component: engine
2016-08-24 10:09:33 +08:00
c167cd9e31
Merge pull request #25948 from lixiaobing10051267/masterImages
...
get a redis-cli image while using docker pull
Upstream-commit: 602b2381360cf59fffe46b64bb4bdfa180639c44
Component: engine
2016-08-23 21:44:26 +02:00
1c5ac9c7e1
Merge pull request #25946 from lixiaobing10051267/masterDockerImages
...
Incorrect response field name for command "docker images"
Upstream-commit: 0b2ff0ccdef3327e52699941b2ab888f7fbecb1e
Component: engine
2016-08-23 11:19:52 -07:00
94a1c4d159
Merge pull request #25793 from yuexiao-wang/clean-makefile
...
Clean up the Makefile
Upstream-commit: 442da0d8aa0538ec495881016b6516f59b6f4d63
Component: engine
2016-08-23 09:43:25 +02:00
492b23bc87
get a redis-cli image using docker pull
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 4f7195e3c91903c23e9e36c57955ca60fe0e71fa
Component: engine
2016-08-23 14:44:37 +08:00
7eccfab5d7
Incorrect response field name for command "docker images"
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 8eae3ceab8acbbd5b842f642bd12377bec4b5606
Component: engine
2016-08-23 14:24:31 +08:00
6d0358a080
Merge pull request #25931 from fj/patch-1
...
Fix minor typo in "Getting Started" documentation
Upstream-commit: a949a79a5899df2b57c0ff3e6a3e9aa432db248c
Component: engine
2016-08-22 21:53:47 -05:00
9ccbe410f0
Merge pull request #25914 from lixiaobing10051267/masterSwarmJoinManager
...
Remove option "--manager" description for swarm_join.md
Upstream-commit: 7cd88e5ec4fc13e1ded0eb7c565ed299b46c8259
Component: engine
2016-08-22 13:13:21 -07:00
744ac1e4d5
Fix minor typo in "Docker Engine runs navitvely"
...
Signed-off-by: John Feminella <jxf@jxf.me >
Upstream-commit: 435bc9d9898febc8b9c16a02e4114745a52374fc
Component: engine
2016-08-22 15:43:26 -04:00
f7b9cff570
Remove option "--manager" description for swarm_join.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 344d7f773d10d429b39c8e4e5c7426d4d1998300
Component: engine
2016-08-22 15:42:38 +08:00
968533071a
Merge pull request #25899 from yuexiao-wang/fix-overview
...
Optimize description for Feature highlights
Upstream-commit: d2fa978d4d66622a197eb98f9a77fa217e25f449
Component: engine
2016-08-22 09:17:32 +02:00
36f79775aa
Merge pull request #25719 from eskaaren/master
...
You can force leave swarm
Upstream-commit: daf454d8cd6146ef2cb644614301806ef59c58cc
Component: engine
2016-08-22 09:15:37 +02:00
536db7fdc5
Merge pull request #25775 from ddgenome/entrypoint-env
...
Remove erroneous ENTRYPOINT note
Upstream-commit: c1bdda0be8616f987245cb61a4aedc09c8b5c806
Component: engine
2016-08-22 09:13:54 +02:00
bdc88f8035
Merge pull request #25901 from yuexiao-wang/add-content
...
Add the content for how services work
Upstream-commit: abd08f4784810bcf8b4e88e3f9ef1023cb15b8b5
Component: engine
2016-08-22 11:58:30 +10:00
84a03f36d0
docs: fix typo in url fragment
...
I noticed the broken hyperlink in this page:
https://docs.docker.com/engine/reference/builder/
The link should point to `#parser-directives`.
Signed-off-by: Mihai Borobocea <MihaiBorob@gmail.com >
Upstream-commit: 441ecc459f0d08a930ee2d6f4502f24e2217e1fc
Component: engine
2016-08-20 16:19:05 +03:00
08af9769e8
Add the content for how services work
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 2b0892c02eb50c20e8752643faf558dd150dbc77
Component: engine
2016-08-20 17:32:29 +08:00
e22764bf9f
Optimize description for Feature highlights
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: dde0f86a88989c02256a8b301ff8388752d88eed
Component: engine
2016-08-20 16:24:18 +08:00
cfba442486
Merge pull request #25867 from lixiaobing10051267/masterScheduler
...
It is orchestrator not scheduler to create swarm task
Upstream-commit: ad37e303638dd37b3bf2eef8916e8e0376e2acce
Component: engine
2016-08-19 13:27:12 -07:00
e3afe81751
Merge pull request #23436 from yongtang/23367-out-of-band-volume-driver-deletion
...
Add `--force` in `docker volume rm` to fix out-of-band volume driver deletion
Upstream-commit: 09b929083d34836a78ce8ee79b22aea082712072
Component: engine
2016-08-19 22:09:57 +02:00
034eb19e73
Merge pull request #25791 from lixiaobing10051267/masterSwarmJoinToken
...
Modify usage of docker swarm join-token command
Upstream-commit: 80798d28d36936f16fae4dd60af27cd08f54817c
Component: engine
2016-08-19 21:44:42 +02:00
5f54e81cc1
Merge pull request #25665 from vdemeester/remove-deprecated-run-flag-from-commit
...
Remove -run flag from commit command.
Upstream-commit: ec8f20cbf2edba00e645175675e8dca7c03b1350
Component: engine
2016-08-19 15:19:23 +02:00
ac9a57031e
Remove -run flag from commit command.
...
This flag has been deprecated in version below 1.10 so it's safe to
remove now, according to our deprecation policy.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 54ed156879352afb06ecb94fa7b6518a39eb5fd2
Component: engine
2016-08-19 13:14:03 +02:00
48a77b1711
It is orchestrator not scheduler to create swarm task
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: cb9dfd391ba4df5c34f83f5070e0b685c99bf591
Component: engine
2016-08-19 17:02:00 +08:00
715ba2d5b3
Modify usage of docker swarm join-token command
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 9123ca546a49f6738a918b89ba7a41963083be54
Component: engine
2016-08-19 09:44:22 +08:00
46c68f2339
keep the same between rules and PHONY
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: bf3d1d1e5a39cb66ff58cedbcc9d6e84163a35f8
Component: engine
2016-08-19 09:08:39 +08:00
a603b90d7f
Add --force in docker volume rm to fix out-of-band volume driver deletion
...
This fix tries to address the issue in raised #23367 where an out-of-band
volume driver deletion leaves some data in docker. This prevent the
reuse of deleted volume names (by out-of-band volume driver like flocker).
This fix adds a `--force` field in `docker volume rm` to forcefully purge
the data of the volume that has already been deleted.
Related documentations have been updated.
This fix is tested manually with flocker, as is specified in #23367 .
An integration test has also been added for the scenario described.
This fix fixes #23367 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 6c5c34d50d377d1c5318a255240fb2dc9c23cf92
Component: engine
2016-08-18 18:01:25 -07:00
9ab2ca7546
Merge pull request #25708 from timfeirg/master
...
expose RemovalInProgress in StateString #25652
Upstream-commit: 426046db3a5c3c056f02bf3ad5efd1342ff79533
Component: engine
2016-08-18 21:54:48 +02:00
9ad4bec0bc
Merge pull request #25743 from lixiaobing10051267/masterInspect
...
Check the return message of docker service inspect
Upstream-commit: 6fa69d2d0610320cce61517eca6e4471f5381561
Component: engine
2016-08-18 19:25:08 +02:00
9c61498be3
Merge pull request #25726 from vieux/new_plugin_system_doc
...
adding some documentation about the new plugin system
Upstream-commit: 88a6a7763b789a35fff9df4e52e48ca99afd3c08
Component: engine
2016-08-18 17:20:09 +02:00
c48cb27659
Merge pull request #25792 from lixiaobing10051267/masterSwarmLeave
...
Specify woker node for docker swarm leave command
Upstream-commit: 90308fd78315412c30da90217ee14515de4fbf8a
Component: engine
2016-08-18 17:08:41 +02:00
9ebd97c86d
Merge pull request #25812 from johananl/patch-1
...
Update device-mapper-driver.md
Upstream-commit: 840a1982803425d67d9c29acbed0d16ecaa6e4ed
Component: engine
2016-08-18 17:08:14 +02:00
c8732c07e1
expose RemovalInProgress in StateString #25652
...
Signed-off-by: timfeirg <kkcocogogo@gmail.com >
Upstream-commit: 37466cc8c85ccbdade57463ae2aacac638002f8a
Component: engine
2016-08-18 11:25:27 +08:00
a87ab137b8
Specify woker node for docker swarm leave command
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: fd660e21bf6568c3f98424bdff3b9672cd2a3ef8
Component: engine
2016-08-18 09:35:11 +08:00
3a9b1e9ecd
Split list of capabilities into those added by default and those not
...
The documentation was a bit unhelpful as to what are the default
capabilities, so split.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: bf7a3f010443ecd614baf0450c3193b1f5e52bc2
Component: engine
2016-08-17 21:16:54 +01:00
3497960ec5
Update device-mapper-driver.md
...
Signed-off-by: Johanan Lieberman <johanan.lieberman@gmail.com >
Upstream-commit: 086542a687235b0c3c8a6985755b918e2e93fcbc
Component: engine
2016-08-17 21:58:30 +03:00
6c683fac48
Replace old oci specs import with runtime-specs
...
Fixes #25804
The upstream repo changed the import paths.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 041e5a21dc0a8856448e3a9ad91e8535b8a7d00d
Component: engine
2016-08-17 09:38:34 -07:00
703353742f
Add missing docs about binary remote contexts
...
This feature was added in docker 1.8, through
7491f9a9c11ad3fd3b587fa6f7e53b297b3b88c7.
However, the API docs ended up in the wrong
API version (1.19 instead of 1.20), so were
never included in future API docs.
Also, the CLI docs got lost during splitting
up the cli.md docs into separate files;
561bfb268de3c674b04d48895b7e46ae890ef795
This moves the API docs to the correct
versions, and restores the CLI documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a5ba032c7421ef7a429e780d12d0f604a045258a
Component: engine
2016-08-17 16:15:59 +02:00
1625a6329f
Make it clear who is doing variable expansion
...
Add sentece to RUN, CMD, and ENTRYPOINT exec sections making it clear
that it is the shell doing the environment variable expansion.
Signed-off-by: David Dooling <dooling@gmail.com >
Upstream-commit: 20e336efac147f7cc565eeb4c68beb6ccf905e50
Component: engine
2016-08-17 06:31:19 -05:00
e997af8b70
Merge pull request #25704 from thaJeztah/cleanup-api-markdown
...
Cleanup API docs Markdown formatting and wording
Upstream-commit: 45cb33e65ca5bb247e2e9f425b4441ad6a08aa51
Component: engine
2016-08-17 10:39:45 +02:00
2943f3420d
Merge pull request #25751 from yuexiao-wang/clean-docs
...
Remove mess words in installation doc
Upstream-commit: bbd5396955a8c36b9f208d64fe580b769c1686f5
Component: engine
2016-08-17 09:59:36 +02:00
f07d519e90
remove mess words in installation doc
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: f8d5b880722bcc87113a08cbb2069b6311b89f39
Component: engine
2016-08-17 15:43:52 +08:00
e85d8b261b
Splunk Logging Driver: formats and verifyconnection
...
`--log-opt splunk-format=inline|json|raw` allows to change how logging
driver sends data to Splunk, where
`inline` - default value, format used before, message is injected as a
line in JSON payload
`json` - driver will try to parse each line as a JSON object and embed it
inside of the JSON payload
`raw` - driver will send Raw payload instead of JSON, tag and attributes
will be prefixed before the message
`--log-opt splunk-verify-connection=true|false` - allows to skip
verification for Splunk Url
Signed-off-by: Denis Gladkikh <denis@gladkikh.email >
Upstream-commit: 603fd0831513257bc26d20ca1f64efcc4965eae6
Component: engine
2016-08-16 21:45:16 -07:00
80c9d996e6
fix broken link
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 79aa2b9f6da802ee1380c22c3afc8c0be7c493ce
Component: engine
2016-08-16 21:26:07 -07:00
ec5f7ff759
edit plugin system doc, fix menu system
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: a7a70433cabe5eb210ef81ff61f953ab9d9e332d
Component: engine
2016-08-16 13:36:17 -07:00
06ad6e4384
Remove erroneous ENTRYPOINT note
...
The Dockerfile parser does not subsitute ENV variables in any form of
the ENTRYPOINT command. Any substitution, if done, is done by the shell
when the command is executed.
Signed-off-by: David Dooling <dooling@gmail.com >
Upstream-commit: f44d78b47838204b85204711d014b7f4cf7826ec
Component: engine
2016-08-16 15:24:41 -05:00
a413b2d6cd
Merge pull request #25701 from WeiZhang555/update-conflict-rm-restart
...
Forbid update restart policy of container with AutoRemove flag
Upstream-commit: 9a3e7d9e343938218aac8217c4b8ba4c21b841c4
Component: engine
2016-08-16 10:37:45 -07:00
