Brian Goff
b0b9a25e7e
Move log validator logic after plugins are loaded
...
This ensures that all log plugins are registered when the log validator
is run.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-02-15 11:53:11 -05:00
Brian Goff
7d8fa84e11
Merge pull request #36322 from thaJeztah/fix-build
...
Fix import path
2018-02-15 11:52:38 -05:00
Sebastiaan van Stijn
ce35439015
Fix import path
...
The utils package was moved to "internal" in commit
af306d149e
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-15 15:29:45 +01:00
Sebastiaan van Stijn
1690103906
Merge pull request #36318 from yongtang/02152018-docker-py
...
Update docker-py to 5e28dcaace5f7b70cbe44c313b7a3b288fa38916
2018-02-15 15:15:23 +01:00
Sebastiaan van Stijn
ea34f82711
Merge pull request #36055 from cpuguy83/slave_mounts_for_root
...
Use rslave propagation for mounts from daemon root
2018-02-15 12:57:25 +01:00
Yong Tang
6f8af32f22
Merge pull request #36320 from yongtang/02142018-diff-tests
...
Migrate container diff tests in integration-cli to api tests.
2018-02-15 03:53:21 -08:00
Yong Tang
9537498ced
Migrate container diff tests in integration-cli to api tests.
...
This fix migreates container diff tests in integration-cli
to api tests.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-15 01:03:29 -08:00
Yong Tang
f19bea20c9
Remove docker_cli_diff_test.go from integration-cli
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-15 01:03:29 -08:00
Sebastiaan van Stijn
e3102d5055
Merge pull request #36298 from arm64b/fix-internal-network-mode
...
Fix `DockerNetworkInternalMode` issue
2018-02-15 09:49:15 +01:00
Vincent Demeester
41bed9e6d5
Merge pull request #36308 from thaJeztah/bump-containerd-1.0.2
...
Bump containerd to 1.0.2 (cfd04396dc68220d1cecbe686a6cc3aa5ce3667c)
2018-02-15 09:12:55 +01:00
Vincent Demeester
d6ac79be34
Merge pull request #36315 from dnephin/move-commit-to-container-api
...
Move commit to container backend
2018-02-15 09:10:52 +01:00
Yong Tang
9d9af83b0f
Update docker-py to 5e28dcaace5f7b70cbe44c313b7a3b288fa38916
...
This fix updates docker-py:
```
-ENV DOCKER_PY_COMMIT 1d6b5b203222ba5df7dedfcd1ee061a452f99c8a
+ENV DOCKER_PY_COMMIT 5e28dcaace5f7b70cbe44c313b7a3b288fa38916
```
The updated docker-py includes https://github.com/docker/docker-py/pull/1909
which is required to have #36292 pass the tests.
Full diff is in 1d6b5b2032...5e28dcaace
.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-02-15 07:43:44 +00:00
Daniel Nephin
e574c5ae73
Move commit to container backend
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2018-02-14 16:06:12 -05:00
Brian Goff
68c3201626
Merge pull request #36237 from cpuguy83/zfs_do_not_unmount
...
Do not recursive unmount on cleanup of zfs/btrfs
2018-02-14 09:49:17 -05:00
Brian Goff
62c433cd92
Merge pull request #35892 from javabrett/dockerfile-on-docker-build-comments
...
Updated docker-on-docker build-notes.
2018-02-14 09:26:59 -05:00
Brett Randall
ba49e8c498
Updated docker-on-docker build-notes.
...
These are now more in-line with wiki instructions. Also removes
broken/deprecated make target test-unit.
Signed-off-by: Brett Randall <javabrett@gmail.com>
2018-02-14 22:08:37 +11:00
Akihiro Suda
e698b6e098
Merge pull request #36305 from cpuguy83/35370_fix_logs_eof
...
Fix log tail with empty logs
2018-02-14 16:41:22 +09:00
Vincent Demeester
0f6dc962a5
Merge pull request #35749 from thaJeztah/change-swagger-install
...
Update go-swagger installation steps in Dockerfile
2018-02-14 08:20:06 +01:00
Vincent Demeester
72d89c25c0
Merge pull request #36301 from vdemeester/clean-maintainers
...
Remove some maintainers 👼
2018-02-14 08:09:29 +01:00
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
Brian Goff
f40860c5f3
Fix log tail with empty logs
...
When tailing a container log, if the log file is empty it will cause the
log stream to abort with an unexpected `EOF`.
Note that this only applies to the "current" log file as rotated files
cannot be empty.
This fix just skips adding the "current" file the log tail if it is
empty.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-02-13 21:33:05 -05:00
Sebastiaan van Stijn
175cfdcfb5
Update containerd dependencies to match 1.0.2
...
- ed1cbe1fc3...4f6e87ae04
- 29da22c617...c0710c92e8
- runc (already ahead)
- 76e68349ad...d452837986
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-14 02:13:07 +01:00
Sebastiaan van Stijn
c2fb6db55b
Bump containerd to 1.0.2 (cfd04396dc68220d1cecbe686a6cc3aa5ce3667c)
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-02-14 01:35:22 +01: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
Vincent Demeester
de664ac749
Clean some maintainers 👼
...
albers, aluzzardi, ehazlett, icecrime, lk4d4, mavenugo 🤗
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-02-13 14:42:50 +01: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