Commit Graph
30893 Commits
Author SHA1 Message Date
Aaron Lehmann 55259ac6bb Merge pull request #30834 from allencloud/refactor-daemon-cluster-handler-and-helper
refactor cluster/helper.go and split cluster.go into multiple files
Upstream-commit: b8a3595941bd9037e2470519aab142262a0e7c49
Component: engine
2017-02-13 11:31:30 -08:00
Kenfe-Mickaël Laventure b39f983793 Merge pull request #30823 from albers/completion-plugin-upgrade
Add bash completion for `docker plugin upgrade`
Upstream-commit: c9fa3eed1b38cc3056107ab2d1572f829a513062
Component: engine
2017-02-13 11:09:21 -08:00
Alexander Morozov 3bb0888796 Merge pull request #30980 from albers/completion-mode-non-blocking
Fix bash completion for `--log-opt mode`
Upstream-commit: ca3f82752cbead992989478c2536ef94d1ff87e4
Component: engine
2017-02-13 11:00:27 -08:00
Vincent Demeester 4ace6bef34 Merge pull request #29864 from tianon/schemaVersion-2
Update "download-frozen-image-v2.sh" for schemaVersion 2
Upstream-commit: 5870675ebc0db9fbe07736a59a6226b805ba00dc
Component: engine
2017-02-13 19:53:19 +01:00
Brian Goff 8d76b7f3ac Merge pull request #30970 from cmehay/install
Force copy on make install to avoid Text file busy error
Upstream-commit: 6fb658eaed567666579669987e2fc4bdfd9e6494
Component: engine
2017-02-13 13:49:46 -05:00
Harald Albers ee4c3e683f Add bash completion for docker plugin upgrade
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2c52ec8403d721e567a7c3c129fc38c650b85ba4
Component: engine
2017-02-13 19:36:54 +01:00
Harald Albers 9952e41458 Fix bash completion for --log-opt mode
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1fdb54eaf353f78f3657703c07e71f411f3720b7
Component: engine
2017-02-13 18:49:37 +01:00
Alexander Morozov 6affde1e32 Merge pull request #29673 from vdemeester/extract-daemon-config
Extract daemon configuration and discovery to their own package
Upstream-commit: f3a8886d8890d6797a568ab316baf9400ee2e1e1
Component: engine
2017-02-13 09:11:13 -08:00
Brian Goff 5e49c7739c Merge pull request #30851 from chchliang/networktest
add testcase check connect.EndpointConfig not nil
Upstream-commit: 019eb5d71f7ebe89c5900df6e3219354dd3ceb01
Component: engine
2017-02-13 10:58:02 -05:00
Brian Goff bda128282d Merge pull request #30948 from sdurrheimer/zsh-completion-service-format
Add zsh completion for 'docker {service ls,stack services} --format'
Upstream-commit: 9ec42d4c3cfe5e5289fc321709a823ecfc8e7144
Component: engine
2017-02-13 09:57:15 -05:00
Brian Goff 1cd5a69df3 Merge pull request #30949 from sdurrheimer/zsh-completion-ps-ports-filter
Add zsh completion for 'docker {ps,service ls} --filter expose|publish'
Upstream-commit: ae190da1d2f2758f2162ac69cd23806a6d48a37a
Component: engine
2017-02-13 09:44:46 -05:00
Brian Goff 76a1182bf2 Merge pull request #30947 from sdurrheimer/zsh-completion-daemon-default-shm-size
Add zsh completion for 'dockerd --default-shm-size'
Upstream-commit: 6ab2220043f173a8ac01cc0492ea40022cc6053a
Component: engine
2017-02-13 09:34:42 -05:00
Brian Goff df3858634b Merge pull request #30944 from sdurrheimer/zsh-completion-build-squash
Add zsh completion for 'docker build --squash'
Upstream-commit: 0d9bb4ee125d5051a1db9d8afa0dc03d81d840a9
Component: engine
2017-02-13 09:33:39 -05:00
Christophe Mehay f31ca9220e Force copy on make install to avoid Text file busy error
Signed-off-by: Christophe Mehay <cmehay@online.net>
Upstream-commit: 01273ad85f334ff0ae141cfa8ab0e52ca895fd3d
Component: engine
2017-02-13 14:17:06 +01:00
Vincent Demeester d60e30c4e4 Merge pull request #30871 from allencloud/split-swarm-test-into-multiple-files
split docker_api_swarm_test.go into multiple files
Upstream-commit: a11e3bd5f943bbefecec3613a6e919b827adf05d
Component: engine
2017-02-13 11:42:25 +01:00
Sebastiaan van Stijn 0b67975de7 Merge pull request #30965 from YuPengZTE/devDes
fix typo
Upstream-commit: a8f4d82176139babcd818fcb4590eec22860ffc9
Component: engine
2017-02-13 00:02:28 -08:00
yupengzte 4d0e710fd3 fix typo
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: 266107f301b8d470f6ff67da41960fccf9e1a4ba
Component: engine
2017-02-13 15:47:38 +08:00
Sebastiaan van Stijn 83500fc7d6 Merge pull request #30956 from yongtang/02122017-deprecated-login-email-removal
Add missing link in deprecated.md
Upstream-commit: b5b6752230b77902536bab28403426c30d6f6ce0
Component: engine
2017-02-12 23:37:37 -08:00
Sebastiaan van Stijn af3282f0f9 Merge pull request #30940 from sdurrheimer/zsh-completion-swarm-unlock-cmds
Add zsh completion for 'docker swarm unlock|unlock-key' commands
Upstream-commit: 27ab0086263986033bde45d0c48423408cd653ea
Component: engine
2017-02-12 23:35:46 -08:00
Sebastiaan van Stijn 24325b22dd Merge pull request #30960 from allencloud/remove-redundant-colon
remove redundant colon introduced by mistake
Upstream-commit: db68291dabe402428c25bfab72b4f580692d8c4a
Component: engine
2017-02-12 18:22:32 -08:00
allencloud 877717c8a7 remove redundant colon introduced by mistake
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: df64bc3ed0e315a1064937d1a3ad6d0f324b11c8
Component: engine
2017-02-13 10:16:57 +08:00
Yong Tang b0073b9ee0 Add missing link in deprecated.md
This fix adds a missing link in deprecated.md
```
Deprecated In Release: [v1.13.0]...
```

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: ee65dd0286b2e3d5d5b3a61c24972b962363c0de
Component: engine
2017-02-12 15:15:52 -08:00
Vincent Demeester 96d98e23ed Merge pull request #30900 from YuPengZTE/devPublisedPort
Add "=" before the value of PublishedPort
Upstream-commit: c110abfa9f4c1ec33dc223570fad50c5f6afc00d
Component: engine
2017-02-12 21:56:43 +01:00
Vincent Demeester 148ba17651 Merge pull request #30939 from sdurrheimer/zsh-completion-swarm-init-update
Add zsh completion for missing 'docker swarm init|update' options
Upstream-commit: 5d47cb901b90953e8e85bac4b66ff8fb0af04d07
Component: engine
2017-02-12 21:49:00 +01:00
Steve Durrheimer ef55c9e78c Add zsh completion for 'docker {ps,service ls} --filter expose|publish'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ac5608093088aef34aa1edc2eb7b5b351bd2ce78
Component: engine
2017-02-12 21:24:13 +01:00
Steve Durrheimer 5c8b540ba0 Add zsh completion for 'docker {service ls,stack services} --format'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 8afb7f035de7f13aefc0548d33f37ed8735c3545
Component: engine
2017-02-12 21:17:00 +01:00
Steve Durrheimer a470ff2f53 Add zsh completion for 'dockerd --default-shm-size'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 1c387303af66a7bcef580f399ea06c30c9357d44
Component: engine
2017-02-12 21:10:37 +01:00
Steve Durrheimer 0f63ede0ab Add zsh completion for 'docker build --squash'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 5b3f5f97f2bfd76a61f01adebd66ae9d9e2ca19d
Component: engine
2017-02-12 20:11:13 +01:00
Steve Durrheimer 195563bec5 Add zsh completion for 'docker swarm unlock|unlock-key' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: e9a10ef4adedd380f2556329dd0d0b5bf06aa0a5
Component: engine
2017-02-12 17:44:17 +01:00
Steve Durrheimer 3963cf1336 Add zsh completion for missing 'docker swarm init|update' options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: e31a6f278b48b61f70fe9816e0bc21770247b2c7
Component: engine
2017-02-12 17:31:32 +01:00
Sebastiaan van Stijn ab0b74a271 Merge pull request #30886 from vieux/bring_back_changelog
add 1.13.x CHANGELOG to master
Upstream-commit: 58152530ccaa856bfea9d28fb8221eb76ca83dda
Component: engine
2017-02-11 18:19:00 -08:00
Sebastiaan van Stijn a4e64b5e9f Merge pull request #30476 from yongtang/30447-port-config-long-syntax
Support expanded syntax of ports in `docker stack deploy`
Upstream-commit: e5066ef66637967dd0e433daaca5d8f957f4c022
Component: engine
2017-02-11 11:13:54 -08:00
allencloud fe42bb3c56 create a new file swarm.go and move swarm part code from cluster.go into swarm.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 75a315d43e2577768ba5e0ef071ed9631e43ce8b
Component: engine
2017-02-12 02:54:07 +08:00
allencloud 5257b3c3b3 create a new file networks.go and move network part codes from cluster.go into networks.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 4f4151bba4eac6b6e4b47a922346fbf66120a057
Component: engine
2017-02-12 02:50:17 +08:00
allencloud 767050f4bc create a new file task.go and move task part codes from cluster.go into tasks.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 6be675c752ac511c7397fef5928af7dfda13a234
Component: engine
2017-02-12 02:45:00 +08:00
allencloud b538436290 create a new file services.go and move service part codes from cluster.go into services.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 6ff14b48c789fa9cad050b039b08f52491955ce2
Component: engine
2017-02-12 02:43:23 +08:00
allencloud 6c9be69cc1 create a new file nodes.go and move node part codes from cluster.go into nodes.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 7591e313a4799074cee45dab43f40b583a959abb
Component: engine
2017-02-12 02:36:09 +08:00
allencloud 31a98bbb56 refactor helper.go and move getSecret to helper.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: b6fb3a56dca43f33ddbb0b38a0fc0596c8c80b46
Component: engine
2017-02-12 02:30:53 +08:00
Akihiro Suda 15ed05f7fc Merge pull request #30905 from allencloud/remove-redudant-code-in-unlock-and-better-error-msg
remove redundant code and better error msg
Upstream-commit: 9a6ebf08e75c35a2041a18bcc6e0883021dc65b5
Component: engine
2017-02-11 20:13:31 +09:00
allencloud fee80945cc remove redundant code and better error msg
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 5c0ea56d56065ee737557650fa797a61f52e8378
Component: engine
2017-02-11 09:22:07 +08:00
Sebastiaan van Stijn fde87ec134 Merge pull request #30889 from aaronlehmann/addreference-tag-digest
reference: Handle combination of tag and digest in AddReference
Upstream-commit: 584e399d9632200e6c8a636339c8aa6347a57fca
Component: engine
2017-02-10 13:27:12 -08:00
Brian Goff 229ad1c063 Merge pull request #30903 from allencloud/remove-unused-headers-in-secret-create
remove unused headers in secret_create.go
Upstream-commit: be6481041df951e75d079fde68fd8536c309dab2
Component: engine
2017-02-10 14:10:31 -05:00
Sebastiaan van Stijn a0d5e6c8ea Merge pull request #30839 from yongtang/02082017-swarmkit-update
Update SwarmKit to ed384f3b3957f65e3111bd020f9815f3d4296fa2
Upstream-commit: 1eb284133451a85725d51935572267b6e83bd339
Component: engine
2017-02-10 10:14:30 -08:00
Brian Goff cee0fd1068 Merge pull request #30901 from xulike666/fight-for-readability
Fix some easy typos in cmd/* :D
Upstream-commit: 69be892c9d417a32d94235d0b111699c7df4d4ed
Component: engine
2017-02-10 13:09:25 -05:00
Misty Stanley-Jones 796599868e Merge pull request #29559 from mstanleyjones/define_bridge
Define bridge networks
Upstream-commit: c621fbce04ec845d5f9254bc59b11dfe06fff0e0
Component: engine
2017-02-10 09:25:29 -08:00
allencloud 434f430a26 split docker_api_swarm_test.go into multiple files
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 69afd30444e87b3d0c4fe1ed4079466f629b0c33
Component: engine
2017-02-11 00:18:01 +08:00
allencloud 46de6776e3 remove unused headers in secret_create.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 31d9ce6f5c6afed4d76ee70533871944b754e869
Component: engine
2017-02-11 00:16:48 +08:00
Brian Goff 355bed80d8 Merge pull request #30896 from Microsoft/jjh/emitcommit
Windows: make.ps1 emit commit ID
Upstream-commit: bade08a0637faebda4642cbe03185a461830cbff
Component: engine
2017-02-10 09:56:02 -05:00
Justin Cormack dad963ca8c Merge pull request #30893 from Microsoft/jjh/disabletesttemporarily
Windows: Temporarily disable TestBuildLastModified
Upstream-commit: eaffb3099a4ed2701fc0934b39b7dcdd1ca62219
Component: engine
2017-02-10 11:38:56 +00:00
Victor Vieux 1b40ee8f6b Merge pull request #30885 from vieux/restore_join_token
print 'worker' join token after swarm init
Upstream-commit: b847fe563af6c00531b08e00a9b44e6b43cb9bd9
Component: engine
2017-02-10 00:12:06 -08:00