aca0e65f66
Merge pull request #30519 from jessfraz/shopt
...
Adjust "nuke-graph-directory.sh" shebang to be explicitly Bash (includes a Bashism as of https://github.com/docker/docker/pull/27869 )
Upstream-commit: 6d1937aa2d803e10124eea5ef68e2e4f89d3b4b3
Component: engine
2017-01-27 12:26:36 -08:00
98bfe1d80f
change sh to bash for shopt
...
Signed-off-by: Jess Frazelle <acidburn@google.com >
Upstream-commit: 026b71087928c89db32b5746f7cbf02589b32416
Component: engine
2017-01-27 12:16:40 -08:00
3d425cdd35
Merge pull request #30256 from Microsoft/jjh/getpidsforcontainer
...
Windows: Remove GetPidsForContainer old implementation
Upstream-commit: 81cf5a1834aba165f0f5b1dfc86faff6cd02e3b0
Component: engine
2017-01-27 12:12:19 -08:00
1257e4f01b
Merge pull request #30006 from mueller-ma/add-names-to-generator
...
Add names to namesgenerator
Upstream-commit: 023f7f51007705783beeb0d64f49f7cf27996a58
Component: engine
2017-01-27 11:19:19 -08:00
b3cefe89d8
Merge pull request #30508 from albers/plugin-usage-options
...
Add [OPTIONS] to usage of `plugin disable|push`
Upstream-commit: e55e1841160276589ecbca6d12403bb8104ce7c5
Component: engine
2017-01-27 11:17:08 -08:00
45e2da134e
Merge pull request #29887 from vdemeester/daemon-extract-stats-collector
...
Extract daemon statsCollector to its own package
Upstream-commit: cd6a61f1b17830464250406244ed8ef113db8a3c
Component: engine
2017-01-27 10:28:03 -08:00
62b3bbd197
Merge pull request #30090 from wangxing1517/fix-rename-error-when-sid-is-empty
...
Fix rename error when sid is empty
Upstream-commit: c06a82490400114d8f61670271ce5f84ffc14778
Component: engine
2017-01-27 10:01:50 -08:00
58a26ce2d7
Merge pull request #30478 from mstanleyjones/fix_broken_links
...
Fix broken relative links in old API docs
Upstream-commit: 05d4c1314efd6b2ce408734aeece0e73f5d278f0
Component: engine
2017-01-27 09:45:52 -08:00
a8d9877163
Merge pull request #28304 from ijc25/jsonmessage-use-terminfo
...
use terminfo in pkg/jsonmessage
Upstream-commit: 2c948ac3e6b3b1440c5583cfa9d2c581e96280eb
Component: engine
2017-01-27 09:29:18 -08:00
3fde96c14f
Merge pull request #30473 from albers/completion-plugins-format
...
Use native call for listing plugins in bash completion
Upstream-commit: fa5e0973ecf8c84a9cc5b4d920c3b564ce97b2f0
Component: engine
2017-01-27 18:05:07 +01:00
0a060e99f3
Merge pull request #30468 from ralphtheninja/master
...
update api docs on Placement.Constraints for services
Upstream-commit: 0b47ca43397f03d7cf2c77a4d3d96748f694592d
Component: engine
2017-01-27 17:43:46 +01:00
fadc588fd6
Merge pull request #30344 from cpuguy83/refactor_attach
...
Refactor attach
Upstream-commit: 77ec3aa8f295ef1e85b1ad8a2ea54f8acbf77e97
Component: engine
2017-01-27 07:35:44 -08:00
7e2571b991
Add [OPTIONS] to usage of plugin disable|push
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: aad095f573e99b69366f46d6da5bc6536f4237f1
Component: engine
2017-01-27 16:17:02 +01:00
def8cc7670
Merge pull request #30493 from sanimej/netv
...
Vendoring libnetwork @e8431956
Upstream-commit: 3daa8ad5e3789fbbeedc7d892b9203555b7d575b
Component: engine
2017-01-27 11:24:29 +01:00
dcf554f4c7
Merge pull request #28634 from ghostplant/check_cfg_memsw
...
Checking whether CG_MEM_SWAP is enabled at the moment.
Upstream-commit: e2de2123399f494cb41a4cb62392999c80c2e99c
Component: engine
2017-01-27 10:49:32 +01:00
f1a9a91082
Merge pull request #30495 from codevulture/fix_plugin
...
Fix json format of plugin
Upstream-commit: d4799f037fb2e35e75609e56417441793de25750
Component: engine
2017-01-27 10:47:08 +01:00
0ddcabf8da
Fix json format of plugin
...
Signed-off-by: Janonymous <janonymous.codevulture@gmail.com >
Upstream-commit: 2d24dbe896b33ab2b450ace457b0e266b27dfd74
Component: engine
2017-01-27 09:32:19 +03:00
c0d224023d
Vendoring libnetwork @e8431956
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 03ab20291b255662708b4932df60e7b483dc2b8e
Component: engine
2017-01-26 18:08:18 -08:00
1a024c5e04
Merge pull request #30157 from aboch/att
...
Remove attachable network on swarm leave
Upstream-commit: 43544cf2b4752e56066242ef71d06558f233fbc7
Component: engine
2017-01-26 17:03:23 -08:00
59a5f47eb6
Merge pull request #29835 from yongtang/29810-btrfs-rescan
...
Run btrfs rescan only if userDiskQuota is enabled
Upstream-commit: 93e322f5be3b1c00e8e085a510f2a8194f7bedc5
Component: engine
2017-01-26 15:55:51 -08:00
e827bea430
Merge pull request #30144 from dnephin/add-secrets-to-stack-deploy
...
Add secrets to stack deploy
Upstream-commit: 5706d8206bd41fca36ed634f80fe85f5ffbed71b
Component: engine
2017-01-26 14:54:04 -08:00
189d700cd2
Merge pull request #30438 from albers/completion-windows-specific
...
Add windows specific bash completion for `docker run|create|build`
Upstream-commit: cd7f3e7f9ae6e551a824c057f0f48e1d7e8706f6
Component: engine
2017-01-26 14:25:35 -08:00
2e5c358a33
Merge pull request #29428 from rhatdan/selinux
...
We need to fix labels if the user requests on volumes
Upstream-commit: 541150da53ea84b0fb86342bfd3e32483e2018ca
Component: engine
2017-01-26 11:47:14 -08:00
2613e5ae2f
Remove attachable network on swarm leave
...
- When the node leaves the cluster, if any user run
container(s) is connected to the swarm network,
then daemon needs to detach the container(s) and
remove the network.
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 3cedca5d532958ffc007d9b62cc871d3d113f054
Component: engine
2017-01-26 11:16:07 -08:00
f9fc4e05d2
Merge pull request #30479 from dnephin/fix-master-swagger
...
Fix ImageDelete type
Upstream-commit: ced293a01579343a7dc74ed4da85bbc6a78400a4
Component: engine
2017-01-26 11:15:16 -08:00
7b1358ff88
Fix ImageDelete type
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 64978c136575287115cca261ea29c1953c8059d8
Component: engine
2017-01-26 14:07:44 -05:00
b85cf995b4
Merge pull request #30407 from thaJeztah/add-src-alias-for-secrets
...
Add "src" alias for `--secret`
Upstream-commit: ab75ce6b6641a0267ab43b92b51fb71a985a4aa6
Component: engine
2017-01-26 10:53:27 -08:00
adee679878
Merge pull request #29851 from vdemeester/daemon-extract-image-cache
...
Extract the daemon image cache to its own package
Upstream-commit: df5d909ac95556c861ef27560a141748c84fb5dd
Component: engine
2017-01-26 10:50:35 -08:00
c15d01d9ac
Merge pull request #29830 from timthelion/issue29821
...
Docs: Be more clear when specifying valid formats for strings
Upstream-commit: effc91e7a54a44b50913e1c17a8d173656411847
Component: engine
2017-01-26 10:45:03 -08:00
bc911a640c
Merge pull request #28409 from dnephin/swagger-gen-more
...
Generate more types from the swagger spec
Upstream-commit: a69c4129e086e4e7b86cce7d2682685dfdc6f2d2
Component: engine
2017-01-26 10:35:34 -08:00
41ea58b118
Fix broken relative links in old API docs
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 37b13201c41753574942e567562f7ad098b827bf
Component: engine
2017-01-26 10:15:47 -08:00
32db69e364
Merge pull request #30250 from yongtang/30242-duplicate-networks-scope
...
Fix incorrect `Scope` in `network ls/inspect` with duplicate network names
Upstream-commit: 5497f4758d14f6f65c722838d342f634e353b08e
Component: engine
2017-01-26 10:11:10 -08:00
9e237a57b2
Set default values for uid and gid to prevent errors when starting a service.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 167b3f95b7f659817f8421742ca4078edd42dbaa
Component: engine
2017-01-26 12:00:46 -05:00
3899657b26
Use native call for listing plugins in bash completion
...
`docker plugin ls` now has `--format`, so there is no more need for
postprocessing raw `docker plugin ls` output with `awk` any more.
This will make generation of plugin lists robust against changes
in `docker plugin ls` output.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5a067e52551503993ca5a2e92d1c742238b97411
Component: engine
2017-01-26 17:33:43 +01:00
dd9f330ae3
Rebase Compose v3.1 schema on the latest v3 schema.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b4f23bbc69f58662f8d94b0492d693e43d523e47
Component: engine
2017-01-26 11:33:15 -05:00
9e92b82db9
Remove secrets as part of stack remove.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f0a5531c46c3fe602b372de434125a3cd046a0b6
Component: engine
2017-01-26 11:33:15 -05:00
f693277e41
Test and fix external secrets in stack deploy.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b3427e43edc56824f762e964c955b906fa363a3a
Component: engine
2017-01-26 11:33:15 -05:00
5ed83fcbc5
Add integration test for stack deploy with secrets.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6ec84ef76df30663d5728f903b314f4486587135
Component: engine
2017-01-26 11:33:15 -05:00
fc26836a78
Implement secret types for compose file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9419e7df2b54b684bef6c787239a2c92fbb4acda
Component: engine
2017-01-26 11:33:15 -05:00
9fa961acee
Add v3.1 schema and support validating multiple version.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 65374488f92512cf34667cb71ea6d62985310f65
Component: engine
2017-01-26 11:33:15 -05:00
cab1925d86
update api docs on Placement.Constraints for services
...
Signed-off-by: Lars-Magnus Skog <ralphtheninja@riseup.net >
Upstream-commit: 9c98bffc2b92625f113b390442b6dca245cb4be5
Component: engine
2017-01-26 15:01:21 +01:00
22f59a404a
Merge pull request #30111 from darrenstahlmsft/DependsConDrv
...
Windows: Add service dependency ConDrv
Upstream-commit: fe5f49685df0d52127158f7e9a2882b8c4168dab
Component: engine
2017-01-26 12:49:05 +01:00
5fdbe54084
Merge pull request #28921 from allencloud/remove-incorrect-url
...
update an incorrect url in docs
Upstream-commit: bc18cfa3f37736b0143d0f3f8fe527923c8a966e
Component: engine
2017-01-26 10:29:12 +01:00
eebfc64a61
update incorrect url in docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 5ae95d6245d30751951418650331def487bf935b
Component: engine
2017-01-26 12:57:45 +08:00
b0cadb1839
Rename helper function in bash completion for consistency
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 93e43b42be7e600a266c17c64a3d718a0a4737a6
Component: engine
2017-01-25 15:55:04 -08:00
19e6c32abb
Hide bash completion for docker run|create|build --isolation on non-windows
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: fceaae95b5a61954ea40913b45b37b7dd1dd4d8a
Component: engine
2017-01-25 15:55:04 -08:00
61a58b02fd
Merge pull request #30376 from albers/completion-fix-node-list
...
Fix bash completion for completing nodes
Upstream-commit: db657a558ecff8e64490ebef15d744af7ef19d50
Component: engine
2017-01-25 11:52:13 -08:00
a818254bf8
Fix incorrect Scope in network ls/inspect with duplicate network names
...
This fix tries to address the issue raised in 30242 where the `Scope`
field always changed to `swarm` in the ouput of `docker network ls/inspect`
when duplicate networks name exist.
The reason for the issue was that `buildNetworkResource()` use network name
(which may not be unique) to check for the scope.
This fix fixes the issue by always use network ID in `buildNetworkResource()`.
A test has been added. The test fails before the fix and passes after the fix.
This fix fixes 30242.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 05a831a775be5e8d752deaef620e629deb15cb89
Component: engine
2017-01-25 09:39:55 -08:00
6ce7bda47e
Merge pull request #30330 from mlaventure/prune-named-untagged
...
Prune named but untagged images if danglingOnly=true
Upstream-commit: a76572b846944456a06c0234fc0529db9df3e193
Component: engine
2017-01-25 08:38:15 -08:00
619883aba7
Add windows specific bash completion for docker run|create
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f2ee29ed96a9ba9c13cc1bec8b393565f5da9041
Component: engine
2017-01-25 10:24:27 +01:00
