a7fe10a440
Fix Cache with ONBUILD
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f1ade82d82e6436971c6b7d08eb1da57ed9ba756
Component: engine
2017-06-06 10:52:29 -04:00
a9c76c4bc8
Merge pull request #32293 from moypray/save_delete
...
Fix delete a image while saving it, delete successfully but failed to save it
Upstream-commit: c8141a1fb1ff33b2bfab85a40e5da9a282f36cdc
Component: engine
2017-06-05 09:55:56 -04:00
80e1c19817
Merge pull request #33500 from dnephin/fix-onbuild-copy
...
Fix ONBUILD COPY
Upstream-commit: 34f1cd26b67271c0fce60ab87c0c51e28f1ab6f2
Component: engine
2017-06-05 11:48:57 +02:00
76a64335a0
Merge pull request #33511 from vdemeester/remove-more-opts-runconfig
...
Remove some more `opts` from runconfig (not used anymore)
Upstream-commit: 7cf17f95f88bd61e677d722229b223cfe76ab6a0
Component: engine
2017-06-04 13:17:05 +09:00
b13daf9d28
Remove unused functions
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 236a125c3afdee30b739399aaea263c37cb28b04
Component: engine
2017-06-03 15:19:10 -07:00
b52fb8f6d2
Remove some more opts from runconfig (not used anymore)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b0226a890fa6c25cd9664d037114237a1d85b602
Component: engine
2017-06-03 15:07:33 -07:00
451b8c0ac8
Merge pull request #33502 from crosbymichael/bsd-opost
...
Set OPOST on bsd
Upstream-commit: df423d57936bf6e94bb1e54892f5419e1d927708
Component: engine
2017-06-03 02:30:58 +02:00
e9e0d884b4
Merge pull request #33477 from dnephin/move-builder-pkgs
...
Split and remove pkg/gitutils and pkg/httputils
Upstream-commit: b28cbed66df6ad06afd2d91b3c67245459ec37ff
Component: engine
2017-06-02 17:07:45 -07:00
5e2107c6ca
Merge pull request #33496 from Microsoft/jjh/removedummy
...
Windows: Correct comment
Upstream-commit: 56da020e6b05c5cb15867049dccc79b51a6e0abb
Component: engine
2017-06-03 01:07:26 +02:00
4358607de5
Fix ONBUILD COPY
...
the source was missing from the second dispatch
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 3f2604157790408acf5ad05c74cebe105f2b6979
Component: engine
2017-06-02 17:47:03 -04:00
cd41e3bb53
Merge pull request #33483 from moypray/grpc_timeout
...
Limit max backoff delay to 2 seconds for GRPC connection
Upstream-commit: 8420e7e7f5bea6cc4aafc943efe88e483ec5ac0a
Component: engine
2017-06-02 14:22:10 -07:00
b8e386fca4
Move pkg/gitutils to remotecontext/git
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b9d85ac58db8b8d4480fca93f8b952d084ea36f5
Component: engine
2017-06-02 16:54:50 -04:00
b9c4f53912
Remove the last of pkg/httputil
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4060d6ee0b130cf74294c309dfbd3c860fd2a7f8
Component: engine
2017-06-02 16:54:36 -04:00
16c0836e84
Move an error helper to registry/session.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a6ac5495e11d34b1887476ca89f841df1056249a
Component: engine
2017-06-02 16:10:40 -04:00
7636bfd2c7
Move httputils/reasumablerequestreader to the single consumer.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 65515af075ce5f8037750c253b2834008840afc1
Component: engine
2017-06-02 16:10:39 -04:00
04eec7106a
Move httputils/mimtype to the single consumser, and remove unused function.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c91521be68182b450a22f018ccc9d780571a5936
Component: engine
2017-06-02 16:10:39 -04:00
899cb8ee5f
Set OPOST on bsd
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 17ec46a24316f59c808c112e3ca46d7c442a785a
Component: engine
2017-06-02 12:53:49 -07:00
3386def242
Windows: Correct comment
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6e33c4158cc895d9b7fb274c13ecac0612c88aaa
Component: engine
2017-06-02 11:51:30 -07:00
9c0a0d808c
Merge pull request #33438 from vdemeester/remove-cli-flags
...
Remove `cli/flags` package
Upstream-commit: aebcdf21b198f1ebaa7bb047282112b74f9f4490
Component: engine
2017-06-02 17:20:05 +02:00
013b9a64df
Merge pull request #33485 from tpot/33484-fix-file-perm-octal
...
Use octal values for file mode in filenotify poller and sysinfo_linux tests
Upstream-commit: 91e0141784ab5570fd7f94ad4af399d23c827391
Component: engine
2017-06-02 11:15:42 -04:00
6d3cd41f83
Limit max backoff delay to 2 seconds for GRPC connection
...
Docker use default GRPC backoff strategy to reconnect to containerd when
connection is lost. and the delay time grows exponentially, until reaches 120s.
So Change the max delay time to 2s to avoid docker and containerd
connection failure.
Signed-off-by: Wentao Zhang <zhangwentao234@huawei.com >
Upstream-commit: d3d8c77d195ce74f36ae6eee24578b9cac48f897
Component: engine
2017-06-02 18:19:09 +08:00
97873b880b
Merge pull request #33479 from vieux/move_multireader
...
move multireader out of /pkg
Upstream-commit: 096eeb3e75e9c76ec30f35356b2a4e46b0b51ed2
Component: engine
2017-06-02 12:04:57 +02:00
04c14c1983
Merge pull request #33464 from cyli/mask-ca-key-formdata
...
Do not log the CA config CA signing key in debug mode.
Upstream-commit: c0ed8f06d57ea34c98dd36ba7b950c366ba9781e
Component: engine
2017-06-02 11:56:08 +02:00
00a54e78b7
Merge pull request #33481 from tpot/33480-fix-assert-message
...
Fix incorrect assert message in TestReadProcBool
Upstream-commit: 7057f6fa0cac7413f113ccd718bb7c8d7c34e583
Component: engine
2017-06-02 11:52:29 +02:00
73a826b637
Merge pull request #33473 from thaJeztah/update-deprecated
...
Update deprecated.md for removal of --email flag
Upstream-commit: 9ff8068ca2bb1ba308ceec8f6a6ccb0fe7e7e746
Component: engine
2017-06-02 08:57:21 +02:00
cfcd7c0452
Merge pull request #33436 from Microsoft/jjh/parserdirective
...
Builder: Fix parser directive refactoring
Upstream-commit: 57ca00240b9b73d967aad1deae07294fef092f98
Component: engine
2017-06-01 21:21:46 -07:00
f9502cbcaf
Use octal values for file mode in filenotify poller and sysinfo_linux tests
...
Closes #33484 .
Signed-off-by: Tim Potter <tpot@hpe.com >
Upstream-commit: c35ea6b2cda8ac68f2b4a9f6471ca7e09865a6ee
Component: engine
2017-06-02 12:27:10 +10:00
b6073e5ee6
Fix incorrect assert message in TestReadProcBool
...
Closes #33480 .
Signed-off-by: Tim Potter <tpot@hpe.com >
Upstream-commit: cd457e7885ecb0b00e91162113ce597f131c8386
Component: engine
2017-06-02 10:15:58 +10:00
a1a5b0a48d
move multireader out of /pkg
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 2445e6b99d4beecb25d556d9a099bdf47703e174
Component: engine
2017-06-01 16:22:00 -07:00
d6016b7163
Merge pull request #33474 from mlaventure/test-with-actual-cli-version
...
Use actual cli version for TestConfigHTTPHeader
Upstream-commit: 986510951ae3c1accb7c6be2993f54300edcad77
Component: engine
2017-06-01 16:18:04 -07:00
10e27f6561
Merge pull request #33335 from cpuguy83/33334_check_unset_sig
...
Check signal is unset before using user stopsignal
Upstream-commit: 872e28bb1452c6e333549a55dcb651fcff2a6bd1
Component: engine
2017-06-01 23:10:16 +02:00
1fd0a9619a
Remove cli/flags package
...
- Moving the `common*.go` files in `cmd/dockerd` directly (it's the
only place it's getting used)
- Rename `cli/flags` to `cli/config` because it's the only thing left
in that package 👼
Now, `integration-cli` does *truly* not depend on `cobra` stuff.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9ff9a91ab7f964f4e5042f94fe22dd50b5c3d832
Component: engine
2017-06-01 13:34:31 -07:00
d4709bb827
Merge pull request #33446 from raja-sami-10p/pkg/platform
...
Increase the Coverage of pkg/platform
Upstream-commit: 7ff205571f6016c10638e16026d1673b2f5b6615
Component: engine
2017-06-01 19:14:15 +02:00
be69462c28
Use actual cli version for TestConfigHTTPHeader
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 0b90edc22fa95e04b4d3208a72bb276be699b260
Component: engine
2017-06-01 09:35:30 -07:00
9d937bfa88
Update deprecated.md for removal of --email flag
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 43239f62bedc4721d27744d21c122622988bb3ae
Component: engine
2017-06-01 17:05:42 +02:00
5f38794750
Merge pull request #32590 from moypray/containerd
...
Fix when containerd restarted, event handler may exit
Upstream-commit: d7c125791a3fa6cf233a8f9d017c28ae65d5b535
Component: engine
2017-06-01 08:16:24 -04:00
52c11cb152
Fix delete a image while saving it, delete successfully but failed to save it
...
Issue Description:
* 1. Saving more than one images, `docker save -o a.tar aaa bbb`
* 2. Delete the last image which in saving progress. `docker rmi bbb`
Espected:
Saving images operation shouldn't be disturbed. But the real result is that failed to
save image and get an error as below:
`Error response from daemon: open
/var/lib/docker/image/devicemapper/imagedb/content/sha256/7c24e4d533a76e801662ad1b7e6e06bc1204f80110b5623e96ba2877c51479a1:
no such file or directory`
Analysis:
1. While saving more than one images, it will get all the image info from reference/imagestore,
and then using the `cached data` to save the images to a tar file.
2. But this process doesn't have a resource lock, if a deletion operation comes, the image will be deleted,
so saving operation will fail.
Solution:
When begin to save an image, `Get` all the layers first. then the
deletion operation won't delete the layers.
Signed-off-by: Wentao Zhang <zhangwentao234@huawei.com >
Upstream-commit: 4a014e6b0d7e2d310ee1ba442128a6802559a63a
Component: engine
2017-06-01 18:13:20 +08:00
02f992f2b8
Fix Typos: continer,contianer -> container
...
Signed-off-by: Chen Min <chenmin46@huawei.com >
Upstream-commit: 2b62eb434be4770c101ef79666a952fd7f43a742
Component: engine
2017-06-01 19:21:01 +08:00
4cb2e1a089
Builder: Fix parser directive refactoring
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c97170d618b7a1f35f47672143bd287666802287
Component: engine
2017-05-31 18:48:27 -07:00
dbc4b6c5bd
Do not log the CA config CA signing key in debug mode.
...
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: d60f18204978d438d1eb336512576d47991c8ac1
Component: engine
2017-05-31 18:15:33 -07:00
61ed140656
Merge pull request #33443 from DeliangFan/fix_download_image_fails
...
Fix downloading image fails when build docker
Upstream-commit: 555bd548cacfbe02447ebb055d3efa5eeaabe972
Component: engine
2017-05-31 21:03:37 +02:00
733e94a59a
Merge pull request #33363 from tonistiigi/fix-chunked-build
...
Fix cancelling builder on chunked requests
Upstream-commit: 7ea0d1ecc6436063bfc9c72d09a75f15b029ac88
Component: engine
2017-05-31 20:18:35 +02:00
6fa6566523
Merge pull request #33329 from wenjianhn/EINVAL
...
Don't log EINVAL when unmount IPC
Upstream-commit: 41c3c9cc866d0e310664e2c4cbd42f0df1b88efa
Component: engine
2017-05-31 11:17:19 -07:00
a5b7ff8786
Merge pull request #33305 from thaJeztah/suppress-logger-close-error
...
Don't log error if file is already closed
Upstream-commit: 316681cd2a644ef7f98fbaf4ca91a45a021b4b22
Component: engine
2017-05-31 17:09:09 +02:00
02dca610a4
Merge pull request #33249 from ripcurld0/env_validate
...
Add container environment variables correctly to the health check
Upstream-commit: 7c2f20107a0599008152179a18cc8d0323ccc589
Component: engine
2017-05-31 07:35:28 -07:00
421a16553e
Increase the Coverage of pkg/platform
...
Signed-off-by: Raja Sami <raja.sami@tenpearls.com >
Upstream-commit: bdc87676bfee0f9a26fe12323dbe6875af783645
Component: engine
2017-05-31 13:26:40 +05:00
8e156ee521
Don't warn if the shm or mquere is not mounted
...
Fix #33328
Signed-off-by: Jacob Wen <jian.w.wen@oracle.com >
Upstream-commit: cfa2591d3f2636221e5005b3609aeb572e0c6653
Component: engine
2017-05-31 16:19:59 +08:00
6ed8b96066
Fix downloading image fails when build docker
...
Generate a token for each download process to avoid token expired.
Closes : #33441
Signed-off-by: vanderliang <lansheng@meili-inc.com >
Upstream-commit: cb502cd4e894a78e723902a4d2f23174b69430ce
Component: engine
2017-05-31 14:21:32 +08:00
4c527a90e5
Merge pull request #33387 from cpuguy83/go1.8.3
...
Bump go to go1.8.3
Upstream-commit: 75e685d620d6a37ec2db87c3c44ca5d918db740c
Component: engine
2017-05-31 02:18:09 +02:00
1369e3364d
Merge pull request #33419 from runcom/fix-reaper-containerd
...
libcontainerd: fix reaper goroutine position
Upstream-commit: 4f55e390c4e5230bad232c462d60f8564faea17f
Component: engine
2017-05-30 10:55:38 -07:00
