Commit Graph

31631 Commits

Author SHA1 Message Date
ca2d19d2b7 Use Container.Config.Shell instead of hardcoded…
… for healthcheck. It make the code a little cleaner and more
future/usage proof.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 5f81cf11f648835bd0182d297d265a4da6c469dd
Component: engine
2016-11-15 17:53:24 +01:00
68648e07db move func getNetwork into helper.go to keep consistent
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 729b49e9c546c035788e60ea137b0958d10aadde
Component: engine
2016-11-16 00:28:56 +08:00
60d7f3af29 Don't validate platform-dep tmpfs opts on client
Daemon still does validation and errors out on incorrect options.

Fixes an issue where non-Linux clients attempting to pass tmpfs options
on `docker run` to a Linux daemon will incorrectly error out.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b9b8d8b364a14b6f827c9db94f651dda372ed253
Component: engine
2016-11-15 11:01:40 -05:00
fadee20b95 Build docker incrementally by default
This speeds up docker build time drastically. It still possible to
disable this by setting `DOCKER_INCREMENTAL_BUILD` to `0` (and this is
what should be done on the CI).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2c342cff79d6e781e06258cefcd2b2b1a23396ec
Component: engine
2016-11-15 16:23:48 +01:00
30a799b2f0 Merge pull request #28435 from jonboulle/master
man/docker: wrap lines consistently
Upstream-commit: 03f79a211514e26be8920afd3b611b64e5810375
Component: engine
2016-11-15 15:47:05 +01:00
133f7a9bd3 deprecate "top-level" network information in NetworkSettings
When inspecting a container, `NetworkSettings` contains top-level
information about the default ("bridge") network;

`EndpointID`, `Gateway`, `GlobalIPv6Address`, `GlobalIPv6PrefixLen`,
`IPAddress`, `IPPrefixLen`, `IPv6Gateway`, and `MacAddress`.

These properties are deprecated in favor of per-network properties in
`NetworkSettings.Networks`. These properties were already "deprecated" in
docker 1.9, but kept around for backward compatibility.

Refer to [#17538](https://github.com/docker/docker/pull/17538) for further
information.

This officially deprecates these properties, and marks them
for removal in 1.16

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ae6f09b29ccbcd11c842d5b8cf319d7ce2da41be
Component: engine
2016-11-15 15:41:52 +01:00
051e7426f6 Merge pull request #28422 from yuexiao-wang/update-driver
Modify serial number and fix some typos
Upstream-commit: 95c898d1f99ae0f84a5fce83b57728143a0db064
Component: engine
2016-11-15 15:04:32 +01:00
e162db2213 man/docker: wrap lines consistently
Quite a few changes, as it seems like previous wrapping was done
manually, so it's all over the place.

As noted in #28424

Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com>
Upstream-commit: ba408fbc9a3131d03bb5389e73cb9eec49e071be
Component: engine
2016-11-15 22:46:25 +09:00
ba476fa907 Merge pull request #28419 from yuexiao-wang/remove-stack-tasks
Remove inexistent link and add related links
Upstream-commit: 101676a591793755e43d21c1ab061f1fd4c37551
Component: engine
2016-11-15 13:51:46 +01:00
f1966cf855 Merge pull request #26868 from Microsoft/jjh/deprecateemail
1.14 deprecation: email from login
Upstream-commit: c716827dc8de961ad2e69b2db2cb32a3749282da
Component: engine
2016-11-15 13:08:05 +01:00
cfe86197f0 Merge pull request #28384 from bbayani/28295_live_restore_unsupported_win
Updated daemon documentation to clarify that live-restore is not supp…
Upstream-commit: b6e1f11105e21ed30c5d6a47c31ca348a8282937
Component: engine
2016-11-15 11:06:26 +01:00
7d7de1cea4 Merge pull request #28424 from jonboulle/master
man page: consistent indents for flag descriptions
Upstream-commit: 832833db4856fd1a7e1933b8e76a726783ef261b
Component: engine
2016-11-15 10:45:42 +01:00
afebcb8b49 Modify serial number and fix some typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 9ddd1242dbaeaa990c060b7b88ed859fa3b2d981
Component: engine
2016-11-15 17:15:26 +08:00
3a03fb540c Updated daemon documentation to clarify that live-restore is not suppoted on windows
Review comment implementation

Signed-off-by: bbayani <bhumikabayani@gmail.com>
Upstream-commit: 45bccaeacbc80f28861bd7fe9cb73007b493b11f
Component: engine
2016-11-15 07:07:43 +00:00
59bf8f29e4 man page: consistent indents for flag descriptions
Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com>
Upstream-commit: 8eeaa2556399f90ad637f74401a6f11c01b7544c
Component: engine
2016-11-15 14:59:47 +09:00
94bcd2ce8a update tini to a87614212b3a51a9cad57ff7989103a841546745
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: b1a91dcc0f0ba0bbad1d70943b423464b500657f
Component: engine
2016-11-14 17:47:04 -08:00
593e5eb2d5 Windows: Use sequential file access
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 7c29f5beed19b55ac8f14880752d4825ba23eccf
Component: engine
2016-11-14 17:41:52 -08:00
775645f6c4 Remove inexistent link and add related links
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 985cc9fb053e82967a4469cd5f278271b914480c
Component: engine
2016-11-15 09:40:44 +08:00
f960448660 Merge pull request #28417 from Microsoft/jjh/autogen
Gitignore dockerversion\version_autogen_unix.go
Upstream-commit: da32371922dc5b68cf81a28534e1889a2748ecd7
Component: engine
2016-11-14 17:32:15 -08:00
6a99bf05f6 Merge pull request #28418 from anusha-ragunathan/disable_with_grace
Perform graceful shutdown during plugin disable.
Upstream-commit: eb3a4892467c0dfdd357b1cc37f7ca3623e15119
Component: engine
2016-11-14 20:27:11 -05:00
fb65149136 Merge pull request #28292 from lixiaobing10051267/masterDockerSwarm
fix the wrong title with docker swarm
Upstream-commit: ccba7911c80583c1a45ea329a8d337dcd4f6f70e
Component: engine
2016-11-15 00:37:07 +01:00
cd8c39a1d4 Updating docker/distribution vendoring
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: d910781c66262af95646d7a0b564d254afc4af8f
Component: engine
2016-11-14 15:31:25 -08:00
70d8e3de49 Merge pull request #28380 from sdurrheimer/zsh-completion-build-network
Add zsh completion for 'docker image build --network'
Upstream-commit: 35ee642feb0db7cc29605935182d98434b27907e
Component: engine
2016-11-15 00:30:30 +01:00
a8254f6ffd Gitignore dockerversion\version_autogen_unix.go
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e2adb5560b6ef666beb69de53028925098a952c9
Component: engine
2016-11-14 15:18:23 -08:00
195add3182 Perform graceful shutdown during plugin disable.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 766cc9b46753106c6880ccdea0a4dcb2bc734c2a
Component: engine
2016-11-14 15:09:48 -08:00
bfcd54d462 Merge pull request #28340 from cpuguy83/28337_fix_template_opts_ps
Fix issue with missing fields for `ps` template
Upstream-commit: 8930aa0a8615b02905c5f33c00ddef383bdc2193
Component: engine
2016-11-14 14:25:01 -08:00
900e9ed78b Bump API to v1.26
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9182cf1a8dc592c40d25b628a0a3cfa475c8dcea
Component: engine
2016-11-14 14:24:02 -08:00
b92b18a87d Merge pull request #27985 from muayyad-alsadi/17734-better-message-for-host-volumes
fixes #17734, clear message for host volumes not starting with /
Upstream-commit: b06dc994f683fb774be2cfe70d76feb0f684c70e
Component: engine
2016-11-14 14:21:17 -08:00
b8e423e3ed Windows: Allow user in builder
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a3c4ab9b657018cf6fc33e70a44c790563c16043
Component: engine
2016-11-14 14:10:47 -08:00
87e4b91e48 Merge pull request #28410 from cpuguy83/move_streamconfig
Move `StreamConfig` out of `runconfig`
Upstream-commit: 65835bfaa6d44b2255ed25eab74ebcdc8b3ba491
Component: engine
2016-11-14 21:50:52 +00:00
ad9327f119 Move StreamConfig out of runconfig
`StreamConfig` carries with it a dep on libcontainerd, which is used by
other projects, but libcontainerd doesn't compile on all platforms, so
move it to `github.com/docker/docker/container/stream`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5ea75bb6bf41aeaeaa15d8bcceea5be87c211ffc
Component: engine
2016-11-14 15:15:09 -05:00
d964d54555 Merge pull request #28397 from anusha-ragunathan/plugin_push_docs
Add docs for plugin push
Upstream-commit: bf7759cb75205c66ccf318334eb08f7bee593c74
Component: engine
2016-11-14 11:22:49 -08:00
80ee24a55b Merge pull request #28341 from johnstep/show-experimental
Show experimental flags and subcommands if enabled
Upstream-commit: 27b673bb8143856d308fac1b2e8e39c80fe914f8
Component: engine
2016-11-14 11:18:09 -08:00
c932aa3c77 Add docs for plugin push
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: d2bb29f87e326034e4329e31f3208d8f610ccef7
Component: engine
2016-11-14 09:10:21 -08:00
27381440fb Merge pull request #28280 from yuexiao-wang/remove-doc
Remove duplicated document
Upstream-commit: 6cf39760418ab2341e00040d7eecc19542aa9337
Component: engine
2016-11-14 17:34:47 +01:00
3b746165af remove "starting with /"
Signed-off-by: Muayyad Alsadi <alsadi@gmail.com>
Upstream-commit: 2d3df91436a096e17214fc56aee4968c3fe598de
Component: engine
2016-11-14 16:51:29 +02:00
41dd2ecf80 Merge pull request #28378 from sdurrheimer/zsh-completion-service-dns
Add zsh completion for 'docker service' DNS settings
Upstream-commit: a27e51ea9842ec0ac3cfc98bb391b7debd20e706
Component: engine
2016-11-14 15:46:05 +01:00
3715fc37cc Merge pull request #28386 from sdurrheimer/zsh-completion-service-secret
Add zsh completion for 'docker service {create,update} --secret'
Upstream-commit: b661338d87e219136ce467df49b2a1247a8742d4
Component: engine
2016-11-14 15:23:03 +01:00
1972d4f850 Merge pull request #28365 from wefine/fix-t-errorf
fix t.Errorf to t.Error in serveral _test.go
Upstream-commit: 21051de6e1ba928a08baff505a7d89532b6133eb
Component: engine
2016-11-14 14:46:30 +01:00
ae0437f374 Add zsh completion for 'docker service {create,update} --secret'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 0bc07d29577bf163eb88c4047e52382218dd4026
Component: engine
2016-11-14 13:38:48 +01:00
516defc10d Merge pull request #28344 from albers/completion-service--ports
Add bash completion for managing ports in services
Upstream-commit: e129365fd371eba3fcf3d8e64bb1a12a297d0323
Component: engine
2016-11-14 12:40:36 +01:00
12f5dc9d03 Merge pull request #28381 from sdurrheimer/zsh-completion-secret-command
Add zsh completion for the new 'docker secret' command
Upstream-commit: 7ee0c3c9f81cd87e61ecf199eeca0b60bda0c3aa
Component: engine
2016-11-14 12:14:25 +01:00
7a9630020f fix t.Errorf to t.Error in serveral _test.go
Signed-off-by: wefine <wang.xiaoren@zte.com.cn>
Upstream-commit: f78f7de96aebee64b55bb9955fa6c97be2c59662
Component: engine
2016-11-14 17:54:43 +08:00
3e5a34af4b Merge pull request #28203 from shaynewang/27687-fix-tail-flag-returning-more-lines
Fixes #27687 docker logs --tails returns less lines than expected
Upstream-commit: 28094357ed3f7238e533b870a4e24676c6102f2e
Component: engine
2016-11-14 10:17:38 +01:00
afb911f1fd Add zsh completion for 'docker service' DNS settings
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 54ebf4f74a5e8f6598849da4a9052743ada8e83f
Component: engine
2016-11-14 09:45:27 +01:00
2169a7a10e Merge pull request #28369 from yongtang/11132016-completion-dns-option
Update bash completion `dns-options-add/rm` -> `dns-option-add/rm`
Upstream-commit: e7769e29e00394ccac3d1eabb0efff92864c30da
Component: engine
2016-11-14 16:39:28 +09:00
f7b1bf984c Add zsh completion for the new 'docker secret' command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b184bdabf7a01c4b802304ac64ac133743c484be
Component: engine
2016-11-14 08:24:19 +01:00
534b21da59 Add zsh completion for 'docker image build --network'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 11bfa638fe5b5fecf16341d4d7154c233862d946
Component: engine
2016-11-14 08:22:09 +01:00
f67a1e9e2b Remove duplicated document
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 5527202e41dfa48b8635dd6f274acb7f19ee3302
Component: engine
2016-11-14 14:43:00 +08:00
178e6d0499 Merge pull request #28370 from yongtang/11132016-docs-typo
Fix a small typo in `docs/deprecated.md`
Upstream-commit: 2b5f1050cc2b4ebfdb0c50c73a958a45c62a899c
Component: engine
2016-11-14 13:34:03 +08:00