fc5500f19e
Merge pull request #26697 from allencloud/change-service-scale-logic
...
validate service parameter in client side to avoid api call in `docker service scale`
Upstream-commit: 4fabc92cfc0670851851ebfb0f12d037059e6be1
Component: engine
2016-09-30 18:37:35 +02:00
0ffd096b11
Merge pull request #27059 from yongtang/26964-docs-service-ps-filter-misc
...
Update docs for node filter of `docker service ps`
Upstream-commit: c9a0dda586481ec7acdeec36497ba726475059ad
Component: engine
2016-09-30 16:15:49 +02:00
3f16b8db80
Update docs for node filter of docker service ps
...
As is specified in 26964, it is possible to specify
a filter based on the node name or node ID.
This fix updates the related docs for that.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: c326e0afe39d19a789f0819cb3d81259167a762f
Component: engine
2016-09-30 05:37:14 -07:00
200598ef34
Merge pull request #26994 from Microsoft/jjh/fix26461regression
...
Windows: Don't set PATH/TERM on exec
Upstream-commit: 1d669d82c1d5691f9706112acdbe4f70812cf6aa
Component: engine
2016-09-29 13:34:12 -07:00
12eed3d798
Merge pull request #27036 from mstanleyjones/fix_labels_nav
...
Fix menu position of the labels-custom-metadata.md topic
Upstream-commit: a3286783bcfbfd6e58d16e1b189138580b08facc
Component: engine
2016-09-29 11:04:46 -07:00
1b063e8490
Fix menu position of the labels-custom-metadata.md topic
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 9e012210484b3adda78e872bb45c54956d108c13
Component: engine
2016-09-29 10:51:08 -07:00
e521f9c3b8
Merge pull request #27031 from mstanleyjones/fix_broken_image_link
...
Revert "Add direct link to event chart image"
Upstream-commit: 6f07a4a69b17d6a1bf902a5ec30ad046645e9c23
Component: engine
2016-09-29 19:21:30 +02:00
54d60e9c2d
Revert "Add direct link to event chart image"
...
This reverts commit 86de72fef244b3fe209e5793deb40fb26f5b318e.
The link seems malformed and is breaking the overall docs build.
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 23207def7c4a390fe3549f467413c187cc146fee
Component: engine
2016-09-29 10:16:41 -07:00
a3bb730c44
Merge pull request #24411 from vdemeester/24393-ps-filter-managed
...
Add a new "is-task" ps filter
Upstream-commit: b6ad6d98fd5037c44cc38d000e5a35bd808bff7d
Component: engine
2016-09-29 18:54:15 +02:00
f5d10e642f
Merge pull request #27007 from allencloud/better-node-inspect-pretty
...
add \n in engine labels display in docker node inspect xxx --pretty
Upstream-commit: c29eee6e20b7818e8abf749fe57c46fa3d865f94
Component: engine
2016-09-29 09:53:59 -07:00
e79106b452
Merge pull request #27024 from LK4D4/fix_servic_healthtest
...
integration: wait for task running in TestServiceHealthRun
Upstream-commit: 5bfe493d93239d20c37695ae4df532a1f8ae16b1
Component: engine
2016-09-29 09:53:02 -07:00
3fec85512c
integration: wait for task running in TestServiceHealthRun
...
Test can miss Starting state, so wait until its Running
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 2de05de98dc096de9e774aa5b520ab8f6862de0c
Component: engine
2016-09-29 07:44:00 -07:00
8493b1e3af
add \n in engine labels display in docker node inspect xxx --pretty
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: ddec4c3ee4e51cb62060f752777bdd32e86607e3
Component: engine
2016-09-29 18:17:54 +08:00
3e0303bb32
Merge pull request #27001 from mstanleyjones/fix_broken_build
...
Fix link to non-existent file
Upstream-commit: ad398f132ba9708cf4a7a60ef5a4e7f5b566b000
Component: engine
2016-09-29 08:39:26 +02:00
cd2885f204
Merge pull request #26999 from andrewhsu/test-exit-code-125
...
integration test for missing arg error code
Upstream-commit: bc0465d2bec1dbb47ffb0d77a16cd3f9d2c7237c
Component: engine
2016-09-29 08:38:19 +02:00
3f1e962107
Fix link to non-existent file
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: ca04f02d7655e7306c7c0cde6fa1895a14f0a673
Component: engine
2016-09-28 20:34:26 -07:00
aa6c254ed2
integration test for missing arg error code
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 64b5fe76cff87784124a3d2d824d99ec9ce3b5c2
Component: engine
2016-09-28 16:33:45 -07:00
c01ac0b550
Windows: Don't set PATH/TERM on exec
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e880bbc48bd94762489a9948814d3edea39fdcfa
Component: engine
2016-09-28 13:42:27 -07:00
ac8256a95d
Merge pull request #26972 from allencloud/clear-health-monitor-log
...
make health check log more readable
Upstream-commit: 601004e1a714d77d3a43e957b8ae8adbc867b280
Component: engine
2016-09-28 14:22:43 +02:00
8a19fb43a4
Merge pull request #26941 from runcom/docker-init-path-1
...
configure docker-init binary path
Upstream-commit: 9f0593990f6d8ac95a5dde312e0b7401b472cfb9
Component: engine
2016-09-28 13:12:59 +02:00
48a609d72c
Add a new "is-task" ps filter
...
This makes it easier to list containers that are part of a task
(swarm mode) and those who are not.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5280ba83e55b94b9d4973a15381e18eb10920233
Component: engine
2016-09-28 12:45:30 +02:00
f6b8936533
Merge pull request #24850 from yongtang/24270-service-tasks-filter
...
Fix partial/full filter issue in `service tasks --filter`
Upstream-commit: b0e1b8fc79af0baf5d90329254aacbdfb4188bfc
Component: engine
2016-09-28 11:50:27 +02:00
a7102311d0
make health check log more readable
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: a4a4f3733f18053269293d6f2e56767c564940d3
Component: engine
2016-09-28 14:10:15 +08:00
d295583beb
Update docs for service ps
...
This fix updates docs for `service ps` as now the TASK ID part has been
removed.
Also, this fix fixes several incorrect sample output.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 880a5f565fb33b445977bb2ded0fc375edee0c40
Component: engine
2016-09-27 19:12:48 -07:00
66d6bcea36
Merge pull request #26951 from AkihiroSuda/update-ut-cli-command-service
...
Fix cli/command/service/opts_test.go, and add some extra test cases
Upstream-commit: 9a2f01ef13e4bb54813aa548c2d44a8e3bafecd2
Component: engine
2016-09-27 20:30:26 -04:00
048d1e7728
Merge pull request #26931 from thaJeztah/fix-aux-address-example
...
Fix incorrect aux-address examples and test
Upstream-commit: bab64af2ad0d6f5e7c1e9d54b2f6d93096f7b99f
Component: engine
2016-09-27 17:06:01 -07:00
10fe66aea1
Merge pull request #26963 from londoncalling/docs-swarm-d4mac-d4win
...
added better Docker Machine links to Swarm tutorial d4mac, d4win, cop…
Upstream-commit: 456e6fe4aa9804b278e136a395d5d4b6dd766763
Component: engine
2016-09-27 14:59:26 -07:00
95fdcb0f29
added better Docker Machine links to Swarm tutorial d4mac, d4win, copyedits
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 0a76a4cb5bdb83c1c62832d084ae47a0c50646bc
Component: engine
2016-09-27 14:21:17 -07:00
393b93c599
Merge pull request #26957 from dnephin/add_more_areas
...
Add area/bundles to the list of area labels
Upstream-commit: 784b601bbd432c710db1a6205b5ac712812dbab5
Component: engine
2016-09-27 22:01:51 +02:00
e2b3c90bc3
Merge pull request #26955 from albers/completion-fix-logs--since
...
Fix bash completion for `docker logs --since`
Upstream-commit: e8dc339d43e3bccf48a90ef14ac5e6f05f72a478
Component: engine
2016-09-27 20:06:40 +02:00
63b81800ef
Add area/bundles tothe list of area labels.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b94d429f19b900850c3c4a91083d87dc190d4b98
Component: engine
2016-09-27 13:18:53 -04:00
09c1674077
Merge pull request #26952 from andrewhsu/cherry-pick-flags
...
Specify git cherry-pick flags for release process.
Upstream-commit: 95030c26e41d8120d00ce44299599c27ef7b1de2
Component: engine
2016-09-27 10:08:01 -07:00
9c391e0cdf
Fix bash completion for docker logs --since
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 0e2244352a79f5d23cf874d72b6abed9be2da9f8
Component: engine
2016-09-27 18:58:48 +02:00
be83d1256c
Merge pull request #26074 from allencloud/return-err-when-remove-container-in-progress
...
make client side know container removal in progress
Upstream-commit: 97d4b9c46528c2d263a448658a6cf78ffd943075
Component: engine
2016-09-27 18:48:03 +02:00
4ab44ced86
Merge pull request #26255 from Microsoft/jjh/xenon-test-infrastructure
...
Add isolation to info - enables Hyper-V containers CI bring-up
Upstream-commit: b881148385685f3c538a3a085207bfdf30ae9213
Component: engine
2016-09-27 18:46:51 +02:00
0b8cdf7c7b
Merge pull request #26047 from allencloud/mv-mcvlan-out-of-experimental-docs
...
move macvlan out of experimental docs
Upstream-commit: 64fca3486082cfd59aac32d2cfd9e07b6f62a112
Component: engine
2016-09-27 18:45:00 +02:00
cc821d1b32
Merge pull request #26906 from allencloud/add-endpoint-mode-in-service-pretty
...
add endpoint mode in service pretty
Upstream-commit: c505486bb195a3a413bacff7cfdee8d6931d529f
Component: engine
2016-09-27 18:28:43 +02:00
db124038c0
Specify git cherry-pick flags for release process.
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 6d470bb715d071cc91e51bb857099d0d90182ce2
Component: engine
2016-09-27 09:03:20 -07:00
9cd15b6f6f
Fix cli/command/service/opts_test.go, and add some extra test cases
...
`m.Set("type=volume,target=/foo,volume-nocopy")` is valid even though it lacks "source"
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 4e01e7924da92c94faf675cbf35b01985c3cd999
Component: engine
2016-09-27 15:27:02 +00:00
0cc382f1ee
Merge pull request #26920 from tophj-ibm/add-1404-make-debs
...
ppc64le: add files for supporting 14.04 'make debs'
Upstream-commit: 1dbf3c65e15a2d021cc15ded9caaf6192d58970b
Component: engine
2016-09-27 07:54:57 -07:00
fa6f37076c
Merge pull request #26898 from YuPengZTE/devErrorsNew
...
In error, the first letter is low-case letter
Upstream-commit: c2f57291ac04a1d582d7fcdedda7b1ad707543d5
Component: engine
2016-09-27 10:10:57 -04:00
c784282cca
Merge pull request #25697 from yongtang/24958-swarm-init-cluster-defaults
...
Let swarmkit to handle cluster defaults in `swarm init` if not specified
Upstream-commit: 6e5d5baaed595c654cd3afa04ee3a0c1c6b84fd8
Component: engine
2016-09-27 15:36:03 +02:00
195692ee1c
configure docker-init binary path
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 6a12685bb7eaa5744c5a115ffe12f3a4d80093bb
Component: engine
2016-09-27 14:49:17 +02:00
562ec15f92
Let swarmkit handle cluster defaults in swarm init if not specified
...
This fix tries to address the issue raised in 24958 where previously
`docker swarm init` will automatically fill in all the default value
(instead of letting swarmkit to handle the default).
This fix update the `swarm init` so that initial value are passed only
when a flag change has been detected.
This fix fixes 24958.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: eb19c2f080f624d8b0186f8037cdc1f7d8ada402
Component: engine
2016-09-27 04:19:38 -07:00
0218ffcf08
Merge pull request #26921 from tophj-ibm/bump-remaining-go-versions-to-1.7.1
...
Bump remaining Dockerfile go versions to 1.7.1
Upstream-commit: 789e6868904d724ed56fe4b141b4b557f477f1ca
Component: engine
2016-09-27 11:51:56 +01:00
99ee0aae26
add endpoint mode in service pretty
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 70bb832060ae1a0525a34145f85e68e0da78fcb9
Component: engine
2016-09-27 18:41:19 +08:00
672761b64e
make client side know container removal in progress
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 9a58f298d182945eb2b820e5e3539b754fdaa751
Component: engine
2016-09-27 18:06:54 +08:00
67175b8b48
Merge pull request #24634 from thaJeztah/make-network-name-required
...
API return network-list if no network-name or id is provided
Upstream-commit: b826bebda0cff2cc2d3083b954c810d2889eefe5
Component: engine
2016-09-27 10:20:38 +02:00
ada47b1174
Revendor swarmkit to b79d41fa99c137181d8f58ef76a6e8a25bc2e72f
...
This commit updates swarmkit to b79d41fa99c137181d8f58ef76a6e8a25bc2e72f
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 8f4afb86eeb7f3f4a26eec51e4b843e1714f9f46
Component: engine
2016-09-26 23:48:16 -07:00
ebdbeeeb36
In error, the first letter is low-case letter
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: 110ab746ba50e9febcdd246671f258036c71e59a
Component: engine
2016-09-27 10:40:07 +08:00
