GordonTheTurtle
7ff06bec92
Merge component 'cli' from git@github.com:docker/cli master
2018-02-19 16:41:15 +00:00
Vincent Demeester
157ffc1e2f
Merge pull request #845 from vdemeester/stack-load-the-same
...
[compose] Share the compose loading code between swarm and k8s stack deploy
Upstream-commit: f56265ae3e
Component: cli
2018-02-19 15:28:40 +01:00
Vincent Demeester
4d022ca109
Merge pull request #880 from vdemeester/container-list-unit-tests
...
Add unit tests to docker container ls
Upstream-commit: 8900d77a0b
Component: cli
2018-02-19 11:42:10 +01:00
Vincent Demeester
07a8b9380b
Add unit tests to docker container ls
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 581b8d9d72
Component: cli
2018-02-19 11:22:36 +01:00
GordonTheTurtle
60fb0a3d93
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-02-17 17:05:04 +00:00
GordonTheTurtle
c523bda1bb
Merge component 'engine' from git@github.com:moby/moby master
2018-02-17 17:04:57 +00:00
GordonTheTurtle
7cf04c3e9b
Merge component 'cli' from git@github.com:docker/cli master
2018-02-17 16:41:15 +00:00
Akihiro Suda
de6daa450d
Merge pull request #36339 from thaJeztah/bump-continuity
...
Update containerd/continuity to fix ARM 32-bit builds
Upstream-commit: c5e7537d2305c1855f95422f08ca844d05a17aa2
Component: engine
2018-02-17 15:18:08 +09:00
Sebastiaan van Stijn
75d038d03f
Update containerd/continuity to fix ARM 32-bit builds
...
This updates the containerd/continuity package to d8fb8589b0e8e85b8c8bbaa8840226d0dfeb7371
which fixes builds failing on ARM 32-bit, after this dependency was added in
b3aab5e31faf04d8a29f17be55562e4d0c0cb364
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f0947a541866ca05b030afe07dd659887a655e3e
Component: engine
2018-02-17 00:42:10 +01:00
Tibor Vass
dcede7a976
Merge pull request #36303 from dnephin/cleanup-in-daemon-unix
...
Cleanup unnecessary and duplicate functions in `daemon_unix.go`
Upstream-commit: 747c163a65365933c5d6d7f0740f2ac8e3775287
Component: engine
2018-02-16 14:55:18 -08:00
Brian Goff
37bb2f6b53
Merge pull request #883 from anusha-ragunathan/set_default_timeout
...
Set a non-zero timeout for HTTP client communication with plugin backend.
Upstream-commit: a0044ba3a7
Component: cli
2018-02-16 16:46:55 -05:00
Eli Uriegas
69a82cc567
Merge pull request #75 from seemethere/add_libseccomp_dependency
...
Add libseccomp requirement for CentOS 7
Upstream-commit: c64bed235096ded43782dfdbd72ca499b04457c0
Component: packaging
2018-02-16 12:09:35 -08:00
Anusha Ragunathan
8bdc8e0190
Set a non-zero timeout for HTTP client communication with plugin
...
backend.
Currently, the timeout is set to 0, which means no timeout. Set it to a
sane default timeout of 30 seconds.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: f1e2030ce8
Component: cli
2018-02-16 12:00:58 -08:00
Tõnis Tiigi
fbcb172e80
Merge pull request #36144 from emil2k/node-id-required
...
Produce errors when empty ids are passed into inspect calls.
Upstream-commit: db360995df97f9d9bcb4eb6a34a5c35a2711795b
Component: engine
2018-02-16 10:18:47 -08:00
GordonTheTurtle
b7ea2ca28b
Merge component 'engine' from git@github.com:moby/moby master
2018-02-16 17:06:31 +00:00
GordonTheTurtle
3e970eb963
Merge component 'cli' from git@github.com:docker/cli master
2018-02-16 16:41:21 +00:00
Daniel Nephin
dd73a093e4
Merge pull request #564 from thaJeztah/fix-yaml-examples
...
Fix leading characters being stripped from example sections in YAML
Upstream-commit: 847cc4bdc0
Component: cli
2018-02-16 11:22:24 -05:00
Vincent Demeester
8a28d41c4f
Merge pull request #36335 from thaJeztah/sync-libnetwork-commits
...
Sync binary commits with vndr
Upstream-commit: 302e584b78db16ea39aca7d7c1612370c50d20f5
Component: engine
2018-02-16 16:12:53 +01:00
Vincent Demeester
44b01cd383
Merge pull request #840 from dekkagaijin/master
...
GetAll -> Get to retrieve credentials from credential helpers
Upstream-commit: 69432c48db
Component: cli
2018-02-16 15:38:53 +01:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Vincent Demeester
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
Vincent Demeester
4a4ea266a9
Merge pull request #828 from thaJeztah/update-authors
...
Update authors
Upstream-commit: cb85d55e8d
Component: cli
2018-02-16 11:38:58 +01:00
Vincent Demeester
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
Sebastiaan van Stijn
d3ed73b92e
Update authors
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f8da04a510
Component: cli
2018-02-16 11:20:05 +01:00
Vincent Demeester
d2ece4f9f2
Merge pull request #536 from thaJeztah/update-gitignore
...
Update gitignore
Upstream-commit: 2001500c6e
Component: cli
2018-02-16 10:26:58 +01:00
Sebastiaan van Stijn
92f3e5322f
Merge pull request #372 from jphuynh/completion-zsh-event-filter
...
Update event filter zsh completion with `disable`, `enable`, `install…
Upstream-commit: c6a7046674
Component: cli
2018-02-16 10:16:40 +01:00
Brian Goff
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
Daniel Nephin
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
Vincent Demeester
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
GordonTheTurtle
c900fb9923
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-02-15 17:07:08 +00:00
GordonTheTurtle
481715cd83
Merge component 'engine' from git@github.com:moby/moby master
2018-02-15 17:07:01 +00:00
Vincent Demeester
fec234b5f1
Merge pull request #878 from adshmh/add-unit-tests-to-plugin-package
...
Add unit tests to plugin create/remove/enable/disable commands
Upstream-commit: 4bc27c68ac
Component: cli
2018-02-15 18:02:36 +01:00
Brian Goff
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
Brian Goff
25714179da
Merge pull request #36322 from thaJeztah/fix-build
...
Fix import path
Upstream-commit: 7d8fa84e11154bf31644b41c50daaac79f463ad5
Component: engine
2018-02-15 11:52:38 -05:00
GordonTheTurtle
1ef968a6d2
Merge component 'cli' from git@github.com:docker/cli master
2018-02-15 16:41:17 +00:00
Weerasak Chongnguluam
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Yong Tang
7fad1f8a1a
Merge pull request #36320 from yongtang/02142018-diff-tests
...
Migrate container diff tests in integration-cli to api tests.
Upstream-commit: 6f8af32f224c986367bc341df8d4abc1a7b6e018
Component: engine
2018-02-15 03:53:21 -08:00
Arash Deshmeh
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
Component: cli
2018-02-15 06:20:26 -05:00
Yong Tang
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
Yong Tang
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
Sebastiaan van Stijn
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
Vincent Demeester
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
Vincent Demeester
28ab1221fd
Merge pull request #36315 from dnephin/move-commit-to-container-api
...
Move commit to container backend
Upstream-commit: d6ac79be3454a3ba34672290218ea5a53b1201a2
Component: engine
2018-02-15 09:10:52 +01:00
Yong Tang
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 https://github.com/docker/docker-py/compare/1d6b5b203222ba5df7dedfcd1ee061a452f99c8a...5e28dcaace5f7b70cbe44c313b7a3b288fa38916 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 9d9af83b0fd70ff6a7faa15cf8746669f0f3b588
Component: engine
2018-02-15 07:43:44 +00:00
Eli Uriegas
98a1f0698b
Merge pull request #86 from eiais/newPackages
...
Update readme to supported packages
Upstream-commit: a54da87b1f51743d9b750a8f1d4997e332faa903
Component: packaging
2018-02-14 17:04:13 -08:00