Граф коммитов

30520 Коммитов

Автор SHA1 Сообщение Дата
Brian Goff 93e322f5be Merge pull request #29835 from yongtang/29810-btrfs-rescan
Run btrfs rescan only if userDiskQuota is enabled
2017-01-26 15:55:51 -08:00
Victor Vieux 5706d8206b Merge pull request #30144 from dnephin/add-secrets-to-stack-deploy
Add secrets to stack deploy
2017-01-26 14:54:04 -08:00
Kenfe-Mickaël Laventure cd7f3e7f9a Merge pull request #30438 from albers/completion-windows-specific
Add windows specific bash completion for `docker run|create|build`
2017-01-26 14:25:35 -08:00
Alexander Morozov 541150da53 Merge pull request #29428 from rhatdan/selinux
We need to fix labels if the user requests on volumes
2017-01-26 11:47:14 -08:00
Alexander Morozov ced293a015 Merge pull request #30479 from dnephin/fix-master-swagger
Fix ImageDelete type
2017-01-26 11:15:16 -08:00
Daniel Nephin 64978c1365 Fix ImageDelete type
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 14:07:44 -05:00
Victor Vieux ab75ce6b66 Merge pull request #30407 from thaJeztah/add-src-alias-for-secrets
Add "src" alias for `--secret`
2017-01-26 10:53:27 -08:00
Alexander Morozov df5d909ac9 Merge pull request #29851 from vdemeester/daemon-extract-image-cache
Extract the daemon image cache to its own package
2017-01-26 10:50:35 -08:00
Alexander Morozov effc91e7a5 Merge pull request #29830 from timthelion/issue29821
Docs: Be more clear when specifying valid formats for strings
2017-01-26 10:45:03 -08:00
Alexander Morozov a69c4129e0 Merge pull request #28409 from dnephin/swagger-gen-more
Generate more types from the swagger spec
2017-01-26 10:35:34 -08:00
Victor Vieux 5497f4758d Merge pull request #30250 from yongtang/30242-duplicate-networks-scope
Fix incorrect `Scope` in `network ls/inspect` with duplicate network names
2017-01-26 10:11:10 -08:00
Daniel Nephin 167b3f95b7 Set default values for uid and gid to prevent errors when starting a service.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 12:00:46 -05:00
Daniel Nephin b4f23bbc69 Rebase Compose v3.1 schema on the latest v3 schema.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 11:33:15 -05:00
Daniel Nephin f0a5531c46 Remove secrets as part of stack remove.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 11:33:15 -05:00
Daniel Nephin b3427e43ed Test and fix external secrets in stack deploy.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 11:33:15 -05:00
Daniel Nephin 6ec84ef76d Add integration test for stack deploy with secrets.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 11:33:15 -05:00
Daniel Nephin 9419e7df2b Implement secret types for compose file.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 11:33:15 -05:00
Daniel Nephin 65374488f9 Add v3.1 schema and support validating multiple version.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-26 11:33:15 -05:00
Sebastiaan van Stijn fe5f49685d Merge pull request #30111 from darrenstahlmsft/DependsConDrv
Windows: Add service dependency ConDrv
2017-01-26 12:49:05 +01:00
Sebastiaan van Stijn bc18cfa3f3 Merge pull request #28921 from allencloud/remove-incorrect-url
update an incorrect url in docs
2017-01-26 10:29:12 +01:00
allencloud 5ae95d6245 update incorrect url in docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-01-26 12:57:45 +08:00
Harald Albers 93e43b42be Rename helper function in bash completion for consistency
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-25 15:55:04 -08:00
Harald Albers fceaae95b5 Hide bash completion for `docker run|create|build --isolation` on non-windows
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-25 15:55:04 -08:00
Kenfe-Mickaël Laventure db657a558e Merge pull request #30376 from albers/completion-fix-node-list
Fix bash completion for completing nodes
2017-01-25 11:52:13 -08:00
Yong Tang 05a831a775 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>
2017-01-25 09:39:55 -08:00
Alexander Morozov a76572b846 Merge pull request #30330 from mlaventure/prune-named-untagged
Prune named but untagged images if danglingOnly=true
2017-01-25 08:38:15 -08:00
Harald Albers f2ee29ed96 Add windows specific bash completion for `docker run|create`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-25 10:24:27 +01:00
Aaron Lehmann e9c0de0de6 Merge pull request #30043 from dmcgowan/distribution-reference-update-1
Distribution reference update
2017-01-24 20:38:20 -08:00
Sebastiaan van Stijn d4cd4b2164 Merge pull request #30182 from AkihiroSuda/validate-tmpfs
validate mount path for tmpfs
2017-01-25 03:08:17 +01:00
Victor Vieux 42d25de1b7 Merge pull request #30291 from yongtang/30279-ps-format
Fix failure in `docker ps --format` when `.Label` has args
2017-01-24 17:55:52 -08:00
Sebastiaan van Stijn 9b2dabbf18 Merge pull request #30227 from thaJeztah/fix-ineffectual-assignments
fix some ineffectual assignments (and minor fixes)
2017-01-25 02:49:57 +01:00
Victor Vieux 113e9f07f4 Merge pull request #30408 from cpuguy83/fix_plugin_wait
Fix deadlock on v1 plugin with activate error
2017-01-24 17:29:56 -08:00
Victor Vieux 4726fd1203 Merge pull request #30325 from dnephin/add-internal-to-compose-network
Add network.internal to Compose schema
2017-01-24 17:16:08 -08:00
Aaron Lehmann 3c82a9bc27 Merge pull request #30206 from coolljt0725/fix_save_share_layers
Follow #28926, fix docker save can't share layers in the tar archive.
2017-01-24 16:28:11 -08:00
Brian Goff f07f54951f Merge pull request #30269 from sdurrheimer/zsh-completion-service-ps-multi
Add zsh completion for multiple service for 'docker service ps'
2017-01-24 16:33:30 -05:00
Kenfe-Mickaël Laventure 5e74dc11e3 Merge pull request #30391 from andrewhsu/check-changelog-date
validate CHANGELOG.md dates are in descending order
2017-01-24 11:18:21 -08:00
Michael Crosby b13ecbc7b5 Merge pull request #30283 from albers/completion-run--init-path
Add bash completion and docs for `docker run|create --init-path`
2017-01-24 10:06:44 -08:00
Vincent Demeester f645ffca04 Merge pull request #30413 from thaJeztah/minor-godocs-fixup
Minor GoDoc fixup in integration-cli
2017-01-24 18:08:27 +01:00
Sebastiaan van Stijn 089e1c1c5b Minor GoDoc fixup in integration-cli
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-24 18:03:30 +01:00
Brian Goff f2d384fca6 Fix deadlock on v1 plugin with activate error
When a plugin has an activation error, it was not being checked in the
`waitActive` loop. This means it will just wait forever for a manifest
to be populated even though it may never come.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-01-24 11:08:13 -05:00
Brian Goff 34d0619074 Merge pull request #30268 from sdurrheimer/zsh-completion-plugin-install-alias
Add zsh completion for 'docker plugin install --alias'
2017-01-24 10:08:57 -05:00
Brian Goff aa180e5f31 Merge pull request #30399 from albers/completion-swarm-lock
Add bash completion for `docker swarm unlock|unlock-key`
2017-01-24 09:43:07 -05:00
Sebastiaan van Stijn 950658bbb6
Add "src" alias for `--secret`
This patch adds a "src" alias for `--secret`
to be consistent with `--mount`.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-24 15:41:45 +01:00
Brian Goff 3bc021cdf3 Merge pull request #30398 from albers/completion-swarm-init
Add missing options to bash completion for `docker swarm init|update`
2017-01-24 09:41:30 -05:00
Brian Goff 47da8175be Merge pull request #30373 from albers/completion-fix-service-update
Fix bash completion for `docker service update`
2017-01-24 09:31:53 -05:00
Brian Goff ee7682ebae Merge pull request #30378 from mlaventure/fix-negative-size
Ensure proper value is used when computing reclaimable space
2017-01-24 09:24:53 -05:00
Vincent Demeester 23341a41a5 Merge pull request #30394 from aboch/nl
Vendor vishvananda/netlink @ebdfb74
2017-01-24 15:24:07 +01:00
Vincent Demeester d417dd7886 Merge pull request #30248 from albers/completion-capabilities
Improve bash completion for `docker run --cap-{add,drop}`
2017-01-24 12:10:14 +01:00
Sebastiaan van Stijn d1f7798c60 Merge pull request #30370 from mikesir87/master
Fixed secret creation usage during service create in docs
2017-01-24 11:55:09 +01:00
Sebastiaan van Stijn de1a403810 Merge pull request #30387 from coolljt0725/fix_typo
typo: fix typo in api documents
2017-01-24 11:46:44 +01:00