Daniel Nephin
27db371a92
Trim quotes from TLS flags.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: fe181a18d5
Component: cli
2017-01-03 15:58:41 -05:00
Daniel Nephin
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
John Howard
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
Timothy Hobbs
91215c83ce
Docs: Be more clear when specifying valid formats for strings
...
- Use the word letter rather than character to refer to letters ;) when trying to specify that only letters and numbers can be used, and not ANY character...
- Small corrections
Fixes #29821
Signed-off-by: Timothy Hobbs <timothy@hobbs.cz >
Upstream-commit: b71b4e1fb9aac5215aff7ce87e1bbb4010054ecd
Component: engine
2017-01-03 21:40:50 +01:00
Daniel Nephin
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
Victor Vieux
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
Vincent Demeester
70eb9ee7f4
Extract the daemon image cache to its own package
...
ImageCache is now independent of `Daemon` and is located in
`image/cache` package.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: be1df1ee1302cffe9825a23c05b5ebde3c6da254
Component: engine
2017-01-03 19:19:27 +01:00
Vincent Demeester
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
bdedcec96e
Merge pull request #26830 from dnephin/man-desc-in-files
...
Move the command description to a markdown file for man pages
Upstream-commit: f2cac1b6e8
Component: cli
2017-01-03 17:47:49 +01:00
Daniel Nephin
875d2b1b22
Convert ContainerTopOKResponse from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9eda7f4daf
Component: cli
2017-01-03 11:47:47 -05:00
Daniel Nephin
2678d8d52e
Set expected response headers for Ping.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 17f9f5abf4cdf72ce6b5f8f2f69e5a872c6a3b56
Component: engine
2017-01-03 11:47:47 -05:00
Daniel Nephin
b3c70d598c
Generate ImageDeleteResponse from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f7e58c8c9b
Component: cli
2017-01-03 11:47:47 -05:00
Daniel Nephin
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
Daniel Nephin
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
Daniel Nephin
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
Daniel Nephin
c5e636a36d
Generate ImageHistory from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 09bd661979
Component: cli
2017-01-03 11:47:44 -05:00
Daniel Nephin
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
Sebastiaan van Stijn
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
Vincent Demeester
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
Daniel Nephin
bff364bed9
Generate ContainerChanges from swagger spec.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0a623b251f
Component: cli
2017-01-03 09:35:40 -05:00
Daniel Nephin
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
allencloud
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
Harald Albers
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
Vincent Demeester
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
Vincent Demeester
2f77390655
Merge pull request #25234 from yongtang/25228-service-ps-multiple-ID
...
Support multiple service IDs on "docker service ps"
Upstream-commit: 636e546aa1
Component: cli
2017-01-03 12:40:24 +01:00
Vincent Demeester
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
Vincent Demeester
44a6bbe938
Add a new request package in integration-cli
...
The goal is to remove function from `docker_utils.go` and setup
simple, one-responsability package that can be well tested ; and to
ease writing request.
This moves all the calls to `sockRequest` (and similar methods) to
their counterpart in the `request` package.
This introduce `request.Do` to write easier request (with functional
argument to easily augment the request) with some pre-defined function
for the most used http method (i.e. `request.Get`, `request.Post` and
`request.Delete`).
Few of the `sockRequest` call have been moved to `request.Do` (and
`Get`, etc.) to showcase the usage of the package. There is still a
whole lot to do.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d69d4799a312dfcae63442e290ae6667afd1a038
Component: engine
2017-01-03 11:49:30 +01:00
Vincent Demeester
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
Sebastiaan van Stijn
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
Vincent Demeester
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
yuexiao-wang
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
yupengzte
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
Vincent Demeester
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
Yanqiang Miao
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
Vincent Demeester
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
Vincent Demeester
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
Vincent Demeester
9501bb1fc3
Merge pull request #29806 from albers/fix-plugin-inspect-usage
...
Fix usage message of `plugin inspect`
Upstream-commit: d3d8379a16
Component: cli
2017-01-02 19:30:24 +01:00
Vincent Demeester
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
Vincent Demeester
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
Sebastiaan van Stijn
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
Brian Goff
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Akihiro Suda
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
Vincent Demeester
ce5e5fc46f
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: b5bc69238c
Component: cli
2017-01-02 11:19:33 +01:00
Vincent Demeester
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
Vincent Demeester
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