cfbe3fef1b
Merge pull request #36704 from thaJeztah/bump-go-digest
...
Bump go-digest to v1.0.0-rc.1
Upstream-commit: ed7b6428c133e7c59404251a09b7d6b02fa83cc2
Component: engine
2018-03-27 14:31:50 +02:00
113504a7f3
Merge pull request #35089 from Microsoft/jjh/fromplatformbuilder
...
LCOW - Change platform parser directive to FROM statement flag
Upstream-commit: 29fc64b590badcb1c3f5beff7563ffd31eb58974
Component: engine
2018-03-26 14:17:49 -07:00
11ecbed64c
Merge pull request #36700 from dnephin/remove-myself-as-codeowner
...
Remove myself from CODEOWNERS
Upstream-commit: e2062f7571babe8ba31f01c3c93bad07b7c0584f
Component: engine
2018-03-26 16:37:22 -04:00
7f54d33379
Bump go-digest to v1.0.0-rc.1
...
Changes included:
- digest: allow separators in algorithm field
- disallow upper characters (/A-F/) in hex-encoded portion
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 82c44711cc59c150d09c87506a9bd648599ea0d6
Component: engine
2018-03-26 22:17:35 +02:00
80e0c0b83d
Remove myself from CODEOWNERS
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 92dfe76911c8ce9beea367e7e906ea138b467135
Component: engine
2018-03-26 13:45:05 -04:00
95b93fdfcd
Merge pull request #36692 from katakonst/unique_names_container_rename_Test
...
Use unique names for container/rename_test.go
Upstream-commit: 7cfd3f4229c82ba61fa13a8818b8ecf58a2dcdbf
Component: engine
2018-03-26 11:29:01 +01:00
8590eff8c7
Merge pull request #36694 from thaJeztah/update-ripcurld-handle
...
Update curators list
Upstream-commit: e5eb527ebd773ed3e40fcb0d2b74a37ab807d777
Component: engine
2018-03-26 11:13:58 +01:00
2f8d388ea0
Merge pull request #36646 from anusha-ragunathan/err_return
...
Add missing error return for plugin creation.
Upstream-commit: 6b3f66c4188b573534a6887668b9fb213cc489e9
Component: engine
2018-03-26 18:34:47 +09:00
744fc0b049
Update curators list
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c85ee9828cb718f2ef83ee3876cef46b9eb3b82c
Component: engine
2018-03-26 10:39:52 +02:00
d1631a824d
Use unique names for container/rename_test.go
...
Signed-off-by: Catalin Pirvu <pirvu.catalin94@gmail.com >
Upstream-commit: 90b514922bb6405bc06428702b1a55bb248bdac3
Component: engine
2018-03-25 21:16:32 +03:00
e3d080dac1
Add missing error return for plugin creation.
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 89a882e2f1706e567a8514209701892b40da7a62
Component: engine
2018-03-23 12:07:43 -07:00
6b1f053c14
Merge pull request #36672 from anshulpundir/election
...
Increase raft ElectionTick to 10xHeartbeatTick
Upstream-commit: 5f17312653c3e4dc5474f86692b09f06262a1ebd
Component: engine
2018-03-23 19:57:24 +01:00
160d042de0
Merge pull request #35149 from AkihiroSuda/image-v1
...
image/spec: add historical information about v1 spec
Upstream-commit: 2e3056128cc839b5fdee8edeb651f4ecc244db78
Component: engine
2018-03-23 16:47:16 +01:00
38f9066976
Merge pull request #36676 from arm64b/enable-criu-on-non-arm64-v2
...
Enable CRIU on non-amd64 architectures (v2)
Upstream-commit: 52d3dceac548e70ad9cebc4c755adc2c0774dc11
Component: engine
2018-03-23 13:05:45 +01:00
dd8e748718
Merge pull request #36509 from xujihui1985/master
...
fix(distribution): digest cache should not be moved if it was an auth
Upstream-commit: c3b3be529693316412111e81860ba293a3668f0f
Component: engine
2018-03-23 11:17:43 +01:00
2bc1fa895f
Remove the uname -m in Dockerfile
...
Using `dpkg --print-architecture` instead of the `uname -m` to abstract
the architecture value from the container images, which the build process
is running inside, to match exactly the behavior specified by the following
Docker file while not 'passthru' to the host.
Signed-off-by: Dennis Chen <dennis.chen@arm.com >
Upstream-commit: 803a756941f5e4b68429a3642d52585c8ea6dbaa
Component: engine
2018-03-23 08:56:35 +00:00
985dd23e4a
Enable CRIU on non-amd64 architectures
...
Since the recent release of CRIU has already supported other
arches such as AArch64, ppc64le, and s390x, so we can enable
it now.
Signed-off-by: Dennis Chen <dennis.chen@arm.com >
Upstream-commit: 7fd54a7a48f9f1bb2b28144e38c886d1fe813a04
Component: engine
2018-03-23 05:52:35 +00:00
5656978b1e
Merge pull request #36662 from adshmh/use-unique-resource-names-for-container-inspect-ps-stop-integration-tests
...
Use unique names for test resources of container/inspect, container/ps, container/stop tests
Upstream-commit: 57c504799d979caa706142e6f5dc4be4a5b1e3e2
Component: engine
2018-03-23 12:16:53 +09:00
de2245153e
Increase raft ElectionTick to 10xHeartbeatTick
...
Signed-off-by: Anshul Pundir <anshul.pundir@docker.com >
Upstream-commit: 6abee2008b314a65553202b15d9a333d171e3433
Component: engine
2018-03-22 15:04:10 -07:00
780a0b27cc
Merge pull request #36670 from stevvooe/use-context-error
...
daemon: use context error rather than inventing new one
Upstream-commit: 766d9edf39b79e11018bb0f55056b5bd915ddf3c
Component: engine
2018-03-22 20:45:20 +01:00
f358bd4b47
daemon: use context error rather than inventing new one
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: d84da75f01e0a0d20fbddb8b051a325e3b21eded
Component: engine
2018-03-22 09:38:59 -07:00
10376dc96a
Merge pull request #36663 from tonistiigi/hijackconn-fix
...
client: fix hijackedconn reading from buffer
Upstream-commit: 69091990c72f3a3a6143fe6417a769e7a1a1ff1a
Component: engine
2018-03-22 17:10:06 +01:00
1f699969f9
Merge pull request #36587 from justincormack/unpriv-caps
...
If container will run as non root user, drop permitted, effective caps early
Upstream-commit: b67c1e078c7eeb20199dce301e95fa8999c98109
Component: engine
2018-03-22 14:51:29 +01:00
34dd223936
Merge pull request #36647 from adshmh/use-unique-names-for-container-nat-test-containers
...
use unique names for test containers of container/nat integration tests
Upstream-commit: 00c59ed77e186b6f9056bb8e0a2700767b4be383
Component: engine
2018-03-22 14:03:36 +01:00
3db81e37ca
Merge pull request #36172 from kolyshkin/systemd-memlimit
...
Test for systemd cgroupdriver memory setting
Upstream-commit: e2bede01e4a6a6f84e33e2a6debf2cfed5938828
Component: engine
2018-03-22 13:36:43 +01:00
2748b681fe
Merge pull request #36653 from thaJeztah/refactor-windows-service-code
...
Split daemon service code to _windows file
Upstream-commit: 3baa5889592894a9d39938aa8fdf08e879cb8a25
Component: engine
2018-03-22 21:14:17 +09:00
082579ff1b
Merge pull request #36551 from selansen/36247
...
Fix for Flaky test TestServiceWithPredefinedNetwork
Upstream-commit: cd01c147b1c4b483a75f02de9c9c8416bc8d9ac2
Component: engine
2018-03-22 10:01:20 +01:00
4ad54eacb8
client: fix hijackedconn reading from buffer
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f094a05e260d8748f0fd2018a8a908b4189e454d
Component: engine
2018-03-21 15:29:44 -07:00
809b43730d
use unique names for resources used by integration tests container/inspect_test, container/ps_test, container/stop_test
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 78e4be91332e2237c0fa14eb3ba0fb5b915c3256
Component: engine
2018-03-21 17:47:49 -04:00
f95a3e7bb8
Fix for Flaky test TestServiceWithPredefinedNetwork
...
TestServiceWithPredefinedNetwork test case was failing
at times. To fix the issue, added new API to check
for services after we clean up all services. Tested
multiple times and this sould fix flaky issue.
Signed-off-by: selansen <elango.siva@docker.com >
Upstream-commit: dabffd806c98ab13dbc25e57bee21c5291b9a50c
Component: engine
2018-03-21 11:49:23 -04:00
bc6cc53700
Split daemon service code to _windows file
...
This moves some of the code that was conditionally
executed on Windows to a separate, windows-only file.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: cd3e84c6b38e74d03ab31db804bc9b49dcab8243
Component: engine
2018-03-21 12:57:53 +01:00
5509cd2416
Merge pull request #36594 from vdemeester/e2e-more-run
...
integration/*: make e2e run without failure
Upstream-commit: 4460472f4ee419794bb416d131c92dc296b5c625
Component: engine
2018-03-21 08:54:39 +01:00
81ade09fe5
Merge pull request #36515 from vdemeester/migrate-trusted-suite
...
Remove DockerTrustSuite to docker/cli e2e tests
Upstream-commit: 8aa694c91ac727351ebb1deaacad62149e984fd6
Component: engine
2018-03-21 08:50:59 +01:00
3d5d533860
container/nat integration tests use unique names for test containers
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: b4d1547af6b91baa2ffcb8a391c35d9bc5cdc48f
Component: engine
2018-03-20 17:11:03 -04:00
1c15bdeddb
Merge pull request #36466 from thaJeztah/fix-exec-apparmor
...
Fix AppArmor not being applied to Exec processes
Upstream-commit: 0c1006f1abc1af7aa6b9847754370d054dfa6c68
Component: engine
2018-03-19 15:12:41 -07:00
3d783d5dbf
If container will run as non root user, drop permitted, effective caps early
...
As soon as the initial executable in the container is executed as a non root user,
permitted and effective capabilities are dropped. Drop them earlier than this, so
that they are dropped before executing the file. The main effect of this is that
if `CAP_DAC_OVERRIDE` is set (the default) the user will not be able to execute
files they do not have permission to execute, which previously they could.
The old behaviour was somewhat surprising and the new one is definitely correct,
but it is not in any meaningful way exploitable, and I do not think it is
necessary to backport this fix. It is unlikely to have any negative effects as
almost all executables have world execute permission anyway.
Use the bounding set not the effective set as the canonical set of capabilities, as
effective will now vary.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 15ff09395c001bcb0f284461abbc404a1d8bab4d
Component: engine
2018-03-19 14:45:27 -07:00
d649560b32
Builder: Review feedback
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 14429056d3745ca052fba448d879788d16bbb01b
Component: engine
2018-03-19 14:29:36 -07:00
60e6ee9365
Builder: Fix CI issues
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 317513d6984c0ba5df41dc578b22eb32fec55b55
Component: engine
2018-03-19 14:29:36 -07:00
d7c0222450
Builder: Plumbing through platform in FROM statement
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 69fa84bc3d57dafd19800642c5ba196bc6d45f90
Component: engine
2018-03-19 14:29:36 -07:00
fe74b4e69a
Builder - add --platform to FROM statement
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 7f0c2d23e11485c7f026dd8c111c60c2e1e03375
Component: engine
2018-03-19 14:29:36 -07:00
96ca7d0f59
Builder - Parser. Remove platform parser directive
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9cae03900fc27ff39e913978ca8f084691954881
Component: engine
2018-03-19 14:29:35 -07:00
bf670c6435
Builder - dockerfile - just use API for now, and unit test fix
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 735e5d22b7ca208acc9ad7373bb8f93167ee3f85
Component: engine
2018-03-19 14:29:35 -07:00
66621995e0
Builder - parser - remove OS
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 98dd1fdca1f5b82cbc7066c4a48f9ddd8f135095
Component: engine
2018-03-19 14:29:35 -07:00
24ded82e63
Merge pull request #36633 from adshmh/add-missing-setup-test-call-to-TestNetworkLoopbackNat
...
Add the missing call to setupTest to TestNetworkLoopbackNat test
Upstream-commit: 60e2dc26864370a315dbbb8e3325fe5cc78ba5d5
Component: engine
2018-03-19 20:45:22 +01:00
c9d18328ef
Merge pull request #29932 from miaoyq/container-log-add-archive
...
add support for compressibility of log file
Upstream-commit: c4e93da8a6fcd206e3fbfb07b821b5743f90f437
Component: engine
2018-03-19 15:20:17 -04:00
6bad7e6180
Test for systemd cgroupdriver memory setting
...
This is a test case for issue https://github.com/moby/moby/issues/35123 ,
making sure we can set container's memory limit when using
`native.cgroupdriver=systemd`.
[v2: skip if no systemd present]
[v3: add --iptables=false to avoid flaky tests with t.Parallel()]
[v4: rebase after PR#36507 merge]
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 4ca5c5361059e29ed31074ca5b96f8b2030b5f99
Component: engine
2018-03-19 10:33:03 -07:00
ef1461a872
Add the missing call to setupTest to TestNetworkLoopbackNat test function, to avoid leaving behind test containers
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: a0052b8f190f38bcdd24e4bf794c3ad6d2fd1b41
Component: engine
2018-03-19 10:56:13 -04:00
27bd98bb9a
Merge pull request #36617 from Microsoft/jjh/kernel-registry
...
Windows: Move kernel_windows to use golang registry functions
Upstream-commit: 7270b01e5dd1fca3fd7fed0d6fb9d2769ec5f4ba
Component: engine
2018-03-19 11:47:17 +01:00
d36e75fc44
integration/*: make e2e run without failure
...
… mainly by skipping if daemon is remote.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6016e79d2552b21643f4bfd093ce76d8ef956d79
Component: engine
2018-03-19 09:47:17 +01:00
aac739f262
Migrate DockerTrustSuite to docker/cli e2e tests
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5433ceb12ead305d8c85e8e27c4b4d842ef88ae0
Component: engine
2018-03-19 09:26:35 +01:00
