GordonTheTurtle
5a987db87c
Merge component 'engine' from git@github.com:moby/moby master
2018-02-20 17:05:31 +00:00
GordonTheTurtle
112f17c68b
Merge component 'cli' from git@github.com:docker/cli master
2018-02-20 16:42:03 +00:00
Daniel Nephin
c6e3764db6
Merge pull request #264 from thaJeztah/carry-moby-32803
...
Update docker kill reference docs
Upstream-commit: bbe7f84540
Component: cli
2018-02-20 11:19:59 -05:00
Sebastiaan van Stijn
dbebd52548
Merge pull request #36326 from kolyshkin/integration-exec
...
Add/use container.Exec() to integration
Upstream-commit: ee9abc212032353e19e5b0f5e6410ad67a0cc9b1
Component: engine
2018-02-20 17:16:09 +01:00
Sebastiaan van Stijn
6899375641
Merge pull request #33922 from ishidawataru/sctp
...
Support SCTP port mapping (bump up API to v1.37)
Upstream-commit: 079ed017b61eb819b8184b90013ce89465d3aaba
Component: engine
2018-02-20 17:00:13 +01:00
Vincent Demeester
1cf28cd5dc
Merge pull request #890 from silvin-lubecki/fix-kube-stack-marshaling
...
Fix stack marshaling for Kubernetes
Upstream-commit: 7d41d18b43
Component: cli
2018-02-20 16:50:45 +01:00
Silvin Lubecki
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
Component: cli
2018-02-20 16:43:24 +01:00
Sebastiaan van Stijn
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
Component: cli
2018-02-20 14:58:55 +01:00
Sebastiaan van Stijn
74fad1551d
Merge pull request #888 from trapier/completion-swarm-event-filter-types
...
Add swarm types to bash completion event type filter
Upstream-commit: e34ca9740e
Component: cli
2018-02-20 10:13:25 +01:00
Sebastiaan van Stijn
ded970f96e
Merge pull request #36107 from cpuguy83/cleanup_daemon_root_mount
...
Ensure daemon root is unmounted on shutdown
Upstream-commit: eb033c11753872c6269304d8127dbfe7315e476f
Component: engine
2018-02-20 10:04:41 +01:00
Vincent Demeester
0c0ee07b87
Merge pull request #36330 from vdemeester/migrate-container-list-tests
...
test: clean/migrate some docker ps cli-only integration tests
Upstream-commit: 7060a40addd71605862b668c1ec2b889e3540233
Component: engine
2018-02-20 08:44:17 +01:00
Akihiro Suda
ed5d3f9cce
Support SCTP port mapping (bump up API to v1.37)
...
Signed-off-by: Wataru Ishida <ishida.wataru@lab.ntt.co.jp >
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 8e435b8279f2af3e0cebd73fa9e25ca1bb26004e
Component: engine
2018-02-20 11:15:36 +09:00
Kir Kolyshkin
57f5f76274
integration/TestUpdateMemory: simplify
...
1. Use integration/internal/exec, removing the getContainerSysFSValue().
2. Avoid repeating magic numbers, use a variable for those.
3. Fix order of arguments to assert.Equal (first "expected", then "actual").
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 0f9da07b569f0d9cbe574db3af3951b4d5c968c0
Component: engine
2018-02-19 11:25:27 -08:00
Kir Kolyshkin
0582099de6
integration/TestUpdateCPUQUota: use exec
...
An implementation of exec in TestUpdateCPUQUota had a few issues,
including resource leaking and calling both ContainerExecAttach and
ContainerExecRun. The last one makes the test flaky:
update_linux_test.go:136: expected cgroup value 20000, got: Error: Exec
command f923baf709525f6b38f6511126addc5d9bb88fb477eeca1c22440551090fa2bb
is already running
Fix by using the integration/internal/exec package.
While at it, use require/assert to further improve code readability.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 8a7d6143fca69623e2f5d409328c97603843ccb6
Component: engine
2018-02-19 11:25:27 -08:00
Kir Kolyshkin
b08746e15a
integration: add container.Exec()
...
Some test cases might need an ability to execute a command inside a
container (in order to analyse its output and/or exit code). It is a bit
complicated operation to do so using engine API. The function provided
aims to hide this complexity, making exec almost as simple as 'docker
exec'.
NOTE that the exec is synchronous, and command's stdin is closed.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 01143afe54f1be7308c5663a0cc110740626c62b
Component: engine
2018-02-19 11:25:11 -08:00
Trapier Marshall
5539b125fe
Add swarm types to bash completion event type filter
...
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com >
Upstream-commit: fb80101ca7
Component: cli
2018-02-19 13:46:23 -05:00
Tõnis Tiigi
39cad2aa10
Merge pull request #36256 from wcwxyz/fix-refcounter-memory-leak
...
graphdriver: Fix RefCounter memory leak
Upstream-commit: 733ed2ddd3c621dadafbb74feb7b80d20fd3fd6f
Component: engine
2018-02-19 10:32:14 -08:00
GordonTheTurtle
c6e83a026f
Merge component 'engine' from git@github.com:moby/moby master
2018-02-19 17:05:16 +00:00
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
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
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
Vincent Demeester
c2407fa324
Clean some cli-only integration tests
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 641c73d211d7efe15255ae36ab2362cef3584260
Component: engine
2018-02-19 11:19:19 +01:00
Vincent Demeester
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
Boaz Shuster
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
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