b7ea2ca28b
Merge component 'engine' from git@github.com:moby/moby master
2018-02-16 17:06:31 +00:00
3e970eb963
Merge component 'cli' from git@github.com:docker/cli master
2018-02-16 16:41:21 +00:00
dd73a093e4
Merge pull request #564 from thaJeztah/fix-yaml-examples
...
Fix leading characters being stripped from example sections in YAML
Upstream-commit: 847cc4bdc0
2018-02-16 11:22:24 -05:00
44b01cd383
Merge pull request #840 from dekkagaijin/master
...
GetAll -> Get to retrieve credentials from credential helpers
Upstream-commit: 69432c48db
2018-02-16 15:38:53 +01:00
0a0d1f70a0
Update tomlv for MIT License
...
The BurntSushi/toml code is now re-licensed as MIT. While
the vendored package was already updated, the tomlv binary
used was still using the old license type.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 508d5a0bc00400fb41395223cb4c8be3d9b74ade
Component: engine
2018-02-16 13:42:27 +01:00
3806697c36
Sync version of userland-proxy with libnetwork vendor
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: dcf9e7ee1a6f1b840e05e88aeb1aaf2415af38ad
Component: engine
2018-02-16 13:41:13 +01:00
d4bbb49d5c
Add notes about keeping versions in sync
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 02ca7dc6e91931d6d418cbfa006c0bcf67861ae5
Component: engine
2018-02-16 13:38:45 +01:00
b38d6149be
Merge pull request #36306 from cpuguy83/fix_logopt_validator_plugins
...
Move log validator logic after plugins are loaded
Upstream-commit: 04d97267b6b57987030862c0d355c9a49eb0e445
Component: engine
2018-02-16 11:52:23 +01:00
ff398aa5c7
Merge pull request #34900 from dnephin/send-codecov-report
...
Create and send codecov report
Upstream-commit: 01bfb6d27c6a4b12c777a11c58830a5ef83379a9
Component: engine
2018-02-16 11:36:51 +01:00
d3ed73b92e
Update authors
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f8da04a510
2018-02-16 11:20:05 +01:00
d2ece4f9f2
Merge pull request #536 from thaJeztah/update-gitignore
...
Update gitignore
Upstream-commit: 2001500c6e
2018-02-16 10:26:58 +01:00
92f3e5322f
Merge pull request #372 from jphuynh/completion-zsh-event-filter
...
Update event filter zsh completion with `disable`, `enable`, `install…
Upstream-commit: c6a7046674
2018-02-16 10:16:40 +01:00
694d72e031
Merge pull request #36323 from iporsut/remove-getOffsetToReader
...
Remove unused method from multireader package
Upstream-commit: 89ce4209bd1fed97e30843f7ce1d4b9866ad2ca6
Component: engine
2018-02-15 21:12:41 -05:00
cc3e819977
Merge pull request #36304 from Microsoft/jjh/dontrestoreimageformissinglayer
...
Don't restore image if layer does not exist
Upstream-commit: b1a1234c60cf87048814aa37da523b03a7b0d344
Component: engine
2018-02-15 14:48:36 -05:00
a4ed28f439
Merge pull request #36274 from thaJeztah/bump-swarmkit
...
Bump SwarmKit to f74983e7c015a38a81c8642803a78b8322cf7eac
Upstream-commit: 1474ec1ecf56a2ec711e42f008cbea4e8287503d
Component: engine
2018-02-15 18:40:09 +01:00
c900fb9923
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-02-15 17:07:08 +00:00
481715cd83
Merge component 'engine' from git@github.com:moby/moby master
2018-02-15 17:07:01 +00:00
b4446f4926
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 >
Upstream-commit: b0b9a25e7e60abbe143e149ccaaf4dfb62044016
Component: engine
2018-02-15 11:53:11 -05:00
1ef968a6d2
Merge component 'cli' from git@github.com:docker/cli master
2018-02-15 16:41:17 +00:00
78ec305ac2
Remove unused method from multireader package
...
Signed-off-by: Weerasak Chongnguluam <singpor@gmail.com >
Upstream-commit: 6e5fba98a53a832dc1654d87637df14c5b9ab2f1
Component: engine
2018-02-15 23:10:56 +07:00
664a0689f9
Fix import path
...
The utils package was moved to "internal" in commit
af306d149e76b100e08972cda364647bd7bcfe1e
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ce35439015e4d2190bd82a3b6dfec98f7a12ac90
Component: engine
2018-02-15 15:29:45 +01:00
2b13e6eda3
Merge pull request #36318 from yongtang/02152018-docker-py
...
Update docker-py to 5e28dcaace5f7b70cbe44c313b7a3b288fa38916
Upstream-commit: 1690103906f3e0554a0a9f7ebaadd86363b212f7
Component: engine
2018-02-15 15:15:23 +01:00
66a715574f
Merge pull request #36055 from cpuguy83/slave_mounts_for_root
...
Use rslave propagation for mounts from daemon root
Upstream-commit: ea34f827112b3837e5349827f6309a37217854cb
Component: engine
2018-02-15 12:57:25 +01:00
f2f9da3776
add tests to plugin create/remove/enable/disable commands. Part of work on #37
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 0a914da708
2018-02-15 06:20:26 -05:00
90c87d3cd7
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 >
Upstream-commit: 9537498cedc4e28ee0c8c26ba3d9e59ebb59fcad
Component: engine
2018-02-15 01:03:29 -08:00
1903b720b8
Remove docker_cli_diff_test.go from integration-cli
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: f19bea20c91e1cd5a748aa241e7083e8c6246634
Component: engine
2018-02-15 01:03:29 -08:00
bb78e86790
Merge pull request #36298 from arm64b/fix-internal-network-mode
...
Fix `DockerNetworkInternalMode` issue
Upstream-commit: e3102d5055995a43b090dbc29342a1846a39edae
Component: engine
2018-02-15 09:49:15 +01:00
f91bc41f1e
Merge pull request #36308 from thaJeztah/bump-containerd-1.0.2
...
Bump containerd to 1.0.2 (cfd04396dc68220d1cecbe686a6cc3aa5ce3667c)
Upstream-commit: 41bed9e6d55c39abac701db7a8492026886a95d5
Component: engine
2018-02-15 09:12:55 +01:00
d80026fd7e
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...5e28dcaaceyong.tang.github@outlook.com >
Upstream-commit: 9d9af83b0fd70ff6a7faa15cf8746669f0f3b588
Component: engine
2018-02-15 07:43:44 +00:00
b741266882
Update readme to supported packages
...
Signed-off-by: Kyle Spiers <kyle@spiers.me >
Upstream-commit: a82d3959676cf185fb7a0511edb036983cedbf21
Component: packaging
2018-02-14 15:21:31 -08:00
0e750709d3
Move commit to container backend
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e574c5ae73f2f54c47319e5e4a17b16bd93213be
Component: engine
2018-02-14 16:06:12 -05:00
8bb8847f9c
Merge pull request #36237 from cpuguy83/zfs_do_not_unmount
...
Do not recursive unmount on cleanup of zfs/btrfs
Upstream-commit: 68c3201626439d5be5c24d14d4fe7e27fe93954d
Component: engine
2018-02-14 09:49:17 -05:00
e156b95318
Merge pull request #35892 from javabrett/dockerfile-on-docker-build-comments
...
Updated docker-on-docker build-notes.
Upstream-commit: 62c433cd922a9dbd2b989d098fe331c939fe6b71
Component: engine
2018-02-14 09:26:59 -05:00
1d51022fe8
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 >
Upstream-commit: ba49e8c49830b69c833edff3c393716da20f897a
Component: engine
2018-02-14 22:08:37 +11:00
9ab4ce343a
Merge pull request #36305 from cpuguy83/35370_fix_logs_eof
...
Fix log tail with empty logs
Upstream-commit: e698b6e098ac696daa1a7a80d4bdac08b305b328
Component: engine
2018-02-14 16:41:22 +09:00
d88a6732e6
Merge pull request #35749 from thaJeztah/change-swagger-install
...
Update go-swagger installation steps in Dockerfile
Upstream-commit: 0f6dc962a5ad650dcb3b5a72ce4eb831deacda7b
Component: engine
2018-02-14 08:20:06 +01:00
4d4ce758aa
Merge pull request #876 from vdemeester/maintainers-clean
...
Remove some maintainers 👼
Upstream-commit: 3e5f2f29ad
2018-02-14 08:10:04 +01:00
16fed85531
Merge pull request #36301 from vdemeester/clean-maintainers
...
Remove some maintainers 👼
Upstream-commit: 72d89c25c0c8d5e0e61f3eec92765c2078924ab2
Component: engine
2018-02-14 08:09:29 +01:00
b660bf165d
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 >
Upstream-commit: 3a971009763387856bb7f162accdf6714100e39b
Component: engine
2018-02-14 03:59:04 +00:00
0fb8610c54
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 >
Upstream-commit: f40860c5f3d3575629d4a932207e866c1fea625d
Component: engine
2018-02-13 21:33:05 -05:00
c38f2d0ac2
Merge pull request #869 from mistyhacks/3343-swarm-network-plugins
...
Clarify network plugins and swarm mode
Upstream-commit: 9a264be221
2018-02-13 21:05:44 -05:00
281df74045
Update containerd dependencies to match 1.0.2
...
- ed1cbe1fc3...4f6e87ae0429da22c617...c0710c92e876e68349ad...d452837986github@gone.nl >
Upstream-commit: 175cfdcfb521aa83f6a1441b0a4b99cb159f058d
Component: engine
2018-02-14 02:13:07 +01:00
6d509c76c4
Bump containerd to 1.0.2 (cfd04396dc68220d1cecbe686a6cc3aa5ce3667c)
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c2fb6db55be08da95b15bee730a191094f846577
Component: engine
2018-02-14 01:35:22 +01:00
25813b19fa
Merge pull request #36269 from Microsoft/jjh/remove-lcow-api-platform-if-omitted
...
Remove interim env var LCOW_API_PLATFORM_IF_OMITTED
Upstream-commit: 04cb98e6b5e5bd9dac0b92fcc13966498053aa7e
Component: engine
2018-02-13 15:12:18 -08:00
f914512cd5
Merge pull request #36271 from dnephin/use-tag-image-in-commit
...
Use TagImage in Commit
Upstream-commit: 060893ab5d97d6582770224db3623ad1b3bdb6e1
Component: engine
2018-02-13 16:40:17 -05:00
0f7a16334c
Merge pull request #36222 from yongtang/02062018-runc
...
Update runc to 6c55f98695e902427906eed2c799e566e3d3dfb5
Upstream-commit: 5eb2f98a352de1fb9a32b1795a9f16e6e73bc8db
Component: engine
2018-02-13 12:40:35 -08:00
ea40d8289f
Merge pull request #36290 from cpuguy83/use_c8d_fs_pkg
...
Use continuity fs package for volume copy
Upstream-commit: fc1f95bdb777c59d84e31d56a7a345af92bfe0d8
Component: engine
2018-02-13 15:22:17 -05:00
39948932b1
Don't restore image if layer does not exist
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6903ca89af71d40aeaa0277dab13d3dc6dd801a7
Component: engine
2018-02-13 11:51:01 -08:00
069181a5f7
Merge pull request #36294 from yongtang/02122018-update
...
Update api tests to use container.Run/Create in helper package
Upstream-commit: bbd9b7ffdf924de8444b5cbc7c41deb604acc8b7
Component: engine
2018-02-13 13:21:49 -05:00
f29b55d081
Merge component 'engine' from git@github.com:moby/moby master
2018-02-13 17:04:05 +00:00
