0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
30103 commits 14 branches 412 tags 338 MiB
Commit graph

30103 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Nephin
16bdbaaa33 Convert ContainerTopOKResponse from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-03 11:47:47 -05:00
Daniel Nephin
8d5f558de0 Generate GraphDriver from spec, and fix up image spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-03 11:47:47 -05:00
Daniel Nephin
5988b84e4f Generate ImageDeleteResponse from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-03 11:47:47 -05:00
Daniel Nephin
b462c93edb Generate ImageHistory from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-03 11:47:44 -05:00
Daniel Nephin
b83d9bf6a9 Generate ContainerChanges from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-03 09:35:40 -05:00
Vincent Demeester
884a1c2263 Merge pull request #29837 from miaoyq/remove-extra-if-statement 
Remove the redundant 'if' statements
 2017-01-03 12:42:19 +01:00
Vincent Demeester
18265591c2 Merge pull request #25234 from yongtang/25228-service-ps-multiple-ID 
Support multiple service IDs on "docker service ps"
 2017-01-03 12:40:24 +01:00
Vincent Demeester
de709ebfd8 Merge pull request #29827 from vdemeester/integration-fixes-for-userns 
Updates some integration tests to fix userns builds
 2017-01-03 11:47:39 +01:00
Sebastiaan van Stijn
275d68ab39 Merge pull request #29828 from vdemeester/integration-deleteContainer-ignore-notfound 
Do not fail in `TearDown` if container not found when removing
 2017-01-03 11:35:07 +01:00
Vincent Demeester
1a6436510a Merge pull request #29791 from yuexiao-wang/add-secret-stack 
Update reference document for secret and stack
 2017-01-03 10:54:28 +01:00
yuexiao-wang
7bb31f3168 Update reference document for secret and stack 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2017-01-04 01:39:45 +08:00
Vincent Demeester
2fd995bc99 Merge pull request #29773 from forever043/fix_TestDaemonStartWithoutColors 
test: Fix "--raw-logs=true" option test in TestDaemonStartWithoutColors
 2017-01-03 09:29:19 +01:00
Yanqiang Miao
98c0369437 Remove the redundant 'if' statements 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2017-01-03 11:31:41 +08:00
Vincent Demeester
636d6ee57c
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>
 2017-01-02 22:14:24 +01:00
Vincent Demeester
173ce768d6 Merge pull request #29822 from thaJeztah/fix-minor-typo 
fix "retreive" typo in plugin store
 2017-01-02 21:30:29 +01:00
Vincent Demeester
187592583c Merge pull request #29806 from albers/fix-plugin-inspect-usage 
Fix usage message of `plugin inspect`
 2017-01-02 19:30:24 +01:00
Vincent Demeester
bc19388fb2
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>
 2017-01-02 19:13:26 +01:00
Sebastiaan van Stijn
8a3ede3d5d Merge pull request #29818 from vdemeester/remove-cli-service-deadcode 
Remove deadcode from `service/opts.go` : `SecretOpt`
 2017-01-02 18:01:10 +01:00
Brian Goff
95a52ef687 Merge pull request #29783 from sanimej/check-config 
Update check-config.sh to include modules for FTP/TFTP
 2017-01-02 10:24:40 -05:00
Sebastiaan van Stijn
ed689c48b0 Merge pull request #29799 from vdemeester/integration-registry-package 
[test-integration] Add a registry package with registry v1/v2 code
 2017-01-02 15:37:09 +01:00
Sebastiaan van Stijn
03bf37884d
fix "retreive" typo in plugin store 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-01-02 15:01:19 +01:00
Sebastiaan van Stijn
86f962a4a8 Merge pull request #29808 from jmzwcn/issue29796 
API: Delete container can return 409, but that isn't documented.
 2017-01-02 14:41:03 +01:00
Akihiro Suda
3cd445cda4 Merge pull request #29797 from vdemeester/remove-pkg-integration 
Remove pkg/integration and move it to testutil or integration-cli
 2017-01-02 19:31:38 +09:00
Vincent Demeester
84cb2d100b
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>
 2017-01-02 11:19:33 +01:00
Vincent Demeester
4300e5e881
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>
 2017-01-02 11:03:53 +01:00
Vincent Demeester
314ae90243 Merge pull request #29805 from albers/completion-plugin-enable 
Fix bash completion for `plugin enable|disable`
 2017-01-01 17:54:43 +01:00
Daniel Zhang
c0cf14a73c API: Delete container can return 409, but that isn't documented. #29796 
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
 2017-01-01 16:01:56 +08:00
Harald Albers
1b58d0bc51 Fix usage message of plugin inspect 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-12-31 09:55:04 -08:00
Harald Albers
e1403453f0 Add bash completion for plugin disable --force 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-12-31 09:28:03 -08:00
Harald Albers
390effdd11 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>
 2016-12-31 09:23:46 -08:00
Sebastiaan van Stijn
997777ae92 Merge pull request #29803 from thaJeztah/document-hide-legacy-commands 
document DOCKER_HIDE_LEGACY_COMMANDS env-var
 2016-12-31 14:59:11 +01:00
Sebastiaan van Stijn
2ef82fd237
document DOCKER_HIDE_LEGACY_COMMANDS env-var 
The `DOCKER_HIDE_LEGACY_COMMANDS` environment
variable was added in a7c8bcac2b
but not documented.

This adds the variable to the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-12-31 14:17:34 +01:00
Vincent Demeester
33968e6c7d
Remove pkg/integration and move it to testutil or integration-cli 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-30 18:26:34 +01:00
Vincent Demeester
5374d53322 Merge pull request #29774 from miaoyq/complete-plugin-create-docs-content 
Complete the document content
 2016-12-30 11:15:16 +01:00
majiuyue 00385406
c9e0d923ae 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>
 2016-12-30 17:26:01 +08:00
Yanqiang Miao
1ebb68053e 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>
 2016-12-30 08:47:08 +08:00
Sebastiaan van Stijn
a331056268 Merge pull request #28852 from miaoyq/rename-log-context 
Rename 'context' to 'loginfo' in the logger module
 2016-12-30 01:13:49 +01:00
Sebastiaan van Stijn
d6be0e9802 Merge pull request #28631 from likel/master 
Don't do format if it's unnecessary
 2016-12-30 01:13:12 +01:00
Sebastiaan van Stijn
36ed7d58bb Merge pull request #29721 from coolljt0725/follow_29365 
Follow up #29365, fix fail to remove container after restart
 2016-12-30 00:13:13 +01:00
Tõnis Tiigi
edaa3c6f07 Merge pull request #29609 from dnephin/add-compose-file-package 
Replace the vendored aanand/compose-file with a local copy
 2016-12-29 15:12:59 -08:00
Tõnis Tiigi
aacc2c8880 Merge pull request #29624 from yongtang/29619-build-label-order 
Sort the labels passed from `build --labels`
 2016-12-29 15:09:53 -08:00
Sebastiaan van Stijn
a247bf0e99 Merge pull request #29661 from vdemeester/integration-cli-test-environment 
[integration-test] Introduce an environment package
 2016-12-29 22:12:42 +01:00
Santhosh Manohar
e475136208 Update check-config.sh to include modules for FTP/TFTP 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-12-29 13:04:36 -08:00
Brian Goff
11b11e1559 Merge pull request #29769 from duglin/FixWinTest 
Fix flaky windows TestRestartRunningContainer test
 2016-12-29 15:48:43 -05:00
Sebastiaan van Stijn
1dd9410776 Merge pull request #29683 from vdemeester/runconfig-clean 
Clean some stuff from runconfig that are cli only…
 2016-12-29 17:42:08 +01:00
Sebastiaan van Stijn
156ee50834 Merge pull request #29770 from allencloud/fail-fast-when-filter-invlaid 
fail fast when network filter invalid
 2016-12-29 17:38:08 +01:00
Doug Davis
bae22d167c 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>
 2016-12-29 08:13:43 -08:00
Vincent Demeester
83cecf820a Merge pull request #29517 from thaJeztah/update-criu 
Update criu to 2.9
 2016-12-29 16:20:59 +01:00
Sebastiaan van Stijn
00cdb97f0d Merge pull request #29222 from yongtang/28789-plugin-inspect-follow-up 
Allow ID-based `docker plugin enable/disable/rm/set`
 2016-12-29 13:40:40 +01:00
Yanqiang Miao
17ec911da7 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>
 2016-12-29 19:13:44 +08:00