f54d163984
Merge pull request #31396 from kevinfeyrer/patch-2
...
Update vlan-networks.md
Upstream-commit: 705e031b984e7d976fa5a9fef61e4a76451d6e36
Component: engine
2017-03-09 15:02:58 +01:00
5e81579bc9
Merge pull request #31681 from lixiaobing10051267/masterLayer
...
modify ID to ChainID to avoid confusing
Upstream-commit: 89b4c1d353b1ece4928c00f7eaa661d663c6cb78
Component: engine
2017-03-09 08:45:35 -05:00
42e1c80fbb
modify ID to ChainID to avoid confusing
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 1b0f2d71a1aa9e529357e2ffe342af2a12d7c145
Component: engine
2017-03-09 16:59:04 +08:00
d7f291ac61
integration-cli-on-swarm: make sure deferred function gets executed before os.Exit()
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 59ba54094e5d2bced1c4a5f9cd4c31eaa4492e23
Component: engine
2017-03-09 08:54:11 +00:00
0d16f73693
Fix description of docker run|create --stop-signal in help message
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b303e229ca6ec61e43b1b7a93f6ff034a3945644
Component: engine
2017-03-09 09:32:16 +01:00
41b7019c2e
integration-cli-on-swarm: new CLI flag: -keep-executor
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: b9aa04cf9afceb0822bba01c59dc3fba09639d8b
Component: engine
2017-03-09 08:13:13 +00:00
5f2662b5f4
Improve bash completion for create|run --stop-signal
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 994948a08ff4dbfae207a8e7d01d82d4d71fe091
Component: engine
2017-03-09 09:06:35 +01:00
a010c45e8c
Add bash completion for service create|update --stop-signal
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 81cbf49e52e45ffdf408d82b818e65ea5d3a4002
Component: engine
2017-03-09 09:02:00 +01:00
aec1003d24
Fix inefficient file paths filter
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: adeb3e36840c6d9d1912dd78f5300ae74d11c068
Component: engine
2017-03-08 18:59:25 -08:00
965d7ccdac
Fixed concerns, updated, and rebased PR.
...
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: 83c34de515e249ede7bc942c1fa4c6b6ac8de7fb
Component: engine
2017-03-08 16:35:58 -08:00
aa68ffe980
Always HEAD blobs at least once during pushes
...
Signed-off-by: Jon Johnson <jonjohnson@google.com >
Upstream-commit: cdc46abde53a8728affff2b39255dce6410fb6b8
Component: engine
2017-03-08 15:36:12 -08:00
5f9634b1f6
Windows: no pidfile when service
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a8e144dab4ec12eb5111df26abc87f7939faa1c3
Component: engine
2017-03-08 15:18:30 -08:00
5ef9a2c7ea
Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 49131f3ad47bb6195d9ced8aa5f93faf011f9e58
Component: engine
2017-03-08 14:56:29 -08:00
0d35e880ac
service logs: Improve formatting
...
- Align output. Previously, output would end up unaligned because of
longer task names (e.g. web.1 vs web.10)
- Truncate task IDs and add a --no-trunc option
- Added a --no-ids option to remove IDs altogether
- Got rid of the generic ID Resolver as we need more customization.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 70a4369f5eae45fe1bc94ee4a151a63c9babd6f0
Component: engine
2017-03-08 14:08:04 -08:00
574f55f777
Update vlan-networks.md
...
Some small changes to get the examples so that they run without error for me.
Improve consistency of presentation of the examples.
Fix some typos
Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com >
Update vlan-networks.md
Restore "ip" accidentally removed
Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com >
Update vlan-networks.md
Change prompt from container "$$" to host "$"
Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com >
Update vlan-networks.md
Some changes suggested by cpuguy83 and thaJeztah
Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com >
Upstream-commit: 6ea36d7d48a41225c8573ef649320c1a414b8995
Component: engine
2017-03-08 21:53:24 +00:00
98b7605ab5
seccomp support for debian jessie
...
Based on jessie-backports.
Signed-off-by: Boris Pruessmann <boris@pruessmann.org >
Upstream-commit: fcadb77b97b2a305ce83798f11e977d8925748c0
Component: engine
2017-03-08 20:02:18 +01:00
e454be5cbf
Merge pull request #31535 from aaronlehmann/vendor-swarmkit-7fc7503
...
Vendor swarmkit d60ccf3
Upstream-commit: 3fe2730ab3d7bba483d7bf4fb1e95b627823ff4d
Component: engine
2017-03-08 09:52:28 -08:00
d25a95c0e2
Wrap errors in digest package so they are consistent between platforms.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7abeb08a8cc10d4bc9b218d14f79d9ee27ff62ff
Component: engine
2017-03-08 11:48:46 -05:00
490ab536f0
Use assertions in image package unit tests.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 69d7362058530d7dd97af29dc43fc4d55e73e776
Component: engine
2017-03-08 11:46:10 -05:00
63bea006b9
extract a function
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9ea5e02e92d2d39e771d10eb0acf341ba9b58ceb
Component: engine
2017-03-08 11:46:09 -05:00
55df7adcd9
Add compose-bindata validation to default.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 18e0a327ca59a6d4d9cb22f309f94b032a7e3b31
Component: engine
2017-03-08 10:23:40 -05:00
a09edbbf93
Merge pull request #31177 from allencloud/donot-allow-subsecond-in-dockerfile-healthcheck
...
do not allow sub second in healthcheck options in Dockerfile
Upstream-commit: fb1890fb9530b3f69b0d9f937fd0b6d8b1972311
Component: engine
2017-03-08 15:18:09 +01:00
6d40d2a062
Merge pull request #31443 from james-nesbitt/export-more-compose-methods
...
exported add. cli compose loader parsing methods
Upstream-commit: fb024df8f0d18fdeff4b73979d51b44f268aeb6b
Component: engine
2017-03-08 15:12:42 +01:00
25aab279f4
Merge pull request #31641 from amatsus/master
...
Fix typo in CHANGELOG.md
Upstream-commit: 58e787602d85ee674164fb9dae1250d2c3e98da1
Component: engine
2017-03-08 15:10:45 +01:00
ac2e133cd8
Merge pull request #31611 from tophj-ibm/skip-plugin-test
...
skip plugin test on non x86 architectures
Upstream-commit: ab8a22de3607f2b5f7afb7a8a93d298f17d124a7
Component: engine
2017-03-08 14:00:15 +00:00
977a744f4a
Fix typo in CHANGELOG.md
...
Signed-off-by: Akihiro Matsushima <amatsusbit@gmail.com >
Upstream-commit: d9325e102cd449645a208fa83cfd2b8cb29ab0d2
Component: engine
2017-03-08 21:13:05 +09:00
8c76bad868
Merge pull request #30856 from allencloud/make-secret-update-support-name-and-id-prefix
...
make secret update support name and id prefix
Upstream-commit: d4a8c3b438cb8ae95916fee3e7fac93639b720f6
Component: engine
2017-03-08 12:31:44 +01:00
0aea84a00e
Merge pull request #31566 from AkihiroSuda/use-latest-vndr
...
rerun vndr
Upstream-commit: 7e031413f20946c9926767c1f16fb3d4cda56e6b
Component: engine
2017-03-08 12:16:50 +01:00
c753d5b3d7
Merge pull request #31623 from aaronlehmann/dropped-taskspec-field
...
Fix dropped field in task translation from GRPC to REST
Upstream-commit: c430aea83c822a506640b10d5e5290b7c86ee46a
Component: engine
2017-03-08 05:24:48 -05:00
4eca586f17
Fix fish autocompletion with custom ps output
...
In the docker config.json, if `psFormat` or `imagesFormat` is set to a
non-standard format, it breaks autocompletion.
This fixes the issue by using a custom format.
Signed-off-by: Chris Gibson <chris@chrisg.io >
Upstream-commit: b4a1634cec80f58c7bcaa213441f2e81cd405f5e
Component: engine
2017-03-08 14:19:48 +08:00
173cafe0e6
api: clarify that Env var without = is removed from the environment
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 1921fad6f516a1d45e18054745eb1d2b03aaf665
Component: engine
2017-03-08 04:27:25 +00:00
9b41265701
Vendor swarmkit d60ccf3
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 39433318fe224e9066a892fc5834b38649ec86ac
Component: engine
2017-03-07 19:09:21 -08:00
3442ecd596
rerun vndr
...
* run latest vndr so as to collect more LICENSE files
* remove unused packages
* vendor github.com/philhofer/fwd with LICENSE.md (MIT)
* vendor github.com/bsphere/le_go with LICENSE (MIT)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 5a1b06d7fd6a0c8722a4f7aee1edf46d8e2a115b
Component: engine
2017-03-08 02:29:34 +00:00
642bdd2e30
cluster: Proceed with startup if cluster component can't be created
...
The current behavior is for dockerd to fail to start if the swarm
component can't be started for some reason. This can be difficult to
debug remotely because the daemon won't be running at all, so it's not
possible to hit endpoints like /info to see what's going on. It's also
very difficult to recover from the situation, since commands like
"docker swarm leave" are unavailable.
Change the behavior to allow startup to proceed.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: f7d846094a5dc642198cc4939df646a3e889a750
Component: engine
2017-03-07 16:50:39 -08:00
8032897023
Add missing resources to update block for Windows containers
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: e507066303b527cbbd3e7c076460f50af4c841d5
Component: engine
2017-03-07 16:25:17 -08:00
cfda5ee425
Stop holding client container lock during shutdown
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: b819ffdb2079bf2e805f8ca2ed84f184fe601269
Component: engine
2017-03-07 16:24:34 -08:00
1265500185
Fix typo in sample output
...
Changed `ICONTAINER ID` to `CONTAINER ID`.
Signed-off-by: Remy Suen <remy.suen@gmail.com >
Upstream-commit: f3d5d9753a4c0f797dc43459508a31c263c576b4
Component: engine
2017-03-08 08:39:43 +09:00
f7cd555009
Fix dropped field in task translation from GRPC to REST
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 497c4f05b931a7f64785543922b19e94362607e6
Component: engine
2017-03-07 14:55:15 -08:00
ac28c83574
Seccomp Update
...
- Update libseccomp-golang to 0.9.0 release
- Update libseccomp to 2.3.2 release
- add preadv2 and pwritev2 syscalls to whitelist
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 9067ef0e32c6a85384dad2a30ac3a49e2f9fe393
Component: engine
2017-03-07 22:19:46 +00:00
569aaf9edd
Merge pull request #31265 from cyli/remove_swarm_subdirs
...
Rather than remove the swarm directory and re-create, remove the subdirs
Upstream-commit: fd5f9d7941287cbbaeecfd16e0159508b3f6af63
Component: engine
2017-03-07 14:30:34 -05:00
e901de0def
Merge pull request #31258 from dnephin/fix-override-default-stack-network
...
Support customizing the default network for a stack
Upstream-commit: dd221a1e1727b8db2f7094605f91c15384ac5df6
Component: engine
2017-03-07 14:28:16 -05:00
2678ec9975
stack deploy exits with error if both 'external' and any other options are specified for volumes
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 96039b394adebfe2754a6e57419a44a9489b8005
Component: engine
2017-03-07 14:21:45 -05:00
26dbe98c09
exported cli compose loader parsing methods
...
Signed-off-by: James Nesbitt <james.nesbitt@wunderkraut.com >
Upstream-commit: a1560a0cf2401ccf37d6b6859b57a9eecd339089
Component: engine
2017-03-07 17:36:35 +02:00
ba46ce307c
Use opts.MemBytes for flags.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: afcaeedbd4249009811ba1c11767173c23ae0814
Component: engine
2017-03-07 10:32:49 -05:00
86791f66a6
Merge pull request #30568 from khudgins/nimbleplugin
...
added listing for Nimble Storage's volume plugin
Upstream-commit: ba5c0f88d56b70f3dfa3d0652e30613ab332b92b
Component: engine
2017-03-07 09:31:53 -05:00
87a178b335
skip plugin test on non x86 architectures
...
Because the plugins in dockerhub aren't multi-arch, they will
fail on non x86-64 platforms. Comment this test out like we do with
the others.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: e3c6cbed22cfc4c88782a60b00b6febeadc6d947
Component: engine
2017-03-07 09:28:10 -05:00
e14af410b8
Merge pull request #31198 from docbobo/master-manpages-aarch64
...
Improved aarch64 build
Upstream-commit: 7bf408526442a9561f742992d26d730aea891958
Component: engine
2017-03-07 13:53:48 +01:00
873be611dd
modify docker plugin sshfs entrypoint
...
Signed-off-by: Jimmy Song <rootsongjc@gmail.com >
Upstream-commit: 7038931b14ed6cd4706ef214f9411f1a1c5321dc
Component: engine
2017-03-07 17:06:27 +08:00
4340eba05a
make secret update support name and id prefix
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 9d30525a04e2d4efe51ac9e6c114ce36276aafa8
Component: engine
2017-03-07 16:01:21 +08:00
ec64fef8e0
cluster: Renew the context after communicating with the registry
...
When pinning by digest, the registry might be slow or unresponsive. This
could cause the context to already be expired by the time UpdateService
or CreateService is called. We want digest pinning to be a best-effort
operation, so it's problematic if a slow or misbehaving registry
prevents the service operation from completing. Replace the context
after communicating with the registry, so we have a fresh timeout for
the gRPC call.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: f8273a216ed35e22ac157dee8055393f07d4be39
Component: engine
2017-03-06 16:05:56 -08:00
Sebastiaan van Stijn
Brian Goff
lixiaobing10051267
Akihiro Suda
Harald Albers
Tonis Tiigi
Drew Erny
Jon Johnson
John Howard
Kenfe-Mickael Laventure
Andrea Luzzardi
kevinfeyrer
Boris Pruessmann
Daniel Nephin
Justin Cormack
Akihiro MATSUSHiMA
Vincent Demeester
Chris Gibson
Aaron Lehmann
Darren Stahl
Remy Suen
Arash Deshmeh
James Nesbitt
Christopher Jones
Jimmy Song
allencloud