allencloud
cd03aec1cb
better command docker network create -h output
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: d0081a0f476f91b0dc6b28c480e7c95c06b05ebb
Component: engine
2016-07-16 15:32:17 +08:00
Stephen J Day
aa2ddf3393
swarm: add log driver support for services
...
Adds log driver support for service creation and update. Add flags
`--log-driver` and `--log-opt` to match `docker run`. Log drivers are
configured per service.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: e778ba2d5b1e5074fe413dffaa365f3d37b175c7
Component: engine
2016-07-15 21:39:27 -07:00
allencloud
07187f66b8
update comparison log in container config
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: e5bed175741461edaa1de5dede0486d9f6afd328
Component: engine
2016-07-16 11:26:19 +08:00
Sebastiaan van Stijn
cff2c54d47
Merge pull request #24682 from justincormack/oom-score-adj-doc
...
Document --oom-score-adj flag in docker run
Upstream-commit: 9ad857a78879420308a935ad80881311bc5e261f
Component: engine
2016-07-16 03:00:51 +02:00
Sebastiaan van Stijn
3172da7b30
Merge pull request #24599 from vdemeester/small-zsh-completion-fix
...
Small zsh completion fix on --pretty & --no-resolve
Upstream-commit: ff1040bafc6a01d46c50b004f10d24a180c5f319
Component: engine
2016-07-16 02:55:32 +02:00
Sebastiaan van Stijn
bfc9affa26
Merge pull request #24280 from miaoyq/24261-fix-make-docker-py-err
...
Fix 'make test-docker-py' error
Upstream-commit: 13fcbe3d53d3baab4391b23db3e48b4aad877eaa
Component: engine
2016-07-16 02:07:23 +02:00
Sebastiaan van Stijn
c4e34ed5c5
Improve flag help consistency, and update docs
...
This adds the `--live-restore` option to the documentation.
Also synched usage description in the documentation
with the actual description, and re-phrased some
flag descriptions to be a bit more consistent.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 64a8317a5a306dffd0ec080d9ec5b4ceb2479a01
Component: engine
2016-07-16 01:58:01 +02:00
Tibor Vass
c271a4e497
Merge pull request #24699 from dnephin/fixes_to_service_inspect
...
Only show port name if set
Upstream-commit: 8a0acaa5126ff0afd4588ffa76dd31e325ac359c
Component: engine
2016-07-15 16:02:02 -07:00
Sebastiaan van Stijn
7d15ca738c
Merge pull request #24702 from londoncalling/fix-toolbox-description-docs
...
fixed cut-and-paste error on description of Docker Toolbox
Upstream-commit: 80965a35c1c571ff3fcfa1d7423f784aa703728d
Component: engine
2016-07-15 23:09:06 +02:00
Victoria Bialas
25e8fa8dc7
fixed cut-and-paste error on description of Docker Toolbox
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 6f9e310831326b8031a3526282ffd82cee94294f
Component: engine
2016-07-15 13:54:34 -07:00
Daniel Nephin
6f7cdfbda7
Only show port name if set.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 909c596fa5956ed02b4708a437a828a2829c9bd5
Component: engine
2016-07-15 16:02:04 -04:00
Tonis Tiigi
ffdb429522
Increase timeout for swarm requests
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 85b1fdf15ce2ad1b373748554d3aa218e2eb5a5f
Component: engine
2016-07-15 11:03:08 -07:00
Sebastiaan van Stijn
dccb2477f1
Merge pull request #24610 from sfsmithcha/rc4_tutorial_check
...
update create swarm and add nodes to use the auto-generated join command
Upstream-commit: 9a9fc01af8fb5d98b8eec0740716226fadb3735c
Component: engine
2016-07-15 19:09:36 +02:00
Michael Crosby
43384c919c
Merge pull request #24690 from thaJeztah/add-new-maintainers
...
Add new maintainers
Upstream-commit: 50b3595697fbcb7fa4f963deb5f241d2b936e7c6
Component: engine
2016-07-15 09:49:30 -07:00
Anusha Ragunathan
0633dc391e
Remove use of exec-root in plugins due to socket pathname limits.
...
Unix sockets are limited to 108 bytes. As a result, we need to be
careful in not using exec-root as the parent directory for pluginID
(which is already 64 bytes), since it can result in socket path names
longer than 108 bytes. Use /tmp instead. Before this change, setting:
- dockerd --exec-root=/go/src/github.com/do passes
- dockerd --exec-root=/go/src/github.com/doc fails
After this change, there's no failure.
Also, write a volume plugins test to verify that the plugins socket
responds.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 21ecd5a93db34288c0c579d5738030716d7bef2d
Component: engine
2016-07-15 09:17:29 -07:00
Alexander Morozov
c913339476
Merge pull request #24676 from coolljt0725/fix_24674
...
Fix daemon panic use wrong graphdriver with --live-restore flag
Upstream-commit: f553362ae5be45d5e2eaff4b3a9d89fa796052da
Component: engine
2016-07-15 08:44:01 -07:00
Alexander Morozov
e65f86d46e
Merge pull request #24642 from tonistiigi/wait-open
...
Wait for the reader fifo opening to block
Upstream-commit: c562e3d7688e14c537be992e4b17486335c32577
Component: engine
2016-07-15 08:42:18 -07:00
Sebastiaan van Stijn
aa4d3ecd63
Add new maintainers
...
As voted on per e-mail, adding
new maintainers to the list
Welcome!
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d4b932131a9a1f2bb532e930255a01d040bcc77c
Component: engine
2016-07-15 17:34:26 +02:00
Vincent Demeester
d1f2c3f2ad
Merge pull request #24638 from miaoyq/fix-docs-err
...
Delete redundant content of 'docs/extend/plugins.md'
Upstream-commit: 80ec9fa284c22bc0df617c3d55c49cbbddfb8bb8
Component: engine
2016-07-15 17:04:11 +02:00
Justin Cormack
31552e5edc
Document --oom-score-adj flag in docker run
...
This was only mentioned in docker create documentation.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 6ba6265d1ad86680ad7f7750ae1f9abb72f1e728
Component: engine
2016-07-15 14:11:54 +01:00
Sebastiaan van Stijn
13710c5963
Merge pull request #24668 from sdurrheimer/zsh-completion-service-endpoint-mode
...
Update zsh completion for 'docker service {create,update} {--endpoint…
Upstream-commit: 983fc995093e10ca816283debc136291e74d07fb
Component: engine
2016-07-15 14:40:45 +02:00
Steve Durrheimer
124e74e433
Update zsh completion for 'docker service {create,update} {--endpoint-mode,--mode}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 2e6922a6d3295857ae73fe7df7aa452d220f869d
Component: engine
2016-07-15 14:36:18 +02:00
Sebastiaan van Stijn
9ee16a1c14
Merge pull request #24666 from sdurrheimer/zsh-completion-dockerd-oom-score-adjust
...
Add zsh completion for 'dockerd --oom-score-adjust'
Upstream-commit: a968f83c5583cf42008fcd88c5491946d6eb2dcd
Component: engine
2016-07-15 13:47:39 +02:00
Sebastiaan van Stijn
9e9e783e35
Merge pull request #24669 from hqhq/fix_aufs_docs
...
Fix aufs docs
Upstream-commit: 533853dc5765d258d2716da97ba00adc9b204b9f
Component: engine
2016-07-15 13:41:40 +02:00
Antonio Murdaca
f75fcb4528
Merge pull request #24655 from tonistiigi/stats-test-fix
...
Fix TestGetContainerStatsRmRunning test
Upstream-commit: 790fb315f7da723fe80fd269f1195283a1172b33
Component: engine
2016-07-15 11:49:37 +02:00
Vincent Demeester
9806cec69f
Merge pull request #24667 from sdurrheimer/zsh-completion-docker-service-create-update-registry-auth
...
Add zsh completion for 'docker service {create,update} --registry-auth'
Upstream-commit: 2a888c02a65c483e51f5fc8cf462d3ec6a15ab47
Component: engine
2016-07-15 11:15:55 +02:00
Vincent Demeester
8da911193c
Merge pull request #24665 from sdurrheimer/zsh-completion-run-network
...
Rename zsh completion for 'docker {create,run} --net --net-alias' to …
Upstream-commit: d69fcf10cb2b751afe8b9468ac8636687b1861d7
Component: engine
2016-07-15 11:15:35 +02:00
Vincent Demeester
10e8bd2812
Merge pull request #24147 from PaulFurtado/fix_init_pidfile_dockerd
...
Make docker daemon and init script agree on pidfile location
Upstream-commit: 0534c3b7d669ac7eeab9d29fd9e4eb2a654a81a8
Component: engine
2016-07-15 11:14:53 +02:00
Lei Jitang
40f145b134
Fix daemon panic use wrong graphdriver with --live-restore flag
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: d9e8cea1b666cc22d6747482ad16600cb9dc6fa1
Component: engine
2016-07-15 05:05:28 -04:00
Steve Durrheimer
9188889f22
Add zsh completion for 'docker service {create,update} --registry-auth'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 64f08906a2429ac0b2192e263ca86574f7f0dded
Component: engine
2016-07-15 08:23:57 +02:00
Steve Durrheimer
bc5b09206f
Add zsh completion for 'dockerd --oom-score-adjust'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 5d29732bdf8f6b3a52a8272c4549982a95727ef8
Component: engine
2016-07-15 08:16:15 +02:00
Steve Durrheimer
a7e7e20b17
Rename zsh completion for 'docker {create,run} --net --net-alias' to '--network --network-alias'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ba5d9f63a3b5c39fdbb89778782367a55ce74809
Component: engine
2016-07-15 08:09:20 +02:00
Qiang Huang
c93bbd4d7a
Fix aufs docs
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 92dfbc1e2d48164e1100718be42115c26d40dc6e
Component: engine
2016-07-15 13:57:38 +08:00
yuzou
c47515a372
remove the second repeated line cli.api = api since api is a pointer
...
Signed-off-by: yuzou <zouyu7@huawei.com >
Upstream-commit: cb31d03b58e51a8ff56a04e8e0b5e17693b03f78
Component: engine
2016-07-15 11:45:30 +08:00
Yanqiang Miao
346295e672
Delete redundant content of 'docs/extend/plugins.md'
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Update plugins.md
Update plugins.md
Upstream-commit: cfe9d2ff1eded7e9bb9b798e780a251c6fc26ef9
Component: engine
2016-07-15 11:26:10 +08:00
Tonis Tiigi
e53dc037d4
Fix panic in stats test
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f5fb3c69fdd339c4ec1778a00d4cfc1aa887e310
Component: engine
2016-07-14 17:30:57 -07:00
Sebastiaan van Stijn
7d2ad0787e
Merge pull request #24654 from crosbymichael/enable-systemctl
...
Enable docker.socket and docker.service in fedora install docs
Upstream-commit: 9df2a825bad0d5d6d23742f58dfefc962953b91c
Component: engine
2016-07-15 01:42:31 +02:00
Michael Crosby
a7897f1409
State that docker supports fedora 24
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 6780bdcbad3ab3b3de1568e51db676bb0f059cd8
Component: engine
2016-07-14 16:24:21 -07:00
Michael Crosby
04ff70ab75
Enable docker socket and service on fedora
...
Make sure that the users enable both the socket and service for docker
as part of the default install instructions. If both are not enabled
docker will not start at boot and restart containers.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 7a93a87c1a254abbf8e68093d4be241097694bb1
Component: engine
2016-07-14 16:23:05 -07:00
Paul Furtado
8e4507da93
Change $prog back to docker in sysvinit-redhat
...
(and set $exec to dockerd instead)
This ensures end users do not need to make any configuration changes
due to the rename from docker to dockerd in version 1.12.
Signed-off-by: Paul Furtado <pfurtado@hubspot.com >
Upstream-commit: acb41ddc9df80894d2ff84c34a98cc904b9241fa
Component: engine
2016-07-14 17:21:59 -04:00
Charles Smith
f230d204ae
Merge pull request #24640 from avsm/service-create-docs-quoting
...
docs: correct the placement constraints `docker service` example
Upstream-commit: ed94129c9e48ccdbefc3578401d045139385f5c6
Component: engine
2016-07-14 13:18:45 -07:00
Charles Smith
607a298d5c
update create swarm and add nodes to use the auto-generated join command
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: fec803f7793ce347fe276ea93c13fb9022677135
Component: engine
2016-07-14 11:26:46 -07:00
Tonis Tiigi
918edfff9f
Wait for the reader fifo opening to block
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 0b2023130e285a0207be9fda4b22e1419997c552
Component: engine
2016-07-14 10:14:53 -07:00
Sebastiaan van Stijn
158079c51b
Merge pull request #24568 from dmcgowan/search-v2-auth
...
Allow v1 search to use v2 auth with identity token
Upstream-commit: 56fb100140f96a010dcc834ed1d1626ffbc28970
Component: engine
2016-07-14 19:11:33 +02:00
Anil Madhavapeddy
6179c27dae
docs: correct the placement constraints docker service example
...
- the constraint expression needs to be quoted
- add an actual redis container to run so the command line works
Signed-off-by: Anil Madhavapeddy <anil@docker.com >
Upstream-commit: c37da1792d232b5a8545227d5819bb245df16023
Component: engine
2016-07-14 17:38:37 +01:00
Antonio Murdaca
8de09a35ce
Merge pull request #24593 from mlaventure/fix-libcontainerd-data-race
...
Fix data race in libcontainerd
Upstream-commit: 0a96ba8a0f6b98d82fe2f8f4e07838785cb8d708
Component: engine
2016-07-14 17:27:24 +02:00
Sebastiaan van Stijn
d37c862586
Merge pull request #24630 from eskaaren/status_409
...
Status code 409 received when conflicting name when creating container
Upstream-commit: e056b4e370077bbc92e27762e2843895e83dcd12
Component: engine
2016-07-14 15:26:21 +02:00
Eivin Giske Skaaren
51ece55ad4
Status code 409 received when conflicting name when creating container
...
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com >
Upstream-commit: 5bf46cc43624f230fae80430dd9d1d5f494c0c95
Component: engine
2016-07-14 14:58:43 +02:00
Sebastiaan van Stijn
89ab6ee893
docs: cleanup docker update docs
...
move the "kernel memory" examples to the "examples" section,
and fix some formatting and grammar.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0ebc3c075006732c91c4ff0583f0f8e94c3bf237
Component: engine
2016-07-14 13:05:57 +02:00
Sebastiaan van Stijn
d2af4bb5e5
Merge pull request #24628 from vdemeester/service-doc-fixes
...
Service doc fixes
Upstream-commit: e7e9f753e81110b7d5845663690e741388528640
Component: engine
2016-07-14 11:38:07 +02:00
allencloud
Stephen J Day
Sebastiaan van Stijn
Sebastiaan van Stijn
Tibor Vass
Victoria Bialas
Daniel Nephin
Tonis Tiigi
Michael Crosby
Anusha Ragunathan
Alexander Morozov
Vincent Demeester
Justin Cormack
Steve Durrheimer
Antonio Murdaca
Lei Jitang
Qiang Huang
yuzou
Yanqiang Miao
Paul Furtado
Charles Smith
Anil Madhavapeddy
Eivin Giske Skaaren