Dennis Chen
3a97100976
Unify the frozen images to the multi-arch version
...
Update and unify the `busybox` images on all arches to the `glibc` multi-arch
version and remove the temp workaround on amd64 which uses the old version
busybox (v1.26) before this PR to bypass the failure of those network related
test cases. Also, this PR will fix all the network related issues with `glibc`
version `busybox` image.
Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2018-02-14 03:59:04 +00:00
John Stephens
04cb98e6b5
Merge pull request #36269 from Microsoft/jjh/remove-lcow-api-platform-if-omitted
...
Remove interim env var LCOW_API_PLATFORM_IF_OMITTED
2018-02-13 15:12:18 -08:00
Brian Goff
060893ab5d
Merge pull request #36271 from dnephin/use-tag-image-in-commit
...
Use TagImage in Commit
2018-02-13 16:40:17 -05:00
Yong Tang
5eb2f98a35
Merge pull request #36222 from yongtang/02062018-runc
...
Update runc to 6c55f98695e902427906eed2c799e566e3d3dfb5
2018-02-13 12:40:35 -08:00
Brian Goff
fc1f95bdb7
Merge pull request #36290 from cpuguy83/use_c8d_fs_pkg
...
Use continuity fs package for volume copy
2018-02-13 15:22:17 -05:00
Daniel Nephin
bbd9b7ffdf
Merge pull request #36294 from yongtang/02122018-update
...
Update api tests to use container.Run/Create in helper package
2018-02-13 13:21:49 -05:00
Vincent Demeester
82d1aedf53
Merge pull request #36291 from yongtang/02052018-configs-test
...
Migrates several swarm configs tests from integration-cli to api tests
2018-02-13 17:24:26 +01:00
Yong Tang
d644050db2
Update runc to 6c55f98695e902427906eed2c799e566e3d3dfb5
...
This fix is related to 36219
This fix updates runc to:
```
-RUNC_COMMIT=9f9c96235cc97674e935002fc3d78361b696a69e
+RUNC_COMMIT=6c55f98695e902427906eed2c799e566e3d3dfb5
-github.com/opencontainers/runc 9f9c96235cc97674e935002fc3d78361b696a69e
+github.com/opencontainers/runc 6c55f98695e902427906eed2c799e566e3d3dfb5
```
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-13 15:56:44 +00:00
Yong Tang
eaa1a0c218
Add WithNetworkMode, WithExposedPorts, WithTty, WithWorkingDir to container helper functions
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-13 15:45:40 +00:00
Yong Tang
9fcd2a0510
Update api tests to use container.Run/Create in helper package
...
This fix is a sync up with 36266 so that relevant api tests
use the newly added container.Run/Create in helper package
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-13 14:54:31 +00:00
Doug Davis
95ce998c10
Merge pull request #36299 from liubin/fix-typo-pkg
...
Fix typo and incorrect return value in pkg
2018-02-13 01:23:58 -05:00
John Stephens
bf1345d0b6
Merge pull request #36268 from Microsoft/jjh/rs3-bump
...
Windows: Bump to final RS3 build number
2018-02-12 14:49:33 -08:00
Brian Goff
b3aab5e31f
Use continuity fs package for volume copy
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-02-12 16:43:51 -05:00
Yong Tang
63bd2425fd
Migrates several swarm configs tests from integration-cli to api tests
...
This fix migrates several swarm configs tests from integration-cli to api tests
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-12 19:38:56 +00:00
Yong Tang
3130176910
Remove docker_api_swarm_config_test.go
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-12 19:33:17 +00:00
Yong Tang
9cbe066e27
Merge pull request #36246 from sirreal/fix/swagger-buildargs-type
...
Fix string type for buildargs API definition
2018-02-12 11:21:42 -08:00
Yong Tang
919be92823
Merge pull request #36284 from yongtang/02112018-update-tests
...
Migrate some update restart tests to api tests
2018-02-12 11:21:21 -08:00
Yong Tang
1bb389121d
Merge pull request #36261 from yongtang/02082018-oom-killed
...
Migrate docker_cli_oom_killed_test.go to api tests
2018-02-12 09:50:26 -08:00
Vincent Demeester
848cf75f1f
Merge pull request #36234 from yongtang/02042018-config-ls
...
Migrate config list tests from integration-cli to api tests
2018-02-12 18:36:14 +01:00
Vincent Demeester
bc17d0724a
Merge pull request #36270 from dperny/fix-client-tls
...
Fix TLS from environment variables in client
2018-02-12 18:35:55 +01:00
Vincent Demeester
54d56bbcf4
Merge pull request #36283 from yongtang/02052018-secrets-tests
...
Migrates several swarm secrets from integration-cli to api tests
2018-02-12 18:34:29 +01:00
Yong Tang
5d26170cfd
Merge pull request #36279 from yongtang/36266-follow-up
...
Update api tests to use the newly added container helper package
2018-02-12 08:24:12 -08:00
Yong Tang
5b65cee915
Migrate some update restart tests to api tests
...
This fix migrates some update restart tests in
integration-cli to api tests in integration.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-12 16:23:08 +00:00
Daniel Nephin
945b786c14
Merge pull request #36285 from yongtang/02112018-session-tests
...
Migrates session tests in integration-cli to api tests
2018-02-12 11:04:49 -05:00
Jon Surrell
344c73ac67
Add example buildargs usage
...
Signed-off-by: Jon Surrell <jon.surrell@gmail.com>
2018-02-12 14:09:37 +01:00
Jon Surrell
de2b2b5e4b
Reformat to multi-line
...
Signed-off-by: Jon Surrell <jon.surrell@gmail.com>
2018-02-12 14:09:31 +01:00
Vincent Demeester
812592d911
Merge pull request #36249 from cpuguy83/36145_fix_container_reload
...
Fix container cleanup on daemon restart
2018-02-12 11:36:18 +01:00
Yong Tang
5f9570c7ac
Merge pull request #36273 from yongtang/02092018-pause_test
...
Migrate container pause tests to api tests
2018-02-12 02:32:52 -08:00
Sebastiaan van Stijn
84bde485d7
Merge pull request #36275 from liubin/fix-daemon
...
Fix typos in daemon directory
2018-02-12 09:18:01 +01:00
Yong Tang
ea2f076ca9
Migrate container pause tests to api tests
...
This fix migrates container pause tests from integration-cli
to api tests in integration/.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-12 01:24:43 +00:00
Yong Tang
1d40c6a899
Migrates session tests in integration-cli to api tests
...
This fix migrates session tests in integration-cli to
api tests in integration.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-11 23:14:39 +00:00
Yong Tang
f955d2e204
Migrates several swarm secrets from integration-cli to api tests
...
This fix migrates several swarm secrets from integration-cli to api tests
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-11 21:17:44 +00:00
Yong Tang
3499557c9b
Remove docker_api_swarm_secret_test.go
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-11 21:17:25 +00:00
Yong Tang
3c21274b76
Migrate docker_cli_oom_killed_test.go to api tests
...
This fix migrates tests in integration-cli/docker_cli_oom_killed_test.go
to api tests.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-11 20:09:32 +00:00
Yong Tang
246f450ac4
Migrate config list tests from integration-cli to api tests
...
This fix migrates config list tests from integration-cli to api tests
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-11 19:39:56 +00:00
Yong Tang
955a2b8194
Remove integration-cli/docker_cli_config_ls_test.go
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-11 19:26:39 +00:00
Akihiro Suda
178ebca0b9
Merge pull request #36257 from arm64b/fix-inspect-network-timeout
...
Fix timeout issue of `InspectNetwork` on AArch64
2018-02-11 20:50:08 +09:00
Akihiro Suda
52a65f6e34
Merge pull request #36276 from nogoegst/update-vendor-x-sys
...
Update golang.org/x/sys vendor
2018-02-11 17:08:15 +09:00
Yong Tang
e9f19df6a9
Update api tests to use the newly added container helper package
...
This fix is a follow up to 36266 to update some api tests
to use the newly added container helper package.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-10 23:30:40 +00:00
Yong Tang
6453d49d05
Remove integration-cli/docker_cli_pause_test.go
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-10 23:03:55 +00:00
Yong Tang
d07d3e7117
Merge pull request #36266 from vdemeester/integration-container-helper
...
Add an integration/internal/container helper package
2018-02-10 12:57:58 -08:00
Vincent Demeester
0bb7d42b03
Add an integration/internal/container helper package
...
To help creating/running/… containers using the client for test integration.
This should make test more readable and reduce duplication a bit.
Usage example
```
// Create a default container named foo
id1 := container.Create(t, ctx, client, container.WithName("foo"))
// Run a default container with a custom command
id2 := container.Run(t, ctx, client, container.WithCmd("echo", "hello world"))
```
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-02-10 17:29:38 +01:00
Ivan Markin
6f66ccaf50
Update golang.org/x/sys vendor to 37707fdb30a5b38865cfb95e5aab41707daec7fd
...
Signed-off-by: Ivan Markin <sw@nogoegst.net>
2018-02-10 15:58:20 +00:00
Vincent Demeester
3053006679
Merge pull request #36265 from vdemeester/rename-integration-util-to-internal
...
Rename integration/util to integration/internal
2018-02-10 14:25:28 +01:00
bin liu
7a7a8a33a4
Fix typos in pkg
...
Signed-off-by: bin liu <liubin0329@gmail.com>
2018-02-10 19:43:13 +08:00
bin liu
b00a67be6e
Fix typos in daemon
...
Signed-off-by: bin liu <liubin0329@gmail.com>
2018-02-10 19:42:54 +08:00
Vincent Demeester
af306d149e
Rename integration/util to integration/internal
...
Both names have no real sense, but one allows to make sure these packages
aren't used outside of `integration`.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-02-10 09:16:32 +01:00
Sebastiaan van Stijn
ab3ea81376
Merge pull request #36242 from kolyshkin/rwlayer-nil-deref
...
c.RWLayer: check for nil before use
2018-02-09 18:13:03 -08:00
Daniel Nephin
afb3eda697
Use TagImage in Commit
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-02-09 20:53:39 -05:00
Drew Erny
80904e9571
Fix TLS from environment variables in client
...
A recent change accidently caused any TLS configuration in FromEnv to be
ignored. This change alters WithHost to create a new http client only if
one doesn't already exist, and otherwise applies the logic to the
transport on the existing client. This preserves the TLS configuration
that might already be on the client.
Signed-off-by: Drew Erny <drew.erny@docker.com>
2018-02-09 15:29:32 -08:00