0978ffe8f4
Merge pull request #23258 from allencloud/return-err-when-volume-list-fails
...
return err when volume list fails
Upstream-commit: 506e8eda40d4c0efdb9b474fc71c01cabf08e404
Component: engine
2016-06-05 13:24:25 -04:00
5598c44830
Merge pull request #23271 from albers/completion-events-detach
...
bash completion for detach events
Upstream-commit: a15bc261dec0d8d45db13b38eb9768bcdad9fbd5
Component: engine
2016-06-05 11:53:01 -04:00
86b04a6a8a
Merge pull request #22489 from Microsoft/jjh/shell
...
Builder shell configuration
Upstream-commit: df1dd1322d5c9527be7187038ca3480404b1282b
Component: engine
2016-06-05 17:43:12 +02:00
79a999e4d7
bash completion for detach events
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 9c9cbd2c0fbaef9afe740cf9b2acab0768d0fa99
Component: engine
2016-06-05 08:41:58 -07:00
a60f675fa0
Merge pull request #22988 from calavera/use_client_credentials_library
...
Move native credentials lookup to the client library.
Upstream-commit: 0f13b69fe26f98c3e06581dc5c61ce0a5065c739
Component: engine
2016-06-05 16:27:15 +02:00
c20d19fe6d
Use docker-credential-helpers client to talk with native creds stores.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ff3e187cc7a56ce102a61c1a4883f57fb1aed2f7
Component: engine
2016-06-04 10:08:22 -07:00
bd5e8e3754
Vendor docker-credential-helpers v0.3.0
...
Fix a bug in the vendor helpers that took packages
that started with github.com/docker/docker like if
they were from within the project.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: feab8db60da39ecda00c86b34bf5958ae257a14f
Component: engine
2016-06-04 10:06:07 -07:00
cfe1b2e499
Merge pull request #23253 from vdemeester/carry-pr-23159
...
Carry #23159 : Use spf13/cobra for `docker run` and `docker create`
Upstream-commit: 6b4a46f28266031ce1a1315f17fb69113a06efe1
Component: engine
2016-06-04 18:55:23 +02:00
94d397a21a
Merge pull request #23257 from vdemeester/cobra-see-help
...
Cobra - display "See 'docker cmd --help'." in error cases
Upstream-commit: e556d6b6674193d37930edd722095fe487e16a09
Component: engine
2016-06-04 18:37:14 +02:00
b8e65d7c23
return err when volume list fails
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: ed2d300ed054c10da65818904d40cfac678ada6d
Component: engine
2016-06-04 23:24:14 +08:00
36bd8f492b
Display "See 'docker cmd --help'." in error cases
...
This brings back this message in case missing arguments.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6180c5c12e770a4bdf3f505944c9d907e5543fab
Component: engine
2016-06-04 16:19:54 +02:00
30f6f65a88
Merge pull request #23254 from thaJeztah/prepare-for-go-1.7
...
Bump engine-api 772250a752e34cacaeef7c92b8e0ddf43450b629, prepare for go 1.7
Upstream-commit: e975dadaa01de9e651f30ef11ffbc59473f07ae5
Component: engine
2016-06-04 16:07:27 +02:00
f790d372b6
Update TestHttpsInfoRogueCert for Go 1.7
...
The error message changed from
remote error: bad certificate
To
remote error: tls: bad certificate
In Go 1.7, so just checking for "bad certificate"
to make this test work on both Go 1.6 and 1.7
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 496adadcec4ba00d230e546239ddc10e4ea41dcf
Component: engine
2016-06-04 14:17:24 +02:00
e951d738d2
bump engine-api to 772250a752e34cacaeef7c92b8e0ddf43450b629
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ed870716324426c5c5de2e12de48515ef8cbcf39
Component: engine
2016-06-04 14:16:36 +02:00
30e84b2a8a
Merge pull request #23248 from Microsoft/jjh/flakeytest
...
Windows: Turn off TestBuildDockerignoreComment
Upstream-commit: 843720257baf80659729fc5fef5495fe2f7ca170
Component: engine
2016-06-04 14:07:52 +02:00
27d26eeb56
Convert 'docker create' to use cobra and pflag
...
Return the correct status code on flag parsins errors.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5ab24342258c70438ab8edf708ebc466b1677f38
Component: engine
2016-06-04 13:57:30 +02:00
d601c75fe5
Convert 'docker run' to a cobra command and to use pflags
...
Move container options into a struct so that tests should pass.
Remove unused FlagSet arg from Parse
Disable interspersed args on docker run
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a77f2450c70312f8c26877a18bfe2baa44d4abb9
Component: engine
2016-06-04 13:55:35 +02:00
f88056a4aa
Merge pull request #23232 from thaJeztah/update-default-retries
...
Healthcheck: set default retries to 3
Upstream-commit: 3db23a4eaf19d347c486f0f0ae764ea1b84491c0
Component: engine
2016-06-04 07:50:04 +02:00
47fe12cae3
Merge pull request #23241 from vdemeester/migrate-search-to-cobra
...
Use spf13/cobra for docker search
Upstream-commit: 521f79bf0e81fdc5ff87ab207b834e2beef4e790
Component: engine
2016-06-03 22:07:08 -04:00
97d902eb5e
Merge pull request #23244 from LK4D4/no_interface
...
attach: replace interface with simple type
Upstream-commit: ad8d0c9a8bd93a23c745efe1aac0a0692aeefa91
Component: engine
2016-06-03 22:03:11 -04:00
0b0f7c4ee5
attach: replace interface with simple type
...
Also add docs to detach events
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 3accde6dee079fbde42f1928002bce43cb15833d
Component: engine
2016-06-03 16:40:43 -07:00
ada47a3e3f
Merge pull request #23124 from kencochrane/fix_redhat_install_script
...
Fix issues with get.docker.com install script with redhat
Upstream-commit: e6637f8d9ebd693f4a6f7992eb0c14aac4a5871e
Component: engine
2016-06-04 00:04:09 +02:00
51ea037bc1
Merge pull request #23251 from SvenDowideit/more-validation-fixes
...
docs validation fixes
Upstream-commit: da703f026e0793e4caf349487f63a7c1ab09d1c3
Component: engine
2016-06-03 23:46:21 +02:00
f36b50a0ec
docs validation fixes
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 0cddc783cff152a383a109f70a9f7bc943dbb5ba
Component: engine
2016-06-03 21:43:45 +00:00
d5ece41dcd
Builder default shell
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b18ae8c9ccc2eb6cf8aa947f25eb6f1d20089776
Component: engine
2016-06-03 13:54:31 -07:00
35da93382d
Merge pull request #23234 from yongtang/23221-utf8-bom
...
Skip UTF-8 BOM bytes from Dockerfile and .dockerignore if exist
Upstream-commit: 2d40e36af89b24b03ec9a502652f713353cf600a
Component: engine
2016-06-03 22:28:48 +02:00
3aae74c466
Windows: Turn off TestBuildDockerignoreComment
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d75aaa2ca07eb9d0ea464ac503080177091b3b1c
Component: engine
2016-06-03 13:23:35 -07:00
cb2dd312aa
Use spf13/cobra for docker search
...
- Move image command search to `api/client/image/search.go`
- Use cobra :)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a11ef10631dd9338aeda2e10fedea365a7471af1
Component: engine
2016-06-03 19:50:01 +02:00
79342b784b
Merge pull request #22898 from WeiZhang555/add-detach-event
...
Add detach event
Upstream-commit: c80a2f2937463882c2c38141a710f19b608125e6
Component: engine
2016-06-03 09:49:48 -07:00
10f297b70b
Merge pull request #23239 from albers/completion-run-healthcheck
...
bash completion for `docker run` healthcheck options
Upstream-commit: 5429f4ef6166a593fc9d2e6dd4f689d4ff94b2b7
Component: engine
2016-06-03 18:17:15 +02:00
13801e5e17
Merge pull request #23238 from albers/completion-search--limit
...
bash completion for `docker search --limit`
Upstream-commit: b0a949e3c94fbc4e4cbf8ef1f4c242fc03ae127d
Component: engine
2016-06-03 12:13:27 -04:00
2eea0b819d
bash completion for docker run healthcheck options
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f738e6a732aac706ceeb5d6d02ac61d7f780e1fd
Component: engine
2016-06-03 17:04:04 +02:00
8bc106635e
bash completion for docker search --limit
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 4b5ccd73426bcaedd69ae9f740cfaf6250276ffa
Component: engine
2016-06-03 16:32:37 +02:00
ab25cb22b0
Skip UTF-8 BOM bytes from Dockerignore if exist
...
This fix tries to address issues related to #23221 where Dockerignore
may consists of UTF-8 BOM. This likely happens when Notepad
tries to save a file as UTF-8 in Windows.
This fix skips the UTF-8 BOM bytes from the beginning of the
Dockerignore if exists.
Additional tests has been added to cover the changes in this fix.
This fix is related to #23221 (UTF-8 BOM in Dockerfile).
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: ea86320fcc61ea9ded3eef7ba01699c4e3ccf3ce
Component: engine
2016-06-03 07:26:36 -07:00
2c68691b95
Skip UTF-8 BOM bytes from Dockerfile if exists
...
This fix tries to address issues in #23221 where Dockerfile
may consists of UTF-8 BOM. This likely happens when Notepad
tries to save a file as UTF-8 in Windows.
This fix skips the UTF-8 BOM bytes from the beginning of the
Dockerfile if exists.
Additional tests has been added to cover the changes in this
fix.
This fix fixes #23221 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 678c80f9256021ce74184fdd6b612d9dea377fba
Component: engine
2016-06-03 06:16:50 -07:00
d64411abc7
Merge pull request #23222 from yongtang/06022016-add-missing-links-in-deprecated-docs
...
Add missing links in deprecated.md
Upstream-commit: 147c8b7495c0a28f741abacc928486e108d8e4a9
Component: engine
2016-06-03 15:16:11 +02:00
1d2d19ec51
Merge pull request #23215 from BlackYoup/pkg-config
...
make.sh: use PKG_CONFIG environment variable if it exists
Upstream-commit: 726ef47d5c50c329b5b0c30f3a0612cc7ee241b3
Component: engine
2016-06-03 15:04:37 +02:00
604319f9f2
Merge pull request #23107 from yongtang/23055-docker-search-limit
...
Add `--limit` option to `docker search`
Upstream-commit: 020a86b3d9e6b052a3f866b7517eb0f62fd24bea
Component: engine
2016-06-03 14:25:42 +02:00
768de748a7
Merge pull request #23111 from yongtang/20083-dockerignore-comment
...
Add support for comments in .dockerignore
Upstream-commit: 9c1278b279b3253c8c4aafecdef74bffea3edc58
Component: engine
2016-06-03 14:23:09 +02:00
14f34960c4
Merge pull request #23227 from yongtang/06032016-engine-api
...
Vendor engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6
Upstream-commit: f1755b256070f7654ab958523cee5fbbe0f10d1d
Component: engine
2016-06-03 14:15:31 +02:00
59a476f30d
Merge pull request #23230 from thaJeztah/carry_make_install_binary
...
[carry 22927] Add `make install` task
Upstream-commit: 613286859f132b9017682f717329b087fedd2190
Component: engine
2016-06-03 13:53:42 +02:00
52ca58bbaa
Healthcheck: set default retries to 3
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 50e470fab4ebdffff74bafeefa2f7fb8c21da13e
Component: engine
2016-06-03 13:28:08 +02:00
a0ddbe99db
Merge pull request #22715 from allencloud/add-trace-http-pprof
...
add trace in docker engine's pprof to show execution trace in binary form
Upstream-commit: 766550385dac63c19a9af683c5d56c2875f5cabe
Component: engine
2016-06-03 13:22:13 +02:00
c756e26290
Merge pull request #23231 from thaJeztah/minor-mailmap-update
...
Fix double entry in authors
Upstream-commit: d349f45dcc2298f02412121cacff6fbd5b08a6ca
Component: engine
2016-06-03 12:44:05 +02:00
c85ea51dd0
Fix double entry in authors
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0829581d7ea97d7d931527c872dbf9921757f497
Component: engine
2016-06-03 12:40:36 +02:00
56f0d7968e
Add make install task
...
This installs docker and dockerd to `$DOCKER_MAKE_INSTALL_PREFIX/bin`, which
defaults to `/usr/local/bin`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9bb54f89ad26015c79dab7c5ac210cb846e0713b
Component: engine
2016-06-03 12:08:33 +02:00
911ef54d71
Vendor engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6
...
This fix tries to update engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6
This fix brings engine-api up to date, which includes changes from:
https://github.com/docker/engine-api/pull/256
https://github.com/docker/engine-api/pull/254
This fix is related to
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 10c35196b19389da5bb64921b7e1f23eb054c739
Component: engine
2016-06-03 02:27:17 -07:00
37a5f59dad
Merge pull request #23173 from thaJeztah/update-authors
...
Update mailmap and re-generate Authors
Upstream-commit: a11d40af9bcfefb12839127cc46aa8b25a5d3a6f
Component: engine
2016-06-03 10:20:33 +02:00
215e6ac73a
Merge pull request #23220 from icecrime/bump_etcd_2.3.2
...
Bump etcd to 2.3.2
Upstream-commit: b16f735e9060f1561e81ad8f02afc51ba96c39f0
Component: engine
2016-06-02 22:04:35 -07:00
57f1cfe3b1
Add detach event
...
If we attach to a running container and stream is closed afterwards, we
can never be sure if the container is stopped or detached. Adding a new
type of `detach` event can explicitly notify client that container is
detached, so client will know that there's no need to wait for its exit
code and it can move forward to next step now.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 83ad006d4724929ccbde4bdf768374fad0eeab44
Component: engine
2016-06-03 11:59:11 +08:00
