aa4ab28f5c
Merge pull request #32735 from bhavin192/patch-1
...
Add note about host-dir in VOLUME
(cherry picked from commit f2fff9d913a8ab0436dd56033189a7c3713a59a2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8fd6547fc3eb67e7efa7efb007ae6a4494cd2bb3
Component: engine
2017-06-09 14:06:25 +02:00
c377be4599
Merge pull request #32724 from PatrickLang/patricklang-win-memory
...
Adding more on -m and --memory
(cherry picked from commit c3fbca106552f2dadcb89510ff87945b50f36419)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b4047a849bd3018f8a8eabf34613a4fca57f818e
Component: engine
2017-06-09 14:06:19 +02:00
6df95bba93
Merge pull request #32684 from scjane/patch-3
...
Update builder.md
(cherry picked from commit 831066337743fc29ff122fce51afe44b8b3b3ba9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bc66821abbcf50c721ce9b8f52b339fda102d389
Component: engine
2017-06-09 14:06:13 +02:00
ab0ee856b7
Merge pull request #33598 from aaronlehmann/remove-dumpdaemon
...
daemon: Remove daemon datastructure dump functionality
Upstream-commit: 252e610103e7fcb1b485b663ca89b1158f0a948b
Component: engine
2017-06-08 22:40:00 -04:00
a215dfc2d2
Merge pull request #33262 from keloyang/exec-block
...
Add a error check in postHijacked to avoid docker exec command blocking.
Upstream-commit: f35157433e38c90a9a067020609c7e250fc847af
Component: engine
2017-06-09 09:20:04 +08:00
4fad4bb5eb
Merge pull request #33451 from naveed-jamil-tenpearls/pkg/signal/signal
...
Add test coverage to pkg/signal
Upstream-commit: 1a2d2f75f42696d295392b939346ed4a36ac0bfc
Component: engine
2017-06-08 16:51:23 -07:00
29886fb978
daemon: Remove daemon datastructure dump functionality
...
When sending SIGUSR1 to the daemon, it can crash because of a concurrent
map access panic, showing a stack trace involving dumpDaemon. It appears
it's not possible to recover from a concurrent map access panic. Since
it's important that SIGUSR1 not be a destructive operation, sadly the
best course of action I can think of is to remove this functionality.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: a4c68ee8574c9b8a3309ebebee0d90108042ba61
Component: engine
2017-06-08 14:08:49 -07:00
8a1bab985d
Merge pull request #33520 from naveed-jamil-tenpearls/pkg/term
...
Add test coverage to pkg/term
Upstream-commit: e57f8a78ae3291670c903784864d04139c821ea1
Component: engine
2017-06-08 13:41:49 -07:00
af7c7c63d1
Merge pull request #33546 from runcom/init-runtime-info
...
daemon: correctly try to retrieve init/runtime versions
Upstream-commit: 274cc09247696c56017aed6bafb1089bd2ebbfde
Component: engine
2017-06-08 10:32:50 -07:00
5beabf7afd
Merge pull request #33583 from naag/33569-logging-plugin-file-inconsistency
...
Pass the same log filename to logging plugins on start/stop requests
Upstream-commit: d053bdef15ba4e2f645687eaee1dd8b9322a5658
Component: engine
2017-06-08 17:36:52 +02:00
a53424fe86
Logging driver should receive same file in start/stop request
...
Signed-off-by: Peter Bücker <peter.buecker@gmail.com >
Upstream-commit: e908e1a357b435d7fab497d51cdd3e58458a0590
Component: engine
2017-06-08 10:05:52 +02:00
fef5c78683
Add test coverage to pkg/term/proxy.go
...
Signed-off-by: Naveed Jamil <naveed.jamil@tenpearls.com >
Upstream-commit: a267248b5af9e58f878b0e2ba604c7256d637be2
Component: engine
2017-06-08 12:48:33 +05:00
523841f2f9
Add a error check in postHijacked to avoid docker exec command blocking.
...
When user execute docker exec command, docker daemon maybe have err return because
of ExecExists check, and then the hijack stream will not be close, it can lead to
docker exec command block.
Signed-off-by: yangshukui <yangshukui@huawei.com >
Upstream-commit: 26231b29e7881d25822bffd740d5f73fc2687460
Component: engine
2017-06-08 15:46:50 +08:00
042ba9639d
Merge pull request #33577 from crosbymichael/revert-ONCLR
...
Revert ONCLR and OPOST changes
Upstream-commit: cd35e4beee13a7c193e2a89008cd87d38fcd0161
Component: engine
2017-06-07 21:50:38 -07:00
5aa484e047
Merge pull request #33555 from mavenugo/rc3-vin
...
Vendoring libnetwork and netlink
Upstream-commit: a82999cfd3328ecec11f5482be09c1756be190a6
Component: engine
2017-06-07 21:45:05 -07:00
5a336fdfb9
Merge pull request #33578 from mavenugo/taskalias
...
Service alias should not be copied to task alias
Upstream-commit: 1678c7add9dfb228fbe63c40ddcdd2ae8327b793
Component: engine
2017-06-07 21:44:35 -07:00
b16298c7bf
Merge pull request #33456 from cpuguy83/fix_concurrent_map_access_issue
...
Lock container while connecting to a new network.
Upstream-commit: 4051ee6ad617c71c033d9302d0039bc630581980
Component: engine
2017-06-07 21:44:04 -07:00
aa5990df73
Merge pull request #33362 from dnephin/refactor-uid-maps
...
Partial refactor of UID/GID usage to a new struct
Upstream-commit: 34536c498d56a0c74fab08bd434407ac4707c971
Component: engine
2017-06-07 15:12:10 -07:00
f3ef17e47d
Revert ONCLR and OPOST changes
...
This reverts to a version of runc without the ONCLR cleared to not cause
a regression with different clients using --tty.
This also reverts the OPOST changes to the term package to support the
initial change.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: a5e83836a49547b2add871bb52cbd8bfedb57114
Component: engine
2017-06-07 13:14:52 -07:00
01293c3a07
Merge pull request #33549 from ripcurld0/update_swagger
...
Describe the differences between container-inspect and container-list
Upstream-commit: 36db52a7049c0f00e75f7cfcbd5061dc7600180f
Component: engine
2017-06-07 22:08:26 +02:00
7911166df9
Service alias should not be copied to task alias
...
If a service alias is copied to task, then the DNS resolution on the
service name will resolve to service VIP and all of Task-IPs and that
will break the concept of vip based load-balancing resulting in all the
dns-rr caching issues.
This is a regression introduced in #33130
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 38c15531501578b96d34be5ce7f33a0be6be078f
Component: engine
2017-06-07 13:05:15 -07:00
8dd1ea1814
Merge pull request #33557 from AkihiroSuda/test-no-unset
...
builder: add a test for `ENV name` (without `=value`)
Upstream-commit: d2c6e78371824bf7f9063814e8b34caa0c97ed56
Component: engine
2017-06-07 17:51:42 +02:00
583893964e
Remove error return from RootPair
...
There is no case which would resolve in this error. The root user always exists, and if the id maps are empty, the default value of 0 is correct.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 93fbdb69acf9248283a91a1c5c6ea24711c26eda
Component: engine
2017-06-07 11:45:33 -04:00
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
af043a1e5b
Vendoring libnetwork and netlink
...
libnetwork eb57059e91bc54c9da23c5a633b75b3faf910a68
netlink bd6d5de5ccef2d66b0a26177928d0d8895d7f969
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 5fd65a6b6c524e670f3b4ccced3974f63c1fd9a6
Component: engine
2017-06-07 06:20:27 -07: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
63a5fba1a8
builder: add a test for ENV name (without =value)
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 09eca591f723f9acd0909b04144c229b6cd59912
Component: engine
2017-06-07 05:23:26 +00: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
cc0cc953be
Describe the differences between container-inspect and container-list
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: e8a1d99afb42d0931f7e1fd3df41611aafddf5a9
Component: engine
2017-06-06 21:33:08 +03: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
bd56d0486b
daemon: correctly try to retrieve init/runtime versions
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 858b4b44c8172eb2c92767c8f624f4138db5212b
Component: engine
2017-06-06 19:36:24 +02: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
