Eivin Giske Skaaren
cf3d39b364
Capital D in "ID" returned when creating service
...
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com >
Upstream-commit: 9eb2ec799eb37210dee5183ace375e480bbfd8aa
Component: engine
2016-08-16 13:43:23 +02:00
Sebastiaan van Stijn
48966e7c86
Merge pull request #25745 from albers/completion-volume-ls-filter-label
...
Add bash completion for `docker volume ls --filter label`
Upstream-commit: 0309eeb5ddd9733daa18ef07f7eea0dc3c53626e
Component: engine
2016-08-16 13:27:14 +02:00
Sebastiaan van Stijn
c2797cb474
Merge pull request #25753 from eskaaren/swarm_inspect
...
Add doc for inspect swarm
Upstream-commit: 1f0a99e86f78f5c5f076c1dcd10ad329ea8ee737
Component: engine
2016-08-16 13:19:36 +02:00
Eivin Giske Skaaren
20d4e38a31
Add doc for inspect swarm
...
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com >
Upstream-commit: c59bc537274aa7f4dc9702ea08c349c71a024b39
Component: engine
2016-08-16 12:49:33 +02:00
Sebastiaan van Stijn
cd9750292a
Merge pull request #23808 from AkihiroSuda/formatinfo
...
add `--format` flag to `docker info`
Upstream-commit: 348f6529b71502b561aa493e250fd5be248da0d5
Component: engine
2016-08-16 12:04:26 +02:00
Vincent Demeester
900e8ce606
Merge pull request #25684 from d64/improve-systemd-config-for-raspbian
...
Improve systemd configuration for Raspbian/Jessie
Upstream-commit: 72a312c07b101941254f6d2f128520612e42b301
Component: engine
2016-08-16 10:58:33 +02:00
Vincent Demeester
aab3a8354b
Merge pull request #25705 from AkihiroSuda/noteRenameCOW
...
Add a note about the open(2) and rename(2) on AUFS and OverlayFS
Upstream-commit: 7524a1d3f2fa3489d689b1973dfb84e13615d3de
Component: engine
2016-08-16 10:52:25 +02:00
Vincent Demeester
48e956615d
Merge pull request #25690 from yongtang/25661-docker-build-detect-tty
...
Suppress verbose "Sending build context" messages in non tty scenarios
Upstream-commit: 9dd8ccc746a66fe117d37dfcd02ee690d0e1ac02
Component: engine
2016-08-16 10:47:11 +02:00
Harald Albers
a80a4f000b
Add bash completion for docker volume ls --filter label
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 41511f8911e48b1d0404ddc975243f5a6f303fb2
Component: engine
2016-08-16 09:10:46 +02:00
John Howard
a3a8b4ee81
Merge pull request #25143 from cpuguy83/update_go-check
...
Add stack dumps from the daemon(s) on test timeout
Upstream-commit: 3c6f4cd5a6c0de3d3700ad14bb8f177e8e1198fd
Component: engine
2016-08-15 22:09:20 -07:00
Akihiro Suda
1b140377f0
add --format flag to docker info
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: dc38c9a04705f0a9ad3e007f7869cfb6a8a3a8b8
Component: engine
2016-08-16 04:03:52 +00:00
Tõnis Tiigi
ca823e9707
Merge pull request #25597 from vieux/check_plugin_manifest_json
...
check plugin manifest is correctly formatted before push
Upstream-commit: f5ef498289a2f2dd80724afbe5a53892690ced53
Component: engine
2016-08-15 19:27:50 -07:00
Akihiro Suda
871f085a91
Add a note about the open(2) and rename(2) on AUFS and OverlayFS
...
Close #25409
Update #10180
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: aab101a770a88cdbde5012dc7eb5b4439cf57192
Component: engine
2016-08-16 02:13:33 +00:00
Yong Tang
b791b365ab
Suppress verbose "Sending build context" messages in non tty scenarios
...
This fix tries to address the issue raised in 25661 where verbose
"Sending build context" messages were not suppressed in non tty (e.g. log file)
sencarios.
This fix suppress the "Sending build context" message (other than the last one)
if the output is not a tty. The last update of the "Sending build context"
message is still sent to the output.
This fix has been tested manually:
```
docker build -t tmp . > build.log
```
The output is (only one "Sending build context"):
```
Sending build context to Docker daemon 249.4 MB
Step 1 : FROM busybox
---> 2b8fd9751c4c
Step 2 : RUN echo 'test'
---> Using cache
---> 7db298b6c493
Successfully built 7db298b6c493
```
This fix fixes 25661.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: b4ba575a2882953781616b6bb273419e829fb791
Component: engine
2016-08-15 18:35:05 -07:00
Victor Vieux
499e132407
check plugin manifest is correctly formatted before push
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: b47711ae92619f04e070b284f47e203c79640d9e
Component: engine
2016-08-15 17:51:30 -07:00
Tõnis Tiigi
835c0328ea
Merge pull request #25723 from anusha-ragunathan/plugin-force-rm
...
When handling plugin exit, lookup plugins only during daemon shutdown.
Upstream-commit: 70f843f7ae5a302453f5d64087f366053b1d4e27
Component: engine
2016-08-15 16:30:37 -07:00
Michael Crosby
9817f32c22
Merge pull request #25676 from tiborvass/fix-rpm-release-script
...
release-rpm: fix bad destination paths for rpms
Upstream-commit: c67cc60713245f101240279a1ff539f96d8942ca
Component: engine
2016-08-15 16:23:25 -07:00
Anusha Ragunathan
be73319004
When handling plugin exit, lookup plugins only during daemon shutdown.
...
The main intent of handling plugin exit is for graceful shutdown
of plugins during daemon shutdown. So avoid plugin lookup during
plugin exits caused by other reasons (eg. force remove)
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 57499fa62e697ea244455c5abda7ed8bc022f44c
Component: engine
2016-08-15 14:46:02 -07:00
Tõnis Tiigi
07a4c41b9a
Merge pull request #25482 from yuexiao-wang/close_pipe
...
Close pipe after using pipe
Upstream-commit: 90be7a591de1f30332827a003edc39065fb8e4a7
Component: engine
2016-08-15 13:02:59 -07:00
Sebastiaan van Stijn
fe5ecb2397
Merge pull request #25706 from thaJeztah/add-authorization-header-to-api-docs
...
Add X-Registry-Auth header to service API docs
Upstream-commit: 9079d5ccbb040363a89c87d87eac693575848c80
Component: engine
2016-08-15 21:54:06 +02:00
Vincent Demeester
bc8ce674ae
Merge pull request #25715 from thaJeztah/update-changelog-for-userland-proxy-binary
...
Add note about new binaries to changelog
Upstream-commit: a5809ddd2a7bce47da937401829713448329ffbf
Component: engine
2016-08-15 21:48:21 +02:00
Sebastiaan van Stijn
fba4d062dd
Merge pull request #25707 from thaJeztah/move-sysctls-to-correct-api-version
...
Move sysctls to correct API version
Upstream-commit: 4105cff4d8d5bb55661944286ceee03f9c5c36ee
Component: engine
2016-08-15 20:29:51 +02:00
Sebastiaan van Stijn
d3c1040e86
Merge pull request #25710 from thaJeztah/restore-missing-ps-example
...
Restore missing ps example for killed containers
Upstream-commit: 0f838cc5230c12f073095bf537ec896e95d1f631
Component: engine
2016-08-15 16:02:16 +02:00
Brian Goff
fc75fb9bbd
Merge pull request #25700 from lixiaobing10051267/masterSwarmRmService
...
command "docker service remove" not consistent
Upstream-commit: bfc3f121f10f0dd17833ee1f2d8ccd8b7dcafa5f
Component: engine
2016-08-15 09:55:52 -04:00
Sebastiaan van Stijn
2741796f6e
Merge pull request #25712 from thaJeztah/carry-25613-fix-capitalization
...
Fix capitalization
Upstream-commit: 2806b3b6c76ba3bee090e129a26bcad40d565582
Component: engine
2016-08-15 15:53:36 +02:00
Sebastiaan van Stijn
a4290a9192
Add note about new binaries to changelog
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 32b8a6e735ef674e1ea2415915e41531bcd4a9c8
Component: engine
2016-08-15 15:23:14 +02:00
Sebastiaan van Stijn
bb8ea42967
Fix capitalization
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 75e60fbe09f6065ed095671f98713d862c466858
Component: engine
2016-08-15 14:14:41 +02:00
Sebastiaan van Stijn
0e20dbce72
Restore missing ps example for killed containers
...
This example was added in b0b2f979c7c43e2975d5e39340c168da2da42d1d,
but got lost during splitting up the cli.md docs into separate files;
561bfb268de3c674b04d48895b7e46ae890ef795
This restores the missing example.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8d5818a6931db9d0acd4a6663815cd317da1bb6b
Component: engine
2016-08-15 13:41:18 +02:00
Sebastiaan van Stijn
6cf3b48c91
Move sysctls to correct API version
...
Commit 067b510dfc5b90a1d7712c89e857b6dafb184f24 move the
sysctls feature to the right API version, but
missed this one.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7cdd693d5d2094f73383145eb74d81c6b9bb9b24
Component: engine
2016-08-15 12:02:54 +02:00
Sebastiaan van Stijn
83afa41419
Add X-Registry-Auth header to service API docs
...
The service create/update endpoints support
passing registry-authentication information,
but this was not documented.
This adds the missing information about passing
a X-Registry-Auth header.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bde35ef18a408a297b960c439dc029cfb5e15464
Component: engine
2016-08-15 11:53:12 +02:00
lixiaobing10051267
9716ade879
command "docker service remove" not insistant
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 078e2aa1571ad402f0a9599e6fac2286a3d35f54
Component: engine
2016-08-15 15:11:37 +08:00
Tõnis Tiigi
b690241f76
Merge pull request #25675 from DieterReuter/master
...
Fix build deb for ARMv6
Upstream-commit: 5ac0342e8282783531b61140b09268ff0d03f37e
Component: engine
2016-08-13 10:16:29 -07:00
Sebastiaan van Stijn
b19d897878
Merge pull request #25678 from tonistiigi/clear-wal
...
Clear raft state file after every test
Upstream-commit: 856fa571d00a9d3fb9a08f579c5e3763f19753ea
Component: engine
2016-08-13 17:44:56 +02:00
Dieter Reuter
dd0ee03026
Improve systemd config for Raspbian
...
Signed-off-by: Dieter Reuter <dieter.reuter@me.com >
Upstream-commit: 3c7ae431e08af7a53ebfe4fbb2eaf279fb3993b6
Component: engine
2016-08-13 16:29:06 +02:00
Vincent Demeester
a38eb5f864
Merge pull request #25677 from friism/tweak-logout-message
...
tweak logout message
Upstream-commit: 28c20592b62c9483e787f58ea6aca65420169512
Component: engine
2016-08-13 09:37:56 +02:00
Vincent Demeester
64adc1d87d
Merge pull request #25673 from SvenDowideit/remove-dead-link
...
James' site has been dead for a while - removing links
Upstream-commit: 7fddf51aa4e71ca7b0a08df2a960d8b220703f0e
Component: engine
2016-08-13 09:35:04 +02:00
Tonis Tiigi
9a71475504
Clear raft state file after every test
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 34f779dbc34fc391a86398521ad5c7ec84a0382d
Component: engine
2016-08-12 17:30:37 -07:00
Michael Friis
1f63571025
tweak logout message
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: f9443aa2a529553ad0c3227c00980b0e83d457ad
Component: engine
2016-08-12 17:00:06 -07:00
Tibor Vass
a8ef6a6a87
release-rpm: fix bad destination paths for rpms
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: e1c7ad871f6fd41a7682cf7effb02838ab679ae3
Component: engine
2016-08-12 16:51:12 -07:00
Michael Crosby
b496a6d286
Merge pull request #24311 from ShevYan/incorrect-comments-in-dockerfile
...
Dockerfile's comments for "Run the test suite" are out of date becaus…
Upstream-commit: 2faeebc7504acd257200ce26470d3037448ae952
Component: engine
2016-08-12 15:53:06 -07:00
Dieter Reuter
6b981f5f41
Fix build deb for ARMv6
...
Signed-off-by: Dieter Reuter <dieter.reuter@me.com >
Upstream-commit: 5907e4a872c7d586ab594972fa24bf4fa4e83207
Component: engine
2016-08-13 00:40:29 +02:00
Michael Crosby
c5ce25f56a
Merge pull request #23116 from glensc/mkimage-pld
...
add script to make base image for PLD Linux
Upstream-commit: 05d1dcfca25d534294cb42ffcdd7bedaeaa06ee7
Component: engine
2016-08-12 15:38:36 -07:00
Charles Smith
299e83ea78
Merge pull request #25420 from sfsmithcha/add_networking_guide
...
per @mavenugo , merging after addressing comments
add overlay networking guide
Upstream-commit: 84ef31a79cad9c4ed55ff57048394f01d7c43301
Component: engine
2016-08-12 15:29:34 -07:00
Charles Smith
a863701de5
add overlay networking guide
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: e56dd0e0e7d2eb921390c7aaff091b8b613c4c6b
Component: engine
2016-08-12 15:18:21 -07:00
Michael Crosby
506f438662
Merge pull request #25216 from aanand/deploy-error-when-not-in-swarm-mode
...
Better error on 'docker deploy' when not in Swarm mode
Upstream-commit: 2a10899c16416ce4802c11ed14db80f803595b24
Component: engine
2016-08-12 14:17:47 -07:00
Sven Dowideit
0fd4a2c993
James' site has been dead for a while - removing links
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: a9b08f3102e946df44337deb65c99b41570754d1
Component: engine
2016-08-12 21:16:57 +00:00
Charles Smith
b2db7ba5cf
Merge pull request #25135 from sfsmithcha/add_overlay_networking_note
...
per @mavenugo , merging after addressing his comments:
add swarm mode overlay networking security model
Upstream-commit: ccf3dd85f04529137ee5bdd76608f0f292b5c7d3
Component: engine
2016-08-12 13:25:07 -07:00
Charles Smith
44701ad93a
add overlay networking security model node
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: cc5debcb2e8621358721eb860c07f33f8b83d684
Component: engine
2016-08-12 13:17:24 -07:00
Brian Goff
51e7a5bb32
Merge pull request #25669 from dlech/patch-2
...
Move export from image commands to container commands
Upstream-commit: 838db8852cb58e4990c655f09d5b7c50cc5396a6
Component: engine
2016-08-12 15:52:07 -04:00
Brian Goff
05ad7877f1
Merge pull request #24814 from samuelkarp/awslogs
...
awslogs: Record log line insert order for sorting
Upstream-commit: c6e3818dd11a19b8385e62ed244c0c4e4e75fc89
Component: engine
2016-08-12 15:51:06 -04:00