f8cc2fb021
LCOW: Fix comment in graphdriver code
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f9fc269c204b96b34a479f3e55e41886ed2626b0
Component: engine
2017-09-18 19:52:55 -07:00
7ac80a2691
Merge pull request #34674 from pradipd/windows_routingmesh
...
Enabling ILB/ELB on windows using per-node, per-network LB endpoint.
Upstream-commit: a2ee40b98c281139c75b38e0e11aa35726021169
Component: engine
2017-09-18 15:56:17 -07:00
3303de2b82
Merge pull request #34759 from kolyshkin/gometalinter
...
Gometalinter fixups for non-x86
Upstream-commit: 65e88d996ad13ad5ca9c2d2c625a87f9271d1e82
Component: engine
2017-09-18 13:44:15 -07:00
b8677707a9
vendoring libnetwork and swarmkit
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com >
Upstream-commit: 4c1b07924a7449e6e37fac4479624fcaf01ce889
Component: engine
2017-09-18 20:38:18 +00:00
61af2a7b87
Enabling ILB/ELB on windows using per-node, per-network LB endpoint.
...
Signed-off-by: Pradip Dhara <pradipd@microsoft.com >
Upstream-commit: 9bed0883e762181ad6c4d5607ae2228e164e44b5
Component: engine
2017-09-18 20:27:56 +00:00
f01963dfea
Merge pull request #34805 from chris-crone/containerize-integration-tests
...
Containerize integration tests
Upstream-commit: 9be245f438f9fb2eaeb7891673b16aed9262a192
Component: engine
2017-09-18 21:11:06 +02:00
af2e8abbf0
Merge pull request #34842 from dnephin/fix-integration-on-timeout
...
[integration-cli] Only attempt to find pid with local daemon
Upstream-commit: c5c0702a4d523071b3e41a13c233b6ec9e261b06
Component: engine
2017-09-16 06:48:18 -07:00
a8090896a0
Merge pull request #34252 from Microsoft/akagup/lcow-remotefs-sandbox
...
LCOW: Support for docker cp, ADD/COPY on build
Upstream-commit: a5f9783c930834b8e6035fb0ad9c22fd4bbfc355
Component: engine
2017-09-15 16:49:48 -07:00
892a44a627
Various fixes
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: b7d8d2c4ab709f072cbdc4f89a8c80065648757e
Component: engine
2017-09-15 16:01:15 +02:00
adba854430
Merge pull request #34849 from chchliang/testlayer
...
add testcase in layer/empty_test.go with Platform(),Metadata()
Upstream-commit: 5c10698d5c5223f9cb49704124be592e3d39d0df
Component: engine
2017-09-15 06:39:20 -07:00
3223c51c8a
Remove erroneous Println
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: eb396e8984ce64ea6ee9c04905780d74ed7d8d8b
Component: engine
2017-09-15 13:02:27 +02:00
ae2d031a76
add testcase in layer/empty_test.go with Metadata()
...
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn >
Upstream-commit: c72112b171ac046d11e8279b799315e962332450
Component: engine
2017-09-15 14:13:48 +08:00
70abc439d8
Merge pull request #34258 from simonferquel/lcow-mounts
...
LCOW: Prepare work for bind mounts
Upstream-commit: 0300fa7f806f978451c09ebbff402ddd34e928d9
Component: engine
2017-09-14 15:00:08 -07:00
a641c1b7f0
Add LCOW behind experimental,
...
might not be the cleanest way, but it's definitly the way with the
minimum code change.
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: ff686743c50dc34b57f5627ba6fee38502bdd3ec
Component: engine
2017-09-14 13:51:16 -07:00
aeb89eb179
Volume refactoring for LCOW
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
Upstream-commit: e89b6e8c2d2c36c43f22aeaf2a885646c2994051
Component: engine
2017-09-14 12:33:31 -07:00
cddfe04f6a
LCOW: Implemented support for docker cp + build
...
This enables docker cp and ADD/COPY docker build support for LCOW.
Originally, the graphdriver.Get() interface returned a local path
to the container root filesystem. This does not work for LCOW, so
the Get() method now returns an interface that LCOW implements to
support copying to and from the container.
Signed-off-by: Akash Gupta <akagup@microsoft.com >
Upstream-commit: 7a7357dae1bcccb17e9b2d4c7c8f5c025fce56ca
Component: engine
2017-09-14 12:07:52 -07:00
14427ba493
Vendor containerd/continuity@22694c680e
...
Signed-off-by: Akash Gupta <akagup@microsoft.com >
Upstream-commit: ba13c173d1704168b918705b827963dc6e3900ab
Component: engine
2017-09-14 12:00:38 -07:00
29ef2e0479
Merge pull request #34217 from yongtang/34208-http-add-root
...
Fix build with `ADD` urls without any sub path
Upstream-commit: d60c1866679f9fcd5701eedabe49e9fa11228b08
Component: engine
2017-09-14 11:55:24 -07:00
f34f36be87
Merge pull request #34332 from clnperez/logrus-revendor
...
revendor logrus and x/crypto
Upstream-commit: 2a54dc080471476037c87cc6961cc126368ffdd9
Component: engine
2017-09-14 11:29:05 -07:00
44733ed80a
Fixes after dnephin review
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 7dabed019a7aac9b317b586d582431eef3b65e33
Component: engine
2017-09-14 19:27:09 +02:00
6cc83af533
Fix Windows build
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 81f69a593146f61d3f6568403168ba28b1714f97
Component: engine
2017-09-14 19:27:09 +02:00
82ba6d5d3e
Test requires SameHostDaemon
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 61b13ba0d12aeeadc1c08eae62ba83f62208a6d3
Component: engine
2017-09-14 19:27:09 +02:00
414afe084c
Correct log message
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 5eab08930c9c2d39bb76fd6320e9979b504750a6
Component: engine
2017-09-14 19:27:09 +02:00
a13cdc241b
Set client version instead of negotiating it
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 85431566a81792e3612df3b6b858f7b0c3506883
Component: engine
2017-09-14 19:27:09 +02:00
454535ed22
Bring up DockerNetworkSuite
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 42d812df0a12d92fad1f327f0b0f5d9eb7a9f107
Component: engine
2017-09-14 19:27:09 +02:00
58906ac91c
Remove race and split TestAPINetworkInspect test
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 6936ce3b65f149ba6ab1cd5c257358c06eb9cdbb
Component: engine
2017-09-14 19:27:09 +02:00
4d643fb18a
Fixes for dnephin review
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 86f9eb4a085a61b3355dc38452c47def806bf7c9
Component: engine
2017-09-14 19:27:09 +02:00
f23d5bec57
Skip some tests for E2E
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: f089a1df393228085c4895b8db0fa95128173398
Component: engine
2017-09-14 19:27:09 +02:00
abba79d025
Check integration test requirements using daemon
...
When running against a remote daemon, we cannot use the local
filesystem to determine configuration.
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: b1fb41988dc1b7071a58f76f6ad2730fc1a02eca
Component: engine
2017-09-14 19:27:09 +02:00
2801aaa58e
Use TLS for tests if needed
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 0bdba0e91a072ee2cdecb4e632c13f187eb88e9c
Component: engine
2017-09-14 19:27:09 +02:00
e3234a8303
Fix tests that depend on clean environment
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: dc6ddfa8415d90e9a9788d5cfd5a10c17449bbc9
Component: engine
2017-09-14 19:27:09 +02:00
fe0ff1cb68
Add E2E requirement for integration tests
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: d622e81af50f4690d5867a89b430d1b94707fd26
Component: engine
2017-09-14 19:27:09 +02:00
559acd0f8b
Containerize integration tests
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 07f10d8e2e2214000635c32d23f9435fa3fb48b8
Component: engine
2017-09-14 19:27:09 +02:00
16788ee2e5
Protect entire environment when testing
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 063c89c71fd1fbeb7ef7c46f43ee805b620e7136
Component: engine
2017-09-14 19:27:09 +02:00
9c49974512
Allow protection of entire environment during tests
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 0520581523caeacdf718a2dd1db2958c24b47cf6
Component: engine
2017-09-14 19:27:09 +02:00
b3c31e9800
Add unit test to cover changes.
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 027297a60f5f5a70e1e3eb3a68280f64c66bc877
Component: engine
2017-09-14 16:17:38 +00:00
ac38bbaf63
Fix build with ADD urls without any sub path
...
This fix tries to address the issue raised in #34208 where
in Dockerfile an `ADD` followed by an url without any sub path
will cause an error.
The issue is because the temporary filename relies on the sub path.
An integration test has been added.
This fix fixes #34208 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: bea0a072d86604071c99e9b6989b19ca4fe22032
Component: engine
2017-09-14 16:17:38 +00:00
97847089f1
revendor logrus and x/crypto
...
this fixes the issue that was blocking a test from running on ppc64le.
the logrus revendor changes the color code used in that same test, so
that breaks the test for all platforms (updated in this pr)
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: 008b217844f8738cc47ef9ff108dc41dc37736cc
Component: engine
2017-09-14 11:05:47 -05:00
1546d32eb0
Only attempt to find pid with local daemon
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 014cecda464fb1171e613676e0a8a85c02ec1674
Component: engine
2017-09-14 12:05:18 -04:00
c95e22b252
Merge pull request #34837 from tophj-ibm/switch-hub-test-to-alpine
...
[integration-cli] fix p/z HubPullSuite tests
Upstream-commit: 3a081f53c150190201ddb05c97344ed5071446b0
Component: engine
2017-09-14 18:02:13 +02:00
023fe0b32f
[integration-cli] fix p/z HubPullSuite tests
...
This test tries to pull all the tags in the busybox repo and looks to see
if there were more than two images pulled. This was failing on
p/z due to the recent change to manifest lists, where one of the busybox
tags didn't have a p/z manifest in it's manifest list.
This error seems fine to me, so I changed the test to see if pull fails,
it fails with the "manifest not found" error.
Also switched from busybox -> alpine, because it has significantly less tags,
and the images are close in size.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 5739ba1b918402b8eda748ac2f5dd7ce00f2e69f
Component: engine
2017-09-14 09:42:09 -04:00
93617a3f74
Merge pull request #34784 from dnephin/fix-client-not-found
...
Cleanup client not found errors
Upstream-commit: bb0e8ee51c8940c3ce23e4f594068612203c6139
Component: engine
2017-09-14 12:04:56 +02:00
c30f13232a
Merge pull request #34686 from mion00/templating-node-hostname-support
...
Add support for .Node.Hostname templating in swarm services
Upstream-commit: 2ee8ef864f9fb9c31848fe10a61605a39fb81635
Component: engine
2017-09-13 21:06:11 -07:00
803b5f0e94
Merge pull request #34821 from thaJeztah/remove-enable-api-cors
...
Remove deprecated --enable-api-cors flag
Upstream-commit: dc35a8a5d22b6c828cd105be7c62b72919df25cd
Component: engine
2017-09-13 20:10:27 -07:00
63f4bb52b4
Merge pull request #34828 from allencloud/add-config-tags-in-swagger
...
add configs tag in swagger.yml
Upstream-commit: 80edccda708c6771824c245b4d634c2a9ce29795
Component: engine
2017-09-14 02:37:28 +02:00
4fe1c1584a
Merge pull request #34844 from kolyshkin/lvm2-fix
...
Fix fetching LVM2 sources
Upstream-commit: a8f6e60bfc95421f0d8539fddaecd32642cd947f
Component: engine
2017-09-14 02:01:14 +02:00
08356f8921
Fix fetching LVM2 sources
...
Version 2.02.173 has disappeared, let's revert back to latest stable
one.
https://github.com/moby/moby/issues/34843
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: a436d8a634392f9e82b6930a560d56900d887ce7
Component: engine
2017-09-13 14:34:36 -07:00
57a43e8ab0
Merge pull request #34775 from darrenstahlmsft/RevendorHcsshim
...
Update hcsshim to v0.6.5
Upstream-commit: a15cdd707acc37e7bc5dd618a461618c3a0cda20
Component: engine
2017-09-13 11:14:36 -07:00
07369b8b77
Merge pull request #34809 from dnephin/add-gosimple-linter
...
Add gosimple linter
Upstream-commit: e51bc3ecd04d950f8854947ec8906937eaf87129
Component: engine
2017-09-13 12:44:59 -04:00
002e234c45
Merge pull request #34829 from Microsoft/jjh/spotfix
...
LCOW: Spot fix for multi-os image pulling
Upstream-commit: 0dbc182b6c4f6a72933680f98a6240a7681d94ee
Component: engine
2017-09-13 14:32:15 +02:00
