f43a9bc718
Convert ContainerTopOKResponse from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 16bdbaaa3357dc1be7d74a283a3ed8d0d861a461
Component: engine
2017-01-03 11:47:47 -05:00
39aeb042a4
Generate GraphDriver from spec, and fix up image spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 8d5f558de016814ab3629bd0b5b7cc5fd98805b3
Component: engine
2017-01-03 11:47:47 -05:00
c049133b66
Generate ImageDeleteResponse from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5988b84e4fd9a512e3e8f98b3cfd7c030a4f013e
Component: engine
2017-01-03 11:47:47 -05:00
0a6e02b356
Generate ImageHistory from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b462c93edb44790ca309e3721950cb23be5d7d62
Component: engine
2017-01-03 11:47:44 -05:00
483e5a0688
Generate ContainerChanges from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b83d9bf6a9d92731573631ebd077a00e3f60c0cd
Component: engine
2017-01-03 09:35:40 -05: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
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
2758f0996d
Remove pkg/integration and move it to testutil or integration-cli
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 33968e6c7df164fff0a882c50ae7f4f7e6190e4b
Component: engine
2016-12-30 18:26:34 +01:00
0a5cee537e
Merge pull request #29774 from miaoyq/complete-plugin-create-docs-content
...
Complete the document content
Upstream-commit: 5374d53322abd6a5b2ebb34b7422abc26d1b5eb3
Component: engine
2016-12-30 11:15:16 +01:00
31c2689d03
test: Fix "--raw-logs=true" option test in TestDaemonStartWithoutColors
...
Because "tty" is closed in s.d.Stop() for "--raw-logs=false" test,
we need to open another pair of pty before test "--raw-logs=true"
option.
This patch fix #29772 .
Signed-off-by: Jiuyue Ma <majiuyue@huawei.com >
Upstream-commit: c9e0d923ae6d2b5558378183b79d0a85ccf16020
Component: engine
2016-12-30 17:26:01 +08:00
1b2be89310
Complete the document content
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 1ebb68053e17f9b88f1265390acdce20214f2afc
Component: engine
2016-12-30 08:47:08 +08:00
d18def1e2d
Merge pull request #28852 from miaoyq/rename-log-context
...
Rename 'context' to 'loginfo' in the logger module
Upstream-commit: a33105626870bfcbca97052b25b114e005a145ac
Component: engine
2016-12-30 01:13:49 +01:00
6b3d2b6135
Merge pull request #28631 from likel/master
...
Don't do format if it's unnecessary
Upstream-commit: d6be0e98027611cfb14a3246ca797bee0936e649
Component: engine
2016-12-30 01:13:12 +01:00
a767ec924e
Merge pull request #29721 from coolljt0725/follow_29365
...
Follow up #29365 , fix fail to remove container after restart
Upstream-commit: 36ed7d58bb19e46445c81b6a00a7b75a6280e654
Component: engine
2016-12-30 00:13:13 +01:00
ce228c30e5
Merge pull request #29609 from dnephin/add-compose-file-package
...
Replace the vendored aanand/compose-file with a local copy
Upstream-commit: edaa3c6f07385f0c08bc62811508c56d821e696f
Component: engine
2016-12-29 15:12:59 -08:00
7b188d600d
Merge pull request #29624 from yongtang/29619-build-label-order
...
Sort the labels passed from `build --labels`
Upstream-commit: aacc2c88803b4b908a4e565a1dd5f7fafa5e54f0
Component: engine
2016-12-29 15:09:53 -08:00
78bec80aa1
Merge pull request #29661 from vdemeester/integration-cli-test-environment
...
[integration-test] Introduce an environment package
Upstream-commit: a247bf0e99cd782a3c4e87cf70b36bf84f8e780b
Component: engine
2016-12-29 22:12:42 +01:00
bcd39ee4b9
Update check-config.sh to include modules for FTP/TFTP
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: e475136208776f68840f987d751d45690378acf2
Component: engine
2016-12-29 13:04:36 -08:00
771c21fdd2
Merge pull request #29769 from duglin/FixWinTest
...
Fix flaky windows TestRestartRunningContainer test
Upstream-commit: 11b11e1559565aba0e662c8548fd54ebd3a98476
Component: engine
2016-12-29 15:48:43 -05:00
ce3330c6eb
Merge pull request #29683 from vdemeester/runconfig-clean
...
Clean some stuff from runconfig that are cli only…
Upstream-commit: 1dd941077653bc93ee4141c4d2bac90534678e3f
Component: engine
2016-12-29 17:42:08 +01:00
b0d5cafbe4
Merge pull request #29770 from allencloud/fail-fast-when-filter-invlaid
...
fail fast when network filter invalid
Upstream-commit: 156ee508343dc36d6bda7c9d6d3072a201e5ef73
Component: engine
2016-12-29 17:38:08 +01:00
6f964785d6
Fix flaky windows TestRestartRunningContainer test
...
I was seeing this for windowsRS1 testing:
17:20:36 ----------------------------------------------------------------------
17:20:36 FAIL: docker_cli_restart_test.go:31: DockerSuite.TestRestartRunningContainer
17:20:36
17:20:36 docker_cli_restart_test.go:39:
17:20:36 c.Assert(out, checker.Equals, "foobar\n")
17:20:36 ... obtained string = ""
17:20:36 ... expected string = "foobar\n"
17:20:36
17:20:59
17:20:59 ----------------------------------------------------------------------
and I think its because there's a delay between the time the container is
started and the 'echo' is actually run. This gives it up to 10 seconds
to do the 'echo' before giving up.
/cc @jhowardmsft
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: bae22d167cd29016541a6d4f93d38f2608d8e51f
Component: engine
2016-12-29 08:13:43 -08:00
d5d31f8ddb
Merge pull request #29517 from thaJeztah/update-criu
...
Update criu to 2.9
Upstream-commit: 83cecf820a0abbe1fc5be1c70f03a61aa2a164ee
Component: engine
2016-12-29 16:20:59 +01:00
b8997fee88
Merge pull request #29222 from yongtang/28789-plugin-inspect-follow-up
...
Allow ID-based `docker plugin enable/disable/rm/set`
Upstream-commit: 00cdb97f0dea4d41fac8df4813888bb8b945f0d0
Component: engine
2016-12-29 13:40:40 +01:00
cabd6a6108
Rename 'context' to 'loginfo' in the logger module
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
gofmt
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
remove 'api/types/container/config.go' from this PR
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
change 'LogInfo' to 'Info'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 17ec911da7d4b77b069d9f6c8c010865e19acc6c
Component: engine
2016-12-29 19:13:44 +08:00
