7b79f78433
Merge pull request #30967 from adshmh/24631-service-without-labels-returns-empty-map
...
Inspect output on service without labels is an empty map instead of null, fixes #24631
Upstream-commit: 0de867b315ff5734530558319b1f20238c81ba0c
Component: engine
2017-02-17 08:49:32 -08:00
ffcecda259
Merge pull request #31114 from allencloud/split-compose-stack-deploy-from-deploydotgo
...
split compose deploy from deploy.go
Upstream-commit: f00514a1d0cb883229e8388ef0c8bd91efcca6dd
Component: engine
2017-02-17 08:48:51 -08:00
7fdc39f1fc
Merge pull request #30848 from nishanttotla/suppress-digest-docker-ps
...
Suppressing image digest in docker ps
Upstream-commit: 40532143c2c4cf1359fd8484789b81c1f1f59d98
Component: engine
2017-02-17 10:27:49 +01:00
5c62127220
Merge pull request #29742 from miaoyq/rewrite-validate-privileges
...
Rewrite the function 'validatePrivileges' without checking order
Upstream-commit: 0ac25dfc751fa4304ab45afd5cd8705c2235d101
Component: engine
2017-02-17 10:24:11 +01:00
ba76fec59c
Merge pull request #31069 from tonistiigi/fix-overlay2-unmount
...
overlay2: fix unmounting layer without merge dir
Upstream-commit: 146bc072a9bc0c52509d55a96c4324e3cee3d557
Component: engine
2017-02-17 10:21:47 +01:00
5f5d704cba
split compose deploy from deploy.go
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: f46a14f7b611276256c7e8148e87c1d570201d74
Component: engine
2017-02-17 17:13:31 +08:00
def1ef1214
Merge pull request #29894 from cpuguy83/cleanup_volumedriver_retry_test
...
Use vol plugin creator instead of inserting spec
Upstream-commit: d07cd8c3210f0072b46f402be1dca26f93478ac3
Component: engine
2017-02-17 09:46:31 +01:00
5ecbd0e344
Merge pull request #31103 from tonistiigi/update-docs-link
...
Update storage driver options link
Upstream-commit: e1839ab95341fe8c40d8e8e0112fcfab38c92f3f
Component: engine
2017-02-17 09:45:31 +01:00
e4c1cbaa7f
Merge pull request #30809 from fate-grand-order/branch
...
Correct fmt.Fprintf and t.Fatalf
Upstream-commit: a2106c8224b9b6224b41eb4221a96a29c1237545
Component: engine
2017-02-16 23:02:03 -05:00
000b690000
Merge pull request #31088 from xulike666/make-code-readable-again
...
Typo fixed and this time I provide my cSpell.json
Upstream-commit: 8e5769445211f71635432dcdba17d31f2571e52a
Component: engine
2017-02-16 22:04:27 -05:00
54df4712b6
Update storage driver options link
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e9864cc0ec53ae3be250cb184274ccc9349bec2d
Component: engine
2017-02-16 18:32:17 -08:00
c5276a2bfc
Merge pull request #30679 from mlaventure/cgroup-devices-docs
...
Add example for --device-cgroup-rule to create reference
Upstream-commit: 623612fe09b72a907269a7d7fca94f7aeda1747c
Component: engine
2017-02-16 21:18:04 -05:00
48fc06e87e
Merge pull request #30618 from cpuguy83/fix_data_races
...
Fix some data races
Upstream-commit: 7978eef62337abc52912dd9a1901d8aa4aafa123
Component: engine
2017-02-16 21:15:21 -05:00
279032c38f
Merge pull request #31023 from mstanleyjones/fix_liquid_errors
...
Fix some Liquid errors
Upstream-commit: 88de5c36c7afdae095322c64c0472d27c4ff3f43
Component: engine
2017-02-16 18:13:15 -08:00
5361825be7
Suppressing image digest in docker ps
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: b04536f61fe9d8e9827832e0cef02cc2c5cef003
Component: engine
2017-02-16 18:11:56 -08:00
85bea8f4a4
Merge pull request #30946 from sdurrheimer/zsh-completion-log-opts
...
Add zsh completion for docker log options 'max-buffer-size|mode'
Upstream-commit: e412e33a2f79d84344b36b7ab292d9b820eb0a48
Component: engine
2017-02-16 20:51:31 -05:00
fd3b01be58
Merge pull request #31006 from vdemeester/30991-secret-mode-in-stack-deploy
...
Set 0444 as default secret mode in stack deploy
Upstream-commit: a12454d7a964b99921adabdb8f741da5a94a0e66
Component: engine
2017-02-16 20:34:21 -05:00
6b0b33830b
Merge pull request #31070 from cpuguy83/31060_fix_log_read_spin
...
Fix cpu spin waiting for log write events
Upstream-commit: 39851eac0c655d0c1911db58d4f630e2da233cac
Component: engine
2017-02-16 20:15:38 -05:00
33d38aa9ab
Merge pull request #31091 from yongtang/02162017-swarmkit-update
...
Update SwarmKit to 6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0
Upstream-commit: 793c94fe440730310cbe88c33f8063418f426bb4
Component: engine
2017-02-16 17:12:00 -08:00
36d38c8a19
Add Yong Tang to maintainers
...
This adds Yong Tang as a maintainer for
docker/docker, as was proposed and
voted on the maintainers mailinglist.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c7cf5fcf6c55b266c8166afb686ebd24ba8a34d8
Component: engine
2017-02-16 23:09:09 +01:00
679d4196b0
Merge pull request #31085 from vdemeester/sort-stack-ls
...
Sort `docker stack ls` by name
Upstream-commit: 3e53ecaaae0a6cebdfd6b734a7cb6ef47725a9b2
Component: engine
2017-02-16 14:23:48 -05:00
e2ff499d5e
Merge pull request #29001 from darrenstahlmsft/WindowsOnLinux
...
Block pulling Windows images on non-Windows daemons
Upstream-commit: c31f73abfda14fa2fd75d8eb0a04221066a93dca
Component: engine
2017-02-16 19:57:54 +01:00
88bba1c7b5
Merge pull request #31002 from vdemeester/images-remove-handle-tag-digest
...
reference: handle combination of tag and digest in ImageDelete
Upstream-commit: bd81a16df0b236e874370059fff930badb7bba0d
Component: engine
2017-02-16 10:49:04 -08:00
cb4d6aeea8
Update SwarmKit to 6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0
...
This fix tries to update the SwarmKit from
ed384f3b3957f65e3111bd020f9815f3d4296fa2
to
6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0
The following is the list of docker related changes:
1. Took long time for Docker Swarm service turn desired state from Ready to Running (Issue #28291 )
2. Native Swarm in 1.12 - panic: runtime error: index out of range (Issue #25608 )
3. Global mode target replicas keep increasing (Issue #30854 )
4. Creating service with publish mode=host and without published port crashes swarm manager (Issue #30938 )
5. Define signals used to stop containers for updates (Issue #25696 ) (PR #30754 )
This fix fixes #28291 , #25608 , #30854 , #30938 .
This fix is required by PR #30754 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: ec860ca2526a65ec3b7059666b8e65bab9acf62c
Component: engine
2017-02-16 08:50:00 -08:00
29e3dcbbb0
why there are so many mistakes in our repo (up to /cmd)
...
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn >
Upstream-commit: f8a40477960976f12dbbb72e5b133b5b0f05f9b3
Component: engine
2017-02-17 00:32:48 +08:00
19d262d100
Merge pull request #31054 from darrenstahlmsft/WaitOOBE
...
Windows: Wait for OOBE to prevent crashing during host update
Upstream-commit: 7f0b833621f61072d3176d224be02ea5089761f9
Component: engine
2017-02-16 11:18:25 -05:00
2f00829632
Merge pull request #31073 from aboch/naip
...
Release the network attachment on allocation failure
Upstream-commit: 55e2ed2a653f70c58206633710851ac75bc74e0b
Component: engine
2017-02-16 16:36:28 +01:00
ce49df485e
Merge pull request #30746 from yongtang/29936-validate-insecure-registry
...
Validate insecure registry (`--insecure-registry`) values
Upstream-commit: 387ff3c41d0d5185b747e5ec4c9550376d3d4cca
Component: engine
2017-02-16 14:53:51 +01:00
492545a1db
Sort docker stack ls by name
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 97d85127c231d1b0823a3459d638dbd4f0ba1460
Component: engine
2017-02-16 14:30:39 +01:00
6224d25ac6
Release the network attachment on allocation failure
...
- otherwise the attachment task will stay in store and
consume IP addresses and there is no way to remove it.
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 91820b69412e2ec9e5b3201cd5c637ca1352fd39
Component: engine
2017-02-16 05:21:06 -08:00
2e425466b4
Merge pull request #31016 from aboch/vnd
...
Vendoring libnetowrk @5537cb4
Upstream-commit: 136e400a4c689262885b6f0c5843730d087e1483
Component: engine
2017-02-16 04:30:55 -08:00
55b4b2547e
Set 0444 as default secret mode in stack deploy
...
Change the default secret mode to match the default one used in
`service` subcommands.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f2b68c6cc1664ca0c60457b8c713eec52902a2d2
Component: engine
2017-02-16 11:26:05 +01:00
348e71b4b8
reference: handle combination of tag and digest in ImageDelete
...
If you remove an image with digest+tag, it will fail because it wont
find it in the reference store (where digest+tag -> digest). Let's
make sure we do the same in ImageDelete, stripping the tag if
digest+tag are present.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0fbfeb17e5a135cfd40ea07ab64d6e6bcf903e44
Component: engine
2017-02-16 10:48:40 +01:00
ee71506629
Fix cpu spin waiting for log write events
...
This loop is not ever going to return since it's never actually setting
the `err` var except on the first iteration.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7a179972ff963706404f91671960b144dec98d65
Component: engine
2017-02-15 21:41:32 -05:00
b4b0a816d9
overlay2: fix unmounting layer without merge dir
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e1af6c8a5767e38957449a1d07e56104e317191b
Component: engine
2017-02-15 17:58:12 -08:00
323be4fac1
Merge pull request #31056 from tonistiigi/build-cache-fix
...
Reset stdin config before running build actions
Upstream-commit: d26cf30a6094c22fd9d5a032faf96103f6f841dc
Component: engine
2017-02-15 18:02:57 -05:00
7cb213f3ce
Merge pull request #30416 from stevenh/linux-mount-fixes
...
Fix linux mount calls not applying propagation type changes
Upstream-commit: d52350d6623aa01bb846fc17ddbc209feafe1c14
Component: engine
2017-02-15 14:10:54 -08:00
d0f9d01ec6
Windows: Wait for OOBE to prevent crashing during host update
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: e128a65685dafd640e32118eb1903581489f7e31
Component: engine
2017-02-15 14:01:54 -08:00
2da555a6fc
Merge pull request #29819 from vdemeester/service-validate-publish-simple-syntax
...
Make sure we validate simple syntax on service commands
Upstream-commit: f18bc25fa1449ececeac3f8e4691934bd07abb75
Component: engine
2017-02-15 12:31:46 -08:00
be4d0dc6ad
Reset stdin config before running build actions
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 0f293f9eb31bdf8ff7adcb31baafca3f6fde3aab
Component: engine
2017-02-15 11:49:17 -08:00
32586ce540
Merge pull request #28638 from yongtang/28626-improve-error-handling
...
Improve error handling of experimental features in non-experimental mode
Upstream-commit: abe6a073c72107d54187d3bba4385c49d343366d
Component: engine
2017-02-15 11:00:03 -08:00
ec803a2e58
Merge pull request #30303 from allencloud/rewrite-reload
...
refactor config reload in daemon
Upstream-commit: ee560bd748d50f48ae421169542d14c8ea6dceac
Component: engine
2017-02-15 09:40:55 -08:00
cebed3ff8d
Merge pull request #29957 from ilianaw/amazonlinux-rpms
...
Build the docker-engine RPM for Amazon Linux
Upstream-commit: 3167bb8629a70728daaae3637ef9fa63273bb458
Component: engine
2017-02-15 09:40:03 -08:00
7ad266c66d
Merge pull request #31040 from BSWANG/master
...
fix docker stack omit external volume's "nocopy" parameter
Upstream-commit: 07aaa718067baef4250466bb86ec2dc5601325dd
Component: engine
2017-02-15 09:35:07 -08:00
7f254e6829
Merge pull request #30861 from runcom/fix-plug-errcheck
...
plugin: check errors
Upstream-commit: ce0f9b5e10ca90687706a5168a6e251de4515fba
Component: engine
2017-02-15 07:50:27 -08:00
e7f7c8cfe0
Fix linux mount calls not applying propagation type changes
...
Propagation type changes must be done as a separate call, in the
same way as read only bind mounts.
To fix this:
1. Ensure propagation type change flags aren't included in other calls.
2. Apply propagation type change in a separate call.
Also:
* Make it clear which parameters are ignored by passing them as empty.
* Add tests to ensure Mount options are applied correctly.
Fixes #30415
Signed-off-by: Steven Hartland <steven.hartland@multiplay.co.uk >
Upstream-commit: b3b14b97b1087bfbce6a4de7039e17847fe491a2
Component: engine
2017-02-15 14:15:09 +00:00
3128024c49
rewrite reload code
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 75f5d63ec8414eb3d5f0a0707225b6fa7d485ce7
Component: engine
2017-02-15 21:57:27 +08:00
cf83a0af42
Merge pull request #30922 from dperny/fix-log-error-handling-return-error
...
Fix both logs commands to correctly handle errors
Upstream-commit: 946787e85e7c747c78354c5ca8d7a512b8766969
Component: engine
2017-02-15 08:41:42 -05:00
7ea1feeeaf
Merge pull request #30971 from dargor/allow_sync_file_range2
...
Allow sync_file_range2 on supported architectures.
Upstream-commit: 3b5ed562fc2b9a65b86a67dc88a9e44e95d7814c
Component: engine
2017-02-15 13:00:50 +00:00
a3ebb4bd61
fix docker stack volume's nocopy parameter
...
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com >
Upstream-commit: 4fe611958cc7d44a2a9d95ab892340349ed02072
Component: engine
2017-02-15 19:46:27 +08:00
