112f17c68b
Merge component 'cli' from git@github.com:docker/cli master
2018-02-20 16:42:03 +00:00
c6e3764db6
Merge pull request #264 from thaJeztah/carry-moby-32803
...
Update docker kill reference docs
Upstream-commit: bbe7f84540
2018-02-20 11:19:59 -05:00
6362580899
Fix stack marshaling for Kubernetes
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9b27e92903
2018-02-20 16:43:24 +01:00
bf0c1bd1d9
Update docker kill reference docs
...
- explain the either "name" or "id" can be used to reference a container
- explain that signals can be sent by name or number
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0c085c2a77
2018-02-20 14:58:55 +01:00
5539b125fe
Add swarm types to bash completion event type filter
...
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com >
Upstream-commit: fb80101ca7
2018-02-19 13:46:23 -05:00
c6e83a026f
Merge component 'engine' from git@github.com:moby/moby master
2018-02-19 17:05:16 +00:00
7ff06bec92
Merge component 'cli' from git@github.com:docker/cli master
2018-02-19 16:41:15 +00:00
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
2018-02-19 15:28:40 +01:00
36a89bcfdd
Merge pull request #36329 from tonistiigi/tar-cache-fix
...
builder: fix wrong cache hits building from tars
Upstream-commit: 8cf42d3ad805467be407962f902156a3834062ff
Component: engine
2018-02-19 12:01:20 +01:00
4d022ca109
Merge pull request #880 from vdemeester/container-list-unit-tests
...
Add unit tests to docker container ls
Upstream-commit: 8900d77a0b
2018-02-19 11:42:10 +01:00
07a8b9380b
Add unit tests to docker container ls
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 581b8d9d72
2018-02-19 11:22:36 +01:00
e46642afe1
Merge pull request #35510 from ripcurld0/fix_35500
...
Display a warn message when there is binding ports and net mode is host
Upstream-commit: 35d69f10a9ac7479095f39358abb78ee6d3ab65f
Component: engine
2018-02-19 08:57:36 +01:00
da22cbc58d
Display a warn message when there is binding ports and net mode is host
...
When a container is created if "--network" is set to "host" all the
ports in the container are bound to the host.
Thus, adding "-p" or "--publish" to the command-line is meaningless.
Unlike "docker run" and "docker create", "docker service create" sends
an error message when network mode is host and port bindings are given
This patch however suggests to send a warning message to the client when
such a case occurs.
The warning message is added to "warnings" which are returned from
"verifyPlatformContainerSettings".
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 6e78fdb790d2e1dbf95a1733cab9395b1b936622
Component: engine
2018-02-18 13:28:44 +00:00
60fb0a3d93
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-02-17 17:05:04 +00:00
c523bda1bb
Merge component 'engine' from git@github.com:moby/moby master
2018-02-17 17:04:57 +00:00
7cf04c3e9b
Merge component 'cli' from git@github.com:docker/cli master
2018-02-17 16:41:15 +00:00
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
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
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
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
2018-02-16 12:00:58 -08:00
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
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
bc08869249
builder: fix wrong cache hits building from tars
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f6c8266afddcf24a2eb629af3b8e924e9c78ce73
Component: engine
2018-02-15 23:42:42 -08: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
