Daniel Nephin
9211237d01
Merge pull request #34767 from dnephin/deprecate-some-client
...
Cleanup client/ interface
Upstream-commit: 96255ba07ae7de2bb2a18567c478b63d5ac74ee4
Component: engine
2017-09-08 13:29:10 -04:00
John Howard
66ae0e70f8
Merge pull request #34771 from Microsoft/jjh/hcsshim
...
Revendor Microsoft/hcsshim @ v0.6.4
Upstream-commit: 8ec484ff4bef7698cc4b3ba8195dd182c2af8045
Component: engine
2017-09-07 14:51:07 -07:00
Brian Goff
b543555e86
Merge pull request #34761 from dnephin/fix-mount-create-api-test
...
Some cleanup of mount create API test
Upstream-commit: bf3a8bddeb5e1ae04b6f73bfe811372ee3e78e36
Component: engine
2017-09-07 17:09:19 -04:00
Brian Goff
58743c32f5
Merge pull request #34756 from dnephin/better-filters
...
Improve docs and interface for api/types/filters
Upstream-commit: c8400bf24dcea8e160d6b614d996b0f659c7d8d9
Component: engine
2017-09-07 17:00:59 -04:00
John Howard
810209d155
Revendor Microsoft/hcsshim @ v0.6.4
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e47c626e0a5e7285782620c027b3d5195c643a5a
Component: engine
2017-09-07 12:08:40 -07: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
2e7d5b113f
Merge pull request #34757 from dnephin/fix-test-run-environment
...
Fix TestRunEnvironment
Upstream-commit: d76f0d4e0694f5adcaab327e801ee8553620c5b3
Component: engine
2017-09-07 11:28:57 -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
Daniel Nephin
980d05f2ea
Cleanup client/ interface
...
- Remove ParseLogDetails, this is not part of the client. Moved to docker/cli
- Deprecate ParseHost and replace with ParseHostURL
- Deprecate redundant IsErr helpers
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 54242cd067c234960d1295a67271475f9d099f22
Component: engine
2017-09-07 12:32:38 -04: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
Vincent Demeester
6f155f233b
Merge pull request #34021 from nishanttotla/dont-set-architecture-constraint
...
Clear Architecture field in platform constraint for arm architectures
Upstream-commit: ea220e70a13963da544645376cd9331021eec6b4
Component: engine
2017-09-07 11:18:12 +02:00
Vincent Demeester
a8b7a6b071
Merge pull request #34730 from simonferquel/fix-TestEventsOOMDisableTrue-flakkyness
...
Events CLI tests: fix flakyness of TestEventsOOMDisableTrue
Upstream-commit: 72eb1d0a47488d279df2b80bfd3f6091eaff66a7
Component: engine
2017-09-07 11:16:37 +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
Daniel Nephin
567b25fb28
Some cleanup of mount create API test
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 58b96aced87b33c4175fa5d3422289f763ab599d
Component: engine
2017-09-06 19:32:35 -04:00
Tibor Vass
5063459b89
Merge pull request #34748 from dnephin/cleanup-client-deps
...
Cleanup client/ package dependencies
Upstream-commit: be97c66708c24727836a22247319ff2943d91a03
Component: engine
2017-09-06 16:14:29 -07:00
Daniel Nephin
11b376603e
Fix a bad assumption
...
If the empty variable happens to be sorted to the end of the list then TrimSpace()
would remove it. Instead only strip the single trailing newline.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: fff605c3b3557acf6bf793813d695fba59d7fa21
Component: engine
2017-09-06 17:32:56 -04:00
Daniel Nephin
cb4257d5fb
Cleanup filter package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 065118390a3ecaf0dbd2fa752d54d43f8f1e8ec6
Component: engine
2017-09-06 16:41:47 -04:00
Daniel Nephin
9f20b18453
Move tlsconfig to client package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6916c215b00ab4d7edf4be14848ab2e695697381
Component: engine
2017-09-06 16:39:55 -04:00
Daniel Nephin
cc7b3620f0
Remove libtrust dep from api
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2f007e46d0100d865a061c1a8e544bddc0b7a368
Component: engine
2017-09-06 12:05:19 -04:00
Daniel Nephin
33519380e5
Move names to a more appropriate package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 22b246417f52aa6bd0e358e41e2bfb9c0a59c867
Component: engine
2017-09-06 12:05:16 -04:00
Yong Tang
67de569278
Merge pull request #34745 from simonferquel/fix-pkg-archive-conversion
...
Re-enable some conversion for darwin-amd64 platform
Upstream-commit: 945d80cd6ad5fc9d30a947ab8872721272ac7bff
Component: engine
2017-09-06 09:00:29 -07:00
Vincent Demeester
6ee8cdfa2e
Merge pull request #34697 from fcrisciani/ln-vendoring
...
Vendoring libnetwork
Upstream-commit: 3b449dbfbad4374f618a901ff585d2ea62b1029e
Component: engine
2017-09-06 17:52:56 +02:00
Simon Ferquel
0bd644faaf
re-enable some conversion for darwin-amd64 platform
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
Upstream-commit: 7c9e64a2e1891bf1020d9312a18741c734fa1cd6
Component: engine
2017-09-06 12:22:41 +02:00
Victor Vieux
54efaca689
Merge pull request #34707 from vieux/force_format
...
force inspect test format
Upstream-commit: d7b4c7e0eac223eda54940adbb4c44bf71ec039c
Component: engine
2017-09-05 13:35:07 -07: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
Victor Vieux
33179f56a2
force inspect test format
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 8e6567cb837e1c885de5146517557c7a5d8a5f17
Component: engine
2017-09-05 08:31:44 -07:00
Simon Ferquel
30986cbc05
Avoid failing the test if container is already stopped
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
Upstream-commit: adf75503dba2e782139173c011999eacd0c3d7e2
Component: engine
2017-09-05 17:19:57 +02:00
Yong Tang
db0c7d8918
Merge pull request #34704 from seemethere/add_overwriteable_version
...
Allows VERSION to be overwritten by env variable
Upstream-commit: 9e0a1845f23327c4623a49329b2480d98e02173f
Component: engine
2017-09-04 16:47:52 -07: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
Victor Vieux
80e330e43c
Merge pull request #34706 from dnephin/fix-ci-master
...
Fix lint errors on master
Upstream-commit: 9b4a616e4b3819ef062780b5fd854616be2c22bb
Component: engine
2017-09-01 15:45:32 -07:00
Nishant Totla
2578773887
Clear Architecture field in platform constraint for arm architectures
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 772af6040ed4f2f26c22901597333a900be17aae
Component: engine
2017-09-01 13:08:20 -07:00
Brian Goff
7ded486a94
Merge pull request #34700 from tklauser/pkg-term-winsize
...
pkg/term: use IoctlGetWinsize/IoctlSetWinsize from golang.org/x/sys/unix
Upstream-commit: a127269803b9053713cd51d20f4ae00dae19b6d1
Component: engine
2017-09-01 15:58:25 -04: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
Yong Tang
ec509204fd
Merge pull request #34689 from chchliang/envunitest
...
add an exception case
Upstream-commit: a301f96df6f951027a0c795e9d72ef657b51c2f9
Component: engine
2017-09-01 10:53:42 -07: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
Brian Goff
d0e9f9bfe2
Merge pull request #34695 from dnephin/fix-rename-integration-test
...
Remove assertions that were testing CLI behaviour
Upstream-commit: a337aaab08babcd7b5d70d91ad0c3c7ad16a649d
Component: engine
2017-09-01 10:18:43 -04:00
Tobias Klauser
2be7b6733b
pkg/term: use IoctlGetWinsize/IoctlSetWinsize from golang.org/x/sys/unix
...
Use unix.IoctlGetWinsize and unix.IoctlSetWinsize instead of manually
reimplementing them.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch >
Upstream-commit: 32dfc0cb64992aa5e208273658b6e404268c63f4
Component: engine
2017-09-01 14:43:09 +02:00
chchliang
4e9d201c36
add an exception case and map changge to struct with expect error
...
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn >
add an exception case and map changge to struct with expect error
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn >
Upstream-commit: 76e9f0d6d45d7464c34223c25337128530b1a0c6
Component: engine
2017-09-01 15:49:56 +08:00
Flavio Crisciani
35c8905315
Vendoring libnetwork
...
Diff:
5b28c0ec98...d5c8223190
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 1ddeb11835600127a3319fc0dd3764e57ffbf521
Component: engine
2017-08-31 19:10:23 -07:00
Daniel Nephin
6742eeff7c
Remove assertions that were testing CLI behaviour.
...
These tests will be moved to docker/cli
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6590ee0dfba45d7eb4ee12f72621b90294925f20
Component: engine
2017-08-31 18:19:17 -04:00
Yong Tang
c7214e3099
Merge pull request #34656 from dnephin/move-testenv-to-internal
...
Move integration-cli/environment to an internal package
Upstream-commit: 184cea5ff710abde25547749e5608b24a255ba09
Component: engine
2017-08-31 08:52:24 -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
Daniel Nephin
9f71faec7e
Refactor test environment
...
split all non-cli portions into a new internal/test/environment package
Set a test environment on packages instead of creating new ones.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f85ef42ea538911c82821ab6cc0166d492e9a379
Component: engine
2017-08-30 13:13:18 -04:00
Daniel Nephin
511c42a159
Update fixtures/load to use the APIClient
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 61e7d0595d0838671570fbaef21f35a4a41faed7
Component: engine
2017-08-30 13:11:06 -04:00
Yong Tang
17038054a4
Merge pull request #34667 from dnephin/add-container-config-decode-tests
...
Add container config decode tests
Upstream-commit: e95585f7b0c1ad93dee0fb5cbd8a5c387053f140
Component: engine
2017-08-30 07:25:27 -07:00
Daniel Nephin
de66c38335
Merge pull request #34668 from dnephin/fix-registry-dependencies
...
Fix bad import graph from opts/opts.go
Upstream-commit: d85e83960b4aa77e8cf59dd1eabac1884359575f
Component: engine
2017-08-29 19:55:23 -04:00
Yong Tang
2dd395d190
Merge pull request #34669 from dnephin/cleanup-registry-client-2
...
Remove command line flag install from registry package
Upstream-commit: 73a5e7b5c75023263e90b830944a45f0723df6a1
Component: engine
2017-08-29 16:54:08 -07:00