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
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
0b1f6d26c9
Merge pull request #31340 from anusha-ragunathan/plugin_nw_filter
...
Add network plugin filter test
Upstream-commit: 65068ea4c0fdaf300d0c7a06b3478c6c1c6d4271
Component: engine
2017-03-06 15:31:59 -08:00
aa4b36806a
Some things just need to be line wrapped.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2e9f9d2c347186a29fc558e1c95d5246fad66c2a
Component: engine
2017-03-06 16:01:57 -05:00
00f7fe38c2
Merge pull request #30807 from chchliang/networkproject
...
Check parameter --ip --ip6 --link-local-ip in `docker network connect`
Upstream-commit: de5ca681b5aa170d8e486b7a2a3a144fc032ed70
Component: engine
2017-03-06 21:11:55 +01:00
3dd6267361
Add network plugin filter test
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 5e0e957061795535d893dd0f320e82940b6b01a1
Component: engine
2017-03-06 12:05:20 -08:00
f799b6971e
Merge pull request #31577 from thaJeztah/update-changelog-17.03.0-ce
...
Update changelog 17.03.0 ce
Upstream-commit: a2bf823a94f77bb041a5ef336c689adb09a593b6
Component: engine
2017-03-06 11:19:26 -08:00
f18f03bc0c
Merge pull request #31580 from thaJeztah/move-jana-to-alumni
...
Move Jana to alumni
Upstream-commit: 31930bdfe1a179b6bf79c2887ce97eb4af0d9346
Component: engine
2017-03-06 20:17:19 +01:00
52b69d7432
Merge pull request #31578 from vdemeester/request-daemon-host
...
[test-integration] Update request.* signature to remove the host
Upstream-commit: 4e051181f708972e903d82d99f6076b4dd38da37
Component: engine
2017-03-06 19:45:01 +01:00
73a09fcbca
Merge pull request #31194 from albers/completion-volume-aliases
...
Add support for command aliases to bash completion of `docker volume`
Upstream-commit: c6e102c830716b016ea56056555631112e5348d2
Component: engine
2017-03-06 09:52:41 -08:00
5b5acf04b4
Move Jana to alumni
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 1aeb2cf7cbdcc37af187696fc4c6b087048ccc8a
Component: engine
2017-03-06 18:22:00 +01:00
01d59db55d
added listing for Nimble Storage's volume plugin
...
Signed-off-by: Keith Hudgins <greenman@greenman.org >
updated nimble plugin url
Upstream-commit: 05f37ad4f5a9c2c6ef634de9c0c8be6910d659d3
Component: engine
2017-03-06 12:15:25 -05:00
5b615e9588
Convert new compose volume type to swarm mount type
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a1bbb2f7eac511fa1ccbff37a6b07a986a291838
Component: engine
2017-03-06 11:45:01 -05:00
c8a5ce81db
Support expanded mounts in Compose loader
...
Add a test for loading expanded mount format.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 190dc5a40ab330bf0c2e2ce2954fd72526cabfe1
Component: engine
2017-03-06 11:45:01 -05:00
e14d3ca672
Parse a volume spec on the client, with support for windows drives
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 32c955b8fe7045e64b8f493c52af43f620373bec
Component: engine
2017-03-06 11:45:01 -05:00
578c6e5b0b
Add expanded mount syntax to Compose schema and types.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 65c899bee501a81e004187528e732d944ef904d5
Component: engine
2017-03-06 11:45:01 -05:00
1f8e7d6f38
Fix duplicate "swarm mode" heading
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2de9de60cdbe918cd584099ff35717c710786baf
Component: engine
2017-03-06 16:56:45 +01:00
fea75fa014
Update request.* signature to remove the host
...
99.9% of use case for request call are using daemonHost. This makes it
default and adds a `request.DoOnHost` function to be able to specify
the host for specific, more complex use cases.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b11ba1231ef0ac99279ed5dcd76d81413d7d63b5
Component: engine
2017-03-06 16:41:33 +01:00
2bfb0e38ba
add -ce support
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
(cherry picked from commit 44aec1b69261e8cee0dd416adbbe7a2443f759d6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 98b7c4b00a9908e2ca46bcc134bcf38ac166509a
Component: engine
2017-03-06 16:33:20 +01:00
2acf08cb52
update CHANGELOG
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
(cherry picked from commit 4fa77953f8d51149afbead5dfe5930580f2cc022)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ce67699ede1e77dbbe6f8a668c6155728f9ad9dc
Component: engine
2017-03-06 15:57:53 +01:00
4d2d615d8a
Merge pull request #31205 from vieux/update_changelog_17.03
...
update CHANGELOG for 17.03.0-ce
(cherry picked from commit 9fb5c83df051fc2c2335fad0d3738539d1b4c264)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ee887f327d82b72994aa2f661d9d3401573a707c
Component: engine
2017-03-06 15:57:44 +01:00
af1b667c19
fix CHANGELOG date
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
(cherry picked from commit ce07fb6b0f1b8765b92022e45f96bd4349812e06)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: dff2a0ac126c15f1d141126c33bda0f92ab9b0da
Component: engine
2017-03-06 15:57:36 +01:00
a8b8ebdf6e
bump 17.03.1-ce-rc1
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
(cherry picked from commit 1c44f35eb1f593839eec00f9ce810913e7309ef2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6db395b966cf44716d369c26dec2a5aabe6e2c1d
Component: engine
2017-03-06 15:52:13 +01:00
e9ce01080a
Merge pull request #31543 from chawlanikhil24/master
...
Replaced "err" with "nil" & added a comment
Upstream-commit: 3cfc3e30a886aef1a5e767d5b2a9a7b2c156c5f9
Component: engine
2017-03-06 15:11:14 +01:00
efa1df2f92
Merge pull request #31549 from cyphar/TestDaemonCommand-fix
...
cmd: docker: fix TestDaemonCommand
Upstream-commit: 6753b3bef3176fca25c512102c07b720374e3cfb
Component: engine
2017-03-06 15:10:40 +01:00
