b35fc7f268
Remove MkdirAllNewAs and update tests.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6150ebf7b483197f4b8755df60e750b6410e95ca
Component: engine
2017-06-07 11:44:34 -04:00
f40a1d3270
Remove ToHost and replace it with IDMappings.ToHost
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: df248d31d9d61342575fc1b5d3d848f0b282bbc5
Component: engine
2017-06-07 11:44:34 -04:00
03637cd7aa
Fix vfs unit test and port VFS to the new IDMappings
...
The test was failing because TarOptions was using a non-pointer for
ChownOpts, which meant the check for nil was never true, and
createTarFile was never using the hdr.UID/GID
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: acdbc285e29ddd92e7a1cc99daf8b16502204d2e
Component: engine
2017-06-07 11:44:34 -04:00
c41fc33a7a
Convert tarAppender to the newIDMappings.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5672eeb5e06fe96451f36f35be7cfa18a4cf5063
Component: engine
2017-06-07 11:44:34 -04:00
5d87b0ddc9
Remove unused functions from archive.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 967ef7e6d2bd88a5d7010863f3d7138ca61b1939
Component: engine
2017-06-07 11:44:33 -04:00
779caabedf
Partial refactor of UID/GID usage to use a unified struct.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 09cd96c5ad2de369912cdf708c3c50f41e4586ac
Component: engine
2017-06-07 11:44:33 -04:00
1ce23eb137
Merge pull request #33536 from aaronlehmann/silly-sprintfs
...
client: Use string concatenation instead of Sprintf
Upstream-commit: d2a83863ed764118ac985157c51418e434a8e354
Component: engine
2017-06-07 11:34:37 +02:00
91bac6c3f8
Merge pull request #33330 from coolljt0725/fix_sock_is_dir
...
Don't create source directory while the daemon is being shutdown, fix #30348
Upstream-commit: cd2255a296acf8408d2afb65b897560479f1ecd3
Component: engine
2017-06-07 12:37:08 +09:00
fea3e9d9a8
Merge pull request #33463 from mavenugo/ln-vin-1706
...
Vendoring libnetwork 2e99f06621c23a5f4038968f1af1e28c84e4104e
Upstream-commit: 64bb44546355053713e798e1ca021d280ddb8df7
Component: engine
2017-06-06 20:24:17 -07:00
3c1a09fba3
Merge pull request #33547 from vieux/report-2017-06-05
...
Moby Dev Report 2017 06 05
Upstream-commit: 18ce8ce33fa8e946fc90026e9c57ae9f8d5fed7c
Component: engine
2017-06-06 18:56:15 -07:00
4eb3d3cbf0
Moby report 2017-06-05
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 7a295b03336e48b0596d0e4d44ae19add3a56fb3
Component: engine
2017-06-06 18:53:09 -07:00
b91462c403
Merge pull request #29427 from yongtang/29325-cleanup-btrfs-quota-groups
...
Remove btrfs quota groups after containers destroyed
Upstream-commit: 54dacaf23eaec0a5fd7d77ee906f08175d485bb7
Component: engine
2017-06-06 12:51:00 -07:00
28fd21b9d9
Merge pull request #33524 from dnephin/fix-onbuild-copy-cache
...
[Builder] Fix Cache with ONBUILD
Upstream-commit: f50249964788c144c2059f2c63e2f54473317ed3
Component: engine
2017-06-06 10:44:57 -07:00
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
8c5fc4b2de
Merge pull request #33516 from shishir-a412ed/remove_auth_config
...
Remove dead code: GetAuthConfig
Upstream-commit: 84149ac17d8ebfe8fc8995d9152114ed3071e884
Component: engine
2017-06-06 14:20:19 +02:00
a037b250cf
Merge pull request #33471 from Snorch/sysconf-nrprocessors-onln-errno
...
Do not treat C.sysconf(C._SC_NPROCESSORS_ONLN) non-zero errno as error
Upstream-commit: 8b1adf55c2af329a4334f21d9444d6a169000c81
Component: engine
2017-06-06 10:22:41 +02:00
cf0286328e
Add builder dev report for 2017-06-05
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 0477bc4587d025b5b9b54ab810b6503b568d085c
Component: engine
2017-06-05 18:18:32 -07: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
56fb42b612
Remove dead code: GetAuthConfig
...
Signed-off-by: Shishir Mahajan <shishir.mahajan3@gmail.com >
Upstream-commit: 02a759fa96bd16c0483c8e48c5658ee6b9739aa4
Component: engine
2017-06-05 00:40:47 +00: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
c063e79268
Merge pull request #33512 from vdemeester/clean-cli-required
...
Remove unused functions
Upstream-commit: cc5ab6e6d45171f9fda4e77a6c52717d75c14e4b
Component: engine
2017-06-04 13:15:55 +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
6f84604b78
client: Use string concatenation instead of Sprintf
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 44c9ccc069c1bfda25ad6fb5932eeeceaa8de491
Component: engine
2017-06-02 14:01:57 +02: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
a81b0c835e
Persist the quota size for btrfs so that daemon restart keeps quota
...
This commit is an extension of fix for 29325 based on the review comment.
In this commit, the quota size for btrfs is kept in `/var/lib/docker/btrfs/quotas`
so that a daemon restart keeps quota.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 16328cc207a493ecff0cabc11ebf51e958131418
Component: engine
2017-06-01 21:15:51 -07:00
080b2a353f
Remove btrfs quota groups after containers destroyed
...
This fix tries to address the issue raised in 29325 where
btrfs quota groups are not clean up even after containers
have been destroyed.
The reason for the issue is that btrfs quota groups have
to be explicitly destroyed. This fix fixes this issue.
This fix is tested manually in Ubuntu 16.04,
with steps specified in 29325.
This fix fixes 29325.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: e907c6418a2ae7754f69fede5897a7176250e8bd
Component: engine
2017-06-01 20:24:26 -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
