4456d0fe38
Merge pull request #28940 from tophj-ibm/ppc64le-add-httpredir
...
[ppc64le] allow replacing httpredir in dockerfile
Upstream-commit: 8c53567720ab63032e563e5f7fe4e356e94b643c
Component: engine
2016-11-29 23:29:40 +01:00
cb6219042e
Use GetByName to check for collision before create any context in plugin creation
...
This fix is a follow up to the comment:
https://github.com/docker/docker/pull/28717#discussion_r90040589
Currently, the collision checking is done at the last step `Add()` of
plugin creation. However, at this stage the context such as plugin
directories have already been creation. In case of name collision,
rollback is needed which could be expensive.
This fix performs the check at the beginning of CreateFromContext using
GetByName. In this way, collision fails fast and no context creation
or rollback is needed.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 52405a9b5896fd1c3ea6d8b1ca1c70e5979e3271
Component: engine
2016-11-29 14:18:01 -08:00
5acbd9b212
Run overlay attachable test on a single daemon
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: e42d1bb4b229b825a388490f24885f06a7afc401
Component: engine
2016-11-29 14:05:12 -08:00
c42b3b6e0f
Merge pull request #27622 from AkihiroSuda/client-set-http-header
...
client: add accessor methods for client.customHTTPHeaders
Upstream-commit: f24417466457e8846530439c3166eabb38fa8479
Component: engine
2016-11-29 22:18:47 +01:00
0a3180df6c
tarexport: check symlink error when saving layer
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 8616b0690a3ac905fc6ee06ff7524c837fcb8c92
Component: engine
2016-11-29 13:08:24 -08:00
c0fecf9b2a
Merge pull request #28721 from dongluochen/attachable_network
...
Fix network attachable option
Upstream-commit: 4fae94f6637bfbbeba809f930f2ecf1e36748882
Component: engine
2016-11-29 11:04:49 -08:00
afcc8b067c
Add more types to bash completion of docker inspect
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 1076f0882b9eccb96850db6b1bc78020ada39e50
Component: engine
2016-11-29 09:45:43 -08:00
8d868f3fc6
Merge pull request #28778 from Microsoft/jjh/volumenote
...
Windows: Note about volumes in run
Upstream-commit: 7debf456e3320f4c84c3f2b2f2a1b914ad77aa40
Component: engine
2016-11-29 17:40:54 +01:00
7517d3b3a5
Merge pull request #28717 from yongtang/28684-duplicate-docker-plugin-create
...
Fix issue caused by duplicate `docker plugin create` with same names
Upstream-commit: 82b35dd997f46ff430cb084c962089c40f5bc96a
Component: engine
2016-11-29 08:22:40 -08:00
db703b35d8
[ppc64le] allow replacing httpredir in dockerfile
...
Allows replacing of the default httpredir.debian.org in /etc/apt/sources.list
with a user-specified mirror. This will (hopefully) fix CI apt issues.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 150a519a0b267cccaacb4b8038787e2b512fe17e
Component: engine
2016-11-29 11:06:45 -05:00
17f785da28
Merge pull request #28905 from jlhawn/reject_unspecified_advertise_addr
...
Reject unspecified advertise addr on swarm init
Upstream-commit: 492bc8eb457cfbf914b762df0b584f668be4a628
Component: engine
2016-11-29 16:24:45 +01:00
c5d7f73b75
Merge pull request #28928 from miaoyq/fix-some-format-err
...
Fix some format errors
Upstream-commit: 9387ccc68370b2c62d81691940cc9f7fffa2b28a
Component: engine
2016-11-29 16:02:35 +01:00
852751f7da
Merge pull request #28935 from likel/improve-style
...
Initialize field with name
Upstream-commit: 209c6a419aac4952bef2fedc8f941130305e6e54
Component: engine
2016-11-29 15:52:13 +01:00
66227b770b
Merge pull request #28914 from aaronlehmann/cluster-object
...
cluster: Refuse swarm spec not named "default"
Upstream-commit: 82506fe9a97781c65544c6e769e974cd82b28fc2
Component: engine
2016-11-29 15:41:05 +01:00
ce99f23b28
Merge pull request #28919 from allencloud/change-secret-remove-in-cli
...
change secret remove logic in cli
Upstream-commit: 063d5679c5662c260cd7d53efc10da0a835366e0
Component: engine
2016-11-29 15:08:24 +01:00
8b9cbd5ed5
Merge pull request #28893 from anusha-ragunathan/delete_onerr
...
On plugin pull errors, delete created dirs.
Upstream-commit: c1b0f23de0953e3d36cdd3b510cf6da4ebea6f76
Component: engine
2016-11-29 14:48:27 +01:00
89bc275c16
Merge pull request #28874 from yuexiao-wang/fix-layer-typo
...
Fix some typos
Upstream-commit: 986740691fa38143d8a6ec9d65846feae6221076
Component: engine
2016-11-29 14:45:08 +01:00
bdb282b28d
Fix some typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: c8c7a3ff2112a1b17a06fc02633ed7b49a8aebf3
Component: engine
2016-11-30 03:01:32 +08:00
37d24c3652
Fix some format errors
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 71f1205269494430116e7a564ee76bfa0bfccc63
Component: engine
2016-11-29 21:45:04 +08:00
8074d9c4a5
Merge pull request #28904 from dnephin/add-volume-labels-to-deploy
...
Use namespace label on stack volumes
Upstream-commit: d5654a8e76e9dea770751d02ecfad4123cf724f4
Component: engine
2016-11-29 14:39:26 +01:00
b0adf0fb04
Merge pull request #28819 from yuexiao-wang/modify-link
...
Modify the link about config.json for docker plugin create
Upstream-commit: f06c2f230a6d849ff173f5f943ad77a9bdcacb38
Component: engine
2016-11-29 14:28:32 +01:00
bb120e07d5
Initialize field with name
...
Signed-off-by: Ke Li <kel@splunk.com >
Upstream-commit: da6944ec8747a50941c170186605c8cead517201
Component: engine
2016-11-29 19:36:56 +08:00
c0414c54e6
client: add accessor methods for client.customHTTPHeaders
...
Added two methods:
- *Client.CustomHTTPHeaders() map[string]string
- *Client.SetCustomHTTPHeaders(headers map[string]string)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: a754d89b4058d8508cf3cee29f6107b2f93f3001
Component: engine
2016-11-29 09:02:52 +00:00
871bc896d1
Fix docker save with empty timestamp of layer created time
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: e0b2c0af4d08b76311d3d57a96f3f55d55f52388
Component: engine
2016-11-29 03:58:23 -05:00
23d4c1466c
Revert "Add bash completion for docker service ps --all"
...
This reverts commit 188d2fac57d63888f08531adc46aa3349e3b4f3a.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: cee0fff9fe31da79fc45b9f7b42a2e6d1e25babe
Component: engine
2016-11-29 09:33:03 +01:00
911f8f8001
fix apparmor load profile
...
Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn >
Upstream-commit: 2ab8f2e389b4ae90d0cec6555ea5708ceca1cc3c
Component: engine
2016-11-29 15:48:38 +08:00
ad81663166
change secret remove logic in cli
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 5b93e77138f19d30245a3e0f9f8f834aa67458ec
Component: engine
2016-11-29 15:12:05 +08:00
b455703924
Merge pull request #28909 from Microsoft/jjh/moreworkdir2
...
WORKDIR set cmd
Upstream-commit: 1ef10c83c76281b55b6e790149555d4f5950409c
Component: engine
2016-11-28 20:35:21 -05:00
6eff6aab71
cluster: Refuse swarm spec not named "default"
...
If, using the API, a user submits an init request with a spec that has a
name other than "default", the engine will rename the "default" cluster
object. Some parts of swarmkit depend on having a cluster object named
"default". Reject any specs that use other names.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 9dba9e3248f8476d15242ce3ec0bf6d6d50c1a76
Component: engine
2016-11-28 17:19:29 -08:00
fbf2916db8
On plugin pull errors, delete created dirs.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 9e4234261c3e4d13f98218a97d7cc6644723e310
Component: engine
2016-11-28 16:57:27 -08:00
0e6be54ce9
Fix network attachable option.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: abcb699ad175859ee192388c001f55df5f88e8cd
Component: engine
2016-11-28 16:54:56 -08:00
1657094e13
Merge pull request #28906 from mstanleyjones/udp_port_publishing
...
Document publishing a UDP port
Upstream-commit: 66154d08882339f7be244da963b2adaae49ed556
Component: engine
2016-11-29 00:57:41 +01:00
aeaa16bae6
Merge pull request #28898 from vdemeester/fix-imagelist-retrocompat
...
Fixes ImageList to be retro-compatible with older API
Upstream-commit: 0b04f1dca23c9996ad240361ce0f59f1a96f78c6
Component: engine
2016-11-28 18:57:13 -05:00
4c2dcd5ab3
WORKDIR set cmd
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1b97bb416b8e2d4cd77544a1d714026b25d73c2f
Component: engine
2016-11-28 15:44:10 -08:00
fc0f081a42
Reject unspecified advertise addr on swarm init
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: eeac8719466dbc42de7a9919d4f549863944aa19
Component: engine
2016-11-28 15:44:06 -08:00
d5ad036021
Document publishing a UDP port
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 2178c840ba420d7d207aedae292e2e70d7198265
Component: engine
2016-11-28 15:41:56 -08:00
f10f66cfd3
Merge pull request #28897 from anusha-ragunathan/plugin_exit
...
Fix issue with plugin exit.
Upstream-commit: 584d23d8494ed07e5eb9684297eefc065ae7fedd
Component: engine
2016-11-28 15:25:27 -08:00
2ae9ad9ad5
Use namespace label on stack volumes.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4013a7c6d897051bb79982230f31279ee0c9a026
Component: engine
2016-11-28 18:02:39 -05:00
ee131d47d1
update plugin example
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
cleanup whitespace formatting
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d73f73b3654add36096def93f5736cc6a6686226
Component: engine
2016-11-28 23:44:24 +01:00
312027d8f9
Merge pull request #28776 from Microsoft/jjh/fix28775
...
Align output of docker version again
Upstream-commit: 8c2e674551fdcf7f8bd7514853e69e7363b28f56
Component: engine
2016-11-28 17:02:17 -05:00
4d8affc167
Don't resolve or pull images referenced by ID
...
If a swarm service is created using an image ID, it's useless to try to
pull this reference or resolve it to a manifest digest. Avoid doing this
when a fully qualified image ID is given.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 089842c4b47c262187b0b1a8d6d124f3faa03752
Component: engine
2016-11-28 13:53:52 -08:00
f4c6d41e59
Fixes ImageList to be retro-compatible with older API
...
Make sure current client code can talk for ImageList can still talk to
older daemon.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c6e31454ba2f053bc6831651663cf538d142afaa
Component: engine
2016-11-28 22:15:50 +01:00
c7fce8b04c
Fix issue with plugin exit.
...
A plugin has an `ExitChan` channel which is used to signal the exit of
the plugin process. In a recent change, the initialization was
incorrectly moved to the daemon Shutdown path.
Fix this by initializing the channel during plugin enable.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 890a98ceed982454515f5b089d9772fc1e4eb6e0
Component: engine
2016-11-28 12:48:56 -08:00
c06179cb55
Fix issue caused by duplicate docker plugin create with same names
...
This fix tries to fix the issue raised in 28684:
1. Duplicate plugin create with the same name will override the old plugin reference
2. In case an error happens in the middle of the plugin creation, plugin directories
in `/var/lib/docker/plugins` are not cleaned up.
This fix update the plugin store so that `Add()` will return an error if a plugin
with the same name already exist.
This fix also will clean up the directory in `/var/lib/docker/plugins` in case
an error happens in the middle of the plugin creation.
This fix fixes 28684.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 662d456928e47162a3af5931356cb05b6a3f9918
Component: engine
2016-11-28 12:37:49 -08:00
b27f0b5dc5
Merge pull request #28734 from ipbabble/master
...
Added and example of using --format with docker images
Upstream-commit: 60e72ea379ba0b8308f7bdec19ddfc8649402116
Component: engine
2016-11-28 20:57:13 +01:00
52fcb6e953
Align output of docker version again
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: dfeaf7a959cf619f5460c88e7bc1fe5ce40d50a7
Component: engine
2016-11-28 11:38:58 -08:00
9bddcd96ba
Merge pull request #28792 from yuexiao-wang/restart-mgr
...
Optimize the unit test for restartmanager
Upstream-commit: 3ccc4bc370cf48eeb89d5de74b3b175da8785700
Component: engine
2016-11-28 20:27:44 +01:00
b1f04046d7
Windows: Note about volumes in run
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b9e65f40cfce3eb1907ad9d8a358c6ae1ad64175
Component: engine
2016-11-28 11:06:01 -08:00
f17239930f
Merge pull request #28891 from mstanleyjones/fix_doubled_words
...
Fix instances of doubled words
Upstream-commit: 0e0a5e0d391c0d231cebcdfac619df39f0e52e04
Component: engine
2016-11-28 19:57:17 +01:00
66e7509ec9
Fix instances of doubled words
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 379e9259cf407f6f97ba31f1ddb921256613cee3
Component: engine
2016-11-28 10:48:45 -08:00
