Christopher Crone
061914f0d5
e2e: Do not print test logs by default
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 5195ec8fb064795df77290a100e5d21ee482d68a
Component: engine
2017-10-13 13:40:21 +02:00
Vincent Demeester
68a51d42bd
Merge pull request #34941 from dsheets/authz-tests-api-port
...
integration/plugin/authz: port tests from integration-cli
Upstream-commit: fe33ea9b0e5a295118feee0f46f45d92f8cc6103
Component: engine
2017-10-11 16:15:56 +02:00
Daniel Nephin
63ac4b5569
Skip all testdata in integration
...
Also skip.IfCondition directly from the test, so that the skip message is correct
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 104c1c68438c5c59ab0e7a5fb2da6bae4ce6d080
Component: engine
2017-10-02 17:02:52 -04:00
David Sheets
4b75060b8c
integration/plugin/authz: inline CLI work-alike library
...
I strongly disagree with the design of this pull request.
Signed-off-by: David Sheets <dsheets@docker.com >
Upstream-commit: 1574d91463efd4741c2f6620718abdb624967584
Component: engine
2017-10-02 14:20:59 +01:00
David Sheets
8ebec737fa
integration/plugin/authz: port tests from integration-cli
...
Signed-off-by: David Sheets <dsheets@docker.com >
Upstream-commit: 928b0631c96ae5cb0105b3bf42d43ba529a14aa1
Component: engine
2017-10-02 14:20:59 +01:00
Sebastiaan van Stijn
bf69bcbb74
Bump vndr to a6e196d8b4b0cbbdc29aebdb20c59ac6926bb384
...
Includes a fix to cleanup unused vendor-directories
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 67b1f54dc2413a018ac42e4335ca182a2d0b8a1d
Component: engine
2017-09-29 15:09:57 +02:00
Kenfe-Mickaël Laventure
4d03073a2c
Merge pull request #34811 from yongtang/runc
...
Update runc to 0351df1c5a66838d0c392b4ac4cf9450de844e2d
Upstream-commit: 502eddb9859dcd30ce46732b24cefe49cf1ccbd1
Component: engine
2017-09-27 08:44:43 -07:00
Yong Tang
b987e63572
Update runc to 0351df1c5a66838d0c392b4ac4cf9450de844e2d
...
This fix updates runc to 0351df1c5a66838d0c392b4ac4cf9450de844e2d
With this fix the warnings generated by netgo and dlopen by go 1.9
are addressed.
See
- opencontainers/runc#1577
- opencontainers/runc#1579
This fix is part of the efforts for go 1.9 (#33892 )
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: e0ff1d147bc12234f1be25a620bf6b3bf3179d97
Component: engine
2017-09-26 11:07:27 +00:00
Daniel Nephin
e55d5634bf
Add a new entrypoint for CI
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: dbf580be57a4bb854d7ce20d313e3a22ea337be5
Component: engine
2017-09-20 17:26:30 -04:00
Yong Tang
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
Christopher Crone
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
Christopher Crone
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
Christopher Crone
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
Christopher Crone
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
Kir Kolyshkin
9d7caf267c
Update gometalinter
...
This is mostly to include the following fix:
https://github.com/alecthomas/gometalinter/commit/78e3fbd90a20b03a
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 6be4b3703c2a2b41ccdf97fcf8d2da6863a402bd
Component: engine
2017-09-12 18:46:37 -07:00
Kir Kolyshkin
57c34191f2
gometalinter: add per-platform configurable options
...
I have run into two separate issues while doing 'make all' on armhf
(a Scaleway C1 machine, same as used in CI). This commit fixes both.
1. There were a lot of "not enough memory" errors, and after that
in a few runs gometalinter just stuck forever on FUTEX_WAIT with
no children left.
Looking into docs, I found the --enable-gc option which solved the issue.
[Update: this has already been added]
2. Timeout of 2 minutes is not enough for the abovementioned platform.
The longest running linter is goimports which takes almost 6 minutes to run.
Set the timeout to the observable run time roughly doubled.
In addition, ARM platforms does not have too much RAM (2GB), so
running too many processes in parallel might be problematic. Limit
it by using -j2
[v2: make the timeout arch-dependent, also tested on aarch64 (2m15s)]
[v3: moved timeout setting to Dockerfiles]
[v4: generalized to GOMETALINTER_OPTS, added -j2 for ARM platforms]
[v5: rebase to master]
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: b96093fa56a9c085cb3123010be2430753c40cbc
Component: engine
2017-09-12 18:45:34 -07:00
Daniel Nephin
18c29c5c5f
Add gosimple linter
...
Update gometalinter
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f7f101d57ef8cbf2d8723a18b7d723c5c5dd04b6
Component: engine
2017-09-12 12:09:59 -04:00
Daniel Nephin
fdd3e06a77
Add ineffassign linter
...
Also enable GC in linting to reduce memory usage.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 09652bf8789142a5a5a1de2d41590300761b4954
Component: engine
2017-09-08 18:23:21 -04:00
Victor Vieux
f1b816d854
Merge pull request #34685 from dnephin/remove-bundle-version
...
Remove version from bundle path
Upstream-commit: f69188aec9f74a946422a256c14bf8efc82f20d4
Component: engine
2017-09-07 11:53:53 -07:00
Yong Tang
d7504f67d1
Merge pull request #34738 from wgliang/optimization1
...
Optimize some wrong usage and spelling
Upstream-commit: 2dcb77b24c80dd95b52358c92436f68f2a33eb01
Component: engine
2017-09-07 09:45:14 -07:00
Vincent Demeester
5f49aab36a
Merge pull request #34687 from tych0/bump-runc
...
bump runc version
Upstream-commit: a68ee8c8950b1923c3a92b9cec0d9a723897111d
Component: engine
2017-09-07 14:52:18 +02:00
wangguoliang
eec1d4ef54
Optimize some wrong usage and spelling
...
Signed-off-by: wgliang <liangcszzu@163.com >
Upstream-commit: 94cefa21459a0c620e5a9c2da04df6d3a43dae17
Component: engine
2017-09-07 09:44:08 +08:00
Yong Tang
f109c25168
Merge pull request #34682 from dnephin/fail-build-on-integration-suite
...
Fix integration suite and propagate failures
Upstream-commit: 975675e9245e1d9a18cae978a0231ff83772048b
Component: engine
2017-09-05 12:40:00 -07:00
Daniel Nephin
56b8d8a2a0
Remove version from bundle path
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: bac2447964c8cdfcf35f928841d60310db997c76
Component: engine
2017-09-05 13:38:32 -04:00
Eli Uriegas
0699e6b42a
Allows VERSION to be overwritten by env variable
...
VERSION was hardcoded to be used as the `VERSION` file from the root
directory, this makes it so that you have the option to overwrite this.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 76643025793ca742b1c19bd35cab35c8ff7d3e77
Component: engine
2017-09-01 15:47:15 -07:00
Daniel Nephin
7ecd17f5d0
Fix lint errors.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d0dbf8e397afe0365be59f98e5f52bb4d8d3f4e5
Component: engine
2017-09-01 15:12:22 -04:00
Daniel Nephin
58ef7a0132
Fix integration suite and propagate failures
...
Failures from the integration suite were not propagating to the outter shell
for some reason. Handle the failure with an if exit 1.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 96707bc600747257e82917ca079fa5006d636b2c
Component: engine
2017-09-01 13:07:47 -04:00
Yong Tang
8ef302a435
Merge pull request #34625 from dnephin/more-linters
...
Add interfacer and unconvert linters
Upstream-commit: cb952bf00695b3429476f59c5534a9c604c6f010
Component: engine
2017-09-01 08:46:08 -07:00
Tycho Andersen
3c0eab373a
bump runc version
...
This picks up 66eb2a3e8fc930e1bb6703561152edf5ab550bff, which fixes
readonly containers in user namespaces.
Signed-off-by: Tycho Andersen <tycho@docker.com >
Upstream-commit: 47e9d856c43b6b251d86afc099ec092aa83b1534
Component: engine
2017-08-30 14:26:59 -07:00
Daniel Nephin
98aa729835
Merge pull request #34554 from dnephin/use-release-version-of-docker-cli
...
Pin docker-cli version to the 17.06-ce release version
Upstream-commit: e23965d620e1655f44d47edd8b5e08c2c384fd03
Component: engine
2017-08-30 13:43:39 -04:00
John Howard
2ca5291236
Merge pull request #34356 from mlaventure/update-containerd
...
Update containerd to 06b9cb35161009dcb7123345749fef02f7cea8e0
Upstream-commit: 285bc997311b75263bfac9e8ff7c4d60cdeca0bc
Component: engine
2017-08-24 14:25:44 -07:00
Daniel Nephin
01392057b0
Add unconvert linter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2f5f0af3fdb7e9ee607a0e178dbe2af6e10cccf4
Component: engine
2017-08-24 15:08:31 -04:00
Daniel Nephin
157456237a
Add interfacer linter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 709bf8b7bcc67f3ea3a7a39e29af8ae16a38b06f
Component: engine
2017-08-24 15:08:26 -04:00
Daniel Nephin
5d498bba11
Build the docker cli for unreleased platforms
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5ba5e6fff438029195c0df1303481c1e260bc6ec
Component: engine
2017-08-23 17:50:02 -04:00
Daniel Nephin
5380c10ac4
Pin docker-cli version to the 17.06-ce release version
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: cef786f787dcfd87a50c7d0b7183724ab1242ed8
Component: engine
2017-08-22 14:29:16 -04:00
Daniel Nephin
94c685a721
Add deadcode linter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 62c1f0ef41e6cd88a8846da1c11976a320ca8b41
Component: engine
2017-08-21 18:18:50 -04:00
Daniel Nephin
6b3b192846
Add goimports to linters.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 372670b5074b077927314cdf46af30f8752e7db0
Component: engine
2017-08-21 18:15:08 -04:00
Kenfe-Mickael Laventure
5305a1cd9e
Update containerd to 06b9cb35161009dcb7123345749fef02f7cea8e0
...
This also update:
- runc to 3f2f8b84a77f73d38244dd690525642a72156c64
- runtime-specs to v1.0.0
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 45d85c99139bbd16004bbedb7d5bac6a60264538
Component: engine
2017-08-21 12:04:07 -07:00
Yong Tang
1c65c425a3
Merge pull request #34560 from dnephin/remove-some-cli-tests
...
Remove a couple cli tests, which are now unit tests in docker/cli
Upstream-commit: 361a473121f2cd4e688a3bb71fbeff00aaf674d7
Component: engine
2017-08-19 14:31:05 -07:00
Yong Tang
0f9c6d96f0
Merge pull request #34551 from dnephin/use-gometalinter
...
Use gometalinter for linting
Upstream-commit: 4c8cde597daf3d96f74d3b6c4ff3a23e51f8abd3
Component: engine
2017-08-19 09:40:47 -07:00
Daniel Nephin
39c495c1d1
Remove config tests, which are now unit tests in docker/cli
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c467a112050d595ca0b48122cd4ce81fcf6cefde
Component: engine
2017-08-18 14:24:52 -04:00
Daniel Nephin
3995851d84
Add a validation for integration-cli deprecation.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 89c0c5feb28c01dfc4e026b98107ca07c8d6c956
Component: engine
2017-08-18 14:24:32 -04:00
Daniel Nephin
de626e10fb
Fix golint errors.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9b47b7b1519c5f2138e2933fb1fc459eb00895c0
Component: engine
2017-08-18 14:23:44 -04:00
Daniel Nephin
63a6b47bce
Use gometalinter for linting
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d7e2c4ce773b3a54f47e84a5a1ef22eb72c978b5
Component: engine
2017-08-18 14:23:43 -04:00
Daniel Nephin
9685380dbb
Merge pull request #34492 from AkihiroSuda/fix-integration-cli-on-swarm
...
Fix `make build-integration-cli-on-swarm`
Upstream-commit: 07227a1227e1cdecdd89060d98bf67d0f49503e6
Component: engine
2017-08-14 12:20:18 -04:00
Brian Goff
2b769b8b71
Merge pull request #34362 from kolyshkin/update-libdevmapper
...
Dockerfile*: bump devmapper library version
Upstream-commit: 31d8d2253ebb77ef7b341606cbdf0e76835e64db
Component: engine
2017-08-14 09:56:43 -04:00
Akihiro Suda
bb626a427e
Fix make build-integration-cli-on-swarm
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 2fddf9f6efc155c880dfa689bd7df3a5a31ba459
Component: engine
2017-08-12 06:53:25 +00:00
Daniel Nephin
48f5d911ea
Fix exclude list in make.ps1
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e593b72cc9d8a2fd9c7cd98b82ed468dfe3577e2
Component: engine
2017-08-09 11:03:20 -04:00
Daniel Nephin
b63db0a43c
move api test client setup to a package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c66c0447efe9c7e7afdcf75b950897c67894256b
Component: engine
2017-08-09 11:02:57 -04:00
Daniel Nephin
e443662141
Protect images in the integration/ suite
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 5fa134b9061d0b794e9e5b887a8ea4ee15fecb61
Component: engine
2017-08-09 11:02:57 -04:00