8b3646ee75
plugingetter: Avoid all caps for constant declarations
...
Go style calls for mixed caps instead of all caps:
https://golang.org/doc/effective_go.html#mixed-caps
Change LOOKUP, ACQUIRE, and RELEASE to Lookup, Acquire, and Release.
This vendors a fork of libnetwork for now, to deal with a cyclic
dependency issue. The change will be upstream to libnetwork once this is
merged.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 428600108cce0a11e65ec4ebd9e439e947b55da7
Component: engine
2017-01-04 10:19:04 -08:00
8965c03605
Merge pull request #29861 from Microsoft/jjh/tidywinkv
...
Tidy kernel version in tests
Upstream-commit: 03c17ab66a3d1adc2e6c3e0ac436afe43bcfd3b1
Component: engine
2017-01-04 15:48:20 +01:00
85a740c504
Merge pull request #29650 from allencloud/support-registry-mirror-config-reload
...
support registry mirror config reload
Upstream-commit: d3f30d6a67577a52162b36a1af13eb4167e48c6b
Component: engine
2017-01-04 13:46:19 +01:00
548c0ae5fe
Merge pull request #29697 from yuexiao-wang/fix-docker-daemon
...
Update docker daemon to dockerd
Upstream-commit: 6129e6ce3ebd1bd6c9db76e196248c613fda6e40
Component: engine
2017-01-04 11:55:38 +01:00
e7cd6e9e80
support registry mirror config reload
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 5b9348c553d183bc62f6e7cc8f934766fac162bd
Component: engine
2017-01-04 11:04:00 +08:00
e5d82b6a00
Merge pull request #29431 from vieux/update_plugin_examples
...
replace no-remove by sample-volume-plugin in docs
Upstream-commit: 355f2ae972cc6b5070d14c16113bc9da076561d4
Component: engine
2017-01-03 18:05:44 -08:00
25dd6a8c20
Merge pull request #29733 from cpuguy83/fix_v1plugin_deadlock
...
Fix race/deadlock in v1 plugin handlers
Upstream-commit: 48ed4f0639d2f290603a04ec146beb3f9569280f
Component: engine
2017-01-03 17:02:15 -08:00
17d62dfc95
replace no-remove by sample-volume-plugin in docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: bcead9282e17f51b01c4edfa59221546f02aaa33
Component: engine
2017-01-03 16:03:48 -08:00
ad9d96a397
Merge pull request #29862 from dnephin/strip-quotes-from-args
...
Trim quotes from tls flag values
Upstream-commit: 8e64ca31f2822eb5d11e4b14de59ed3555ef21a1
Component: engine
2017-01-03 15:21:19 -08:00
59c3c898d1
Merge pull request #29852 from thaJeztah/bump-go-units
...
bump go-units to e30f1e79f3cd72542f2026ceec18d3bd67ab859c
Upstream-commit: 59f6f6bc0173a0ffbaac001e07c40de18af9def4
Component: engine
2017-01-04 07:54:45 +09:00
cb7b1468a9
Merge pull request #29789 from miaoyq/optimization-error-description
...
Optimization a error description
Upstream-commit: ef9935ce8f4acf5d53db0a2f9621f9135aed442b
Component: engine
2017-01-03 13:01:22 -08:00
77a99bbc10
Trim quotes from TLS flags.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: abe32de6b46825300f612864e6b4c98606a5bb0e
Component: engine
2017-01-03 15:58:41 -05:00
ecc03f8a8a
Tidy kernel version in tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b06692b1a94572cd60ca066efc85107b629f30f1
Component: engine
2017-01-03 12:47:25 -08:00
4224f41161
Add quoted string flag Value.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e4c1f0772923c3069ce14a82d445cd55af3382bc
Component: engine
2017-01-03 15:09:54 -05:00
cee6d6487a
Merge pull request #29556 from mavenugo/refcount
...
Fixing a couple of network plugin life-cycle mgmt issues
Upstream-commit: 2ef6d8045415899b3faf8b68c0c732aa8c18917d
Component: engine
2017-01-03 11:13:22 -08:00
e9e565840f
Merge pull request #29843 from YuPengZTE/devVet
...
fix syscall.GUID composite literal uses unkeyed fields
Upstream-commit: d1ef47b41003060a5f4d9093b9cd4c778f98b297
Component: engine
2017-01-03 19:12:32 +01:00
65fe131f80
bump go-units to e30f1e79f3cd72542f2026ceec18d3bd67ab859c
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0e16b5cb3adc16898aae7e1ed532a588b3ef2c95
Component: engine
2017-01-03 18:43:25 +01:00
0cb4581486
Merge pull request #26830 from dnephin/man-desc-in-files
...
Move the command description to a markdown file for man pages
Upstream-commit: e4223e33617b9964ea5ecc5a4782171eea7b35d6
Component: engine
2017-01-03 17:47:49 +01:00
12b8dd0635
Merge pull request #29847 from albers/completion-service-ps-multiple
...
Support multiple services on bash completion for `docker service ps`
Upstream-commit: d6e50324102715f886632081662a543e70ccf5f8
Component: engine
2017-01-03 17:13:07 +01:00
7e1c259422
Merge pull request #29776 from allencloud/better-plugin-in-docs
...
update plugins in docs and correct things in index.md
Upstream-commit: 074f6bbe890eccd85ef22e918e7525685c14bffa
Component: engine
2017-01-03 17:01:56 +01:00
6a0d19c8f7
update plugins in docs and correct things in index.md
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 6d3e1d2fd29cfd7446ab62ac2f3ccb2b3e277ef2
Component: engine
2017-01-03 22:34:32 +08:00
23840329aa
Support multiple services on bash completion for docker service ps
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 3f5d11c9bfd7c2a674a6a78d5f1b362273d53133
Component: engine
2017-01-03 05:58:13 -08:00
6c03412403
Merge pull request #29837 from miaoyq/remove-extra-if-statement
...
Remove the redundant 'if' statements
Upstream-commit: 884a1c2263dce2ec2c2992adfd0e80e8b2af52c9
Component: engine
2017-01-03 12:42:19 +01:00
eb7043f1ff
Merge pull request #25234 from yongtang/25228-service-ps-multiple-ID
...
Support multiple service IDs on "docker service ps"
Upstream-commit: 18265591c2ae16b2fc831e9922fb27542f97fcf6
Component: engine
2017-01-03 12:40:24 +01:00
cc2e0536c6
Merge pull request #29827 from vdemeester/integration-fixes-for-userns
...
Updates some integration tests to fix userns builds
Upstream-commit: de709ebfd891ca44db35353f800d674a8e09a18e
Component: engine
2017-01-03 11:47:39 +01:00
fabb4a866d
Merge pull request #29828 from vdemeester/integration-deleteContainer-ignore-notfound
...
Do not fail in `TearDown` if container not found when removing
Upstream-commit: 275d68ab39c0e880f26910bfda562d8a63e9d766
Component: engine
2017-01-03 11:35:07 +01:00
ea3cfbda7f
Merge pull request #29791 from yuexiao-wang/add-secret-stack
...
Update reference document for secret and stack
Upstream-commit: 1a6436510a9844be2eb77d7f4c278df49fef48f9
Component: engine
2017-01-03 10:54:28 +01:00
ca3b78dbe8
Update reference document for secret and stack
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 7bb31f3168aa022a20c37b0b1cb1942fd553717f
Component: engine
2017-01-04 01:39:45 +08:00
c880e6de34
fix syscall.GUID composite literal uses unkeyed fields
...
Signed-off-by: yupengzte <yu.peng36@zte.com.cn >
Upstream-commit: 230b7c2e4c3a33731580a1613b47c183c6ee06e6
Component: engine
2017-01-03 17:12:15 +08:00
a520da946c
Merge pull request #29773 from forever043/fix_TestDaemonStartWithoutColors
...
test: Fix "--raw-logs=true" option test in TestDaemonStartWithoutColors
Upstream-commit: 2fd995bc999702bba49a802f7f054f657e1041fb
Component: engine
2017-01-03 09:29:19 +01:00
9b9641ce23
Remove the redundant 'if' statements
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 98c036943794383094e00cfb0c16d460593375bf
Component: engine
2017-01-03 11:31:41 +08:00
7cbb50d925
Do not fail in TearDown if container not found when removing
...
If the container is not found when removing, it means it's already not
there anymore, so it's safe to ignore. This should reduce a bit some
`TearDown` flakyness..
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 636d6ee57c85df086823e998077d83dc0bb94035
Component: engine
2017-01-02 22:14:24 +01:00
326fa40e58
Merge pull request #29822 from thaJeztah/fix-minor-typo
...
fix "retreive" typo in plugin store
Upstream-commit: 173ce768d66534ef0aa00d131d306bdff1c74ff3
Component: engine
2017-01-02 21:30:29 +01:00
93dfbee84c
Merge pull request #29806 from albers/fix-plugin-inspect-usage
...
Fix usage message of `plugin inspect`
Upstream-commit: 187592583c7ba804e8f52b2594cfd496b4c78072
Component: engine
2017-01-02 19:30:24 +01:00
c01c194858
Updates some integration tests to fix userns builds
...
- `TestRunMountReadOnlyDevShm` and `TestRunHostnameInHostMode` needs
`NotUserNamespace` requirement as these are known limitation of
userns.
- `TestBuildWorkdirCmd` should use a preload image (`busybox`) instead
of one that require network access.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: bc19388fb239b1aa761d323405a7d6a6362845f4
Component: engine
2017-01-02 19:13:26 +01:00
0e306f91de
Merge pull request #29818 from vdemeester/remove-cli-service-deadcode
...
Remove deadcode from `service/opts.go` : `SecretOpt`
Upstream-commit: 8a3ede3d5da54699882f492d2fdc0152e05c9960
Component: engine
2017-01-02 18:01:10 +01:00
92128d9a7c
Merge pull request #29783 from sanimej/check-config
...
Update check-config.sh to include modules for FTP/TFTP
Upstream-commit: 95a52ef687b9b2fe4398cf3309adc00d05698a9e
Component: engine
2017-01-02 10:24:40 -05:00
9966a465fe
Merge pull request #29799 from vdemeester/integration-registry-package
...
[test-integration] Add a registry package with registry v1/v2 code
Upstream-commit: ed689c48b08f393fbb652681b9b3e859380ae5e3
Component: engine
2017-01-02 15:37:09 +01:00
cafa442cac
fix "retreive" typo in plugin store
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 03bf37884d089b69fd7e05491eff658420f40c5d
Component: engine
2017-01-02 15:01:19 +01:00
a662afefad
Merge pull request #29808 from jmzwcn/issue29796
...
API: Delete container can return 409, but that isn't documented.
Upstream-commit: 86f962a4a81d9168fccb6a92299e88e560de49f1
Component: engine
2017-01-02 14:41:03 +01:00
9df5dce1ce
Merge pull request #29797 from vdemeester/remove-pkg-integration
...
Remove pkg/integration and move it to testutil or integration-cli
Upstream-commit: 3cd445cda4a6199afa68f196c4a04ecc078f9fec
Component: engine
2017-01-02 19:31:38 +09:00
c1643b271a
Remove deadcode from service/opts.go, SecretOpt
...
`SecretOpt` is in the `opts` package, this one is never used, so it's
dead code, removing it 👼 .
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 84cb2d100b440db2213588e864d0df58315eb50b
Component: engine
2017-01-02 11:19:33 +01:00
ee40f7aac0
Add a registry package with registry v1/v2 code
...
This extract what was in registry_test.go and
registry_mock_test.go. This also move `RegistryHosting`
requirement to `registry.Hosting`
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4300e5e8818571a55e00d9987bec3ad6ca92dc6f
Component: engine
2017-01-02 11:03:53 +01:00
12538e8dd4
Merge pull request #29805 from albers/completion-plugin-enable
...
Fix bash completion for `plugin enable|disable`
Upstream-commit: 314ae902437f9e5a1169aee7436fb099b145ceff
Component: engine
2017-01-01 17:54:43 +01:00
1fc6e0566f
API: Delete container can return 409, but that isn't documented. #29796
...
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Upstream-commit: c0cf14a73c38bf573803be8bc50af95a411732ba
Component: engine
2017-01-01 16:01:56 +08:00
8f0e0230a0
Fix usage message of plugin inspect
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 1b58d0bc51e2bfc9e268dab762d1d891c18890c9
Component: engine
2016-12-31 09:55:04 -08:00
27bc1bbbd5
Add bash completion for plugin disable --force
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e1403453f0a173464ef209e18e661320100a7b42
Component: engine
2016-12-31 09:28:03 -08:00
fe11e96060
Fix bash completion for plugin enable|disable
...
`docker plugin enable` and `docker plugin disable` only
accept one plugin.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 390effdd11a64f445d9932b6dbc04113b4687dea
Component: engine
2016-12-31 09:23:46 -08:00
7b6b04247c
Merge pull request #29803 from thaJeztah/document-hide-legacy-commands
...
document DOCKER_HIDE_LEGACY_COMMANDS env-var
Upstream-commit: 997777ae9296d7b39537ab70abeb448e948f3a8e
Component: engine
2016-12-31 14:59:11 +01:00
7ecfbf4c71
document DOCKER_HIDE_LEGACY_COMMANDS env-var
...
The `DOCKER_HIDE_LEGACY_COMMANDS` environment
variable was added in a7c8bcac2ba60d6dd25a1157085d9245bed556ce
but not documented.
This adds the variable to the documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2ef82fd23789c906acf9dd06b3be10568ca7191d
Component: engine
2016-12-31 14:17:34 +01:00
