This include ensure that containerd GRPC healthcheck service is
register before the restore process is done as this can take a while.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 07ad8c66400775ed1a51179be0b9137f051c4a0b
Component: engine
In https://github.com/torvalds/linux/commit/5ca3726 (released in v4.7-rc1) the
content of the `cpuacct.usage_percpu` file in sysfs was changed to include both
online and offline cpus. This broke the arithmetic in the stats helpers used by
`docker stats`, since it was using the length of the PerCPUUsage array as a
proxy for the number of online CPUs.
Add current number of online CPUs to types.StatsJSON and use it in the
calculation.
Keep a fallback to `len(v.CPUStats.CPUUsage.PercpuUsage)` so this code
continues to work when talking to an older daemon. An old client talking to a
new daemon will ignore the new field and behave as before.
Fixes#28941.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Upstream-commit: 115f91d7575d6de6c7781a96a082f144fd17e400
Component: engine
/tmp/data needs to be created before running this test (by some other test)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: d610d3f61cd7483dcab5897c8d4edb54248b45be
Component: engine
The response would never reach the client because it was being
redeclared in the current scope.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 9d127f8de3fa489b2c0d896dd9612f43e45f7cdd
Component: engine
Running the rm command on a paused/restarting container
will give an error message saying the container is running
which is incorrect.
To fix that, the error message will have the correct
container state and a procedure to remove it accordingly.
Notice: docker-py was bumped to:
4a08d04aef0595322e1b5ac7c52f28a931da85a5
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 0ec8f56a3d7f1413cdb3ae7711d518e99f9282e9
Component: engine
Since it was introduced no reports were made and lsof seems to cause
issues on some systems.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: eac66b67be0710322d0e21a67a55f5731be48f68
Component: engine
The description claims the directive is appearing after a comment but
the sample Dockerfile has the directive appear after an instruction.
Changed the ordering of the lines to match the example's description.
Signed-off-by: Remy Suen <remy.suen@gmail.com>
Upstream-commit: f00fa639881a9ef2ab2959f11fa30554396a3dac
Component: engine
and not a joint system+custom CA roots pool, when connecting from a docker
client to a remote daemon.
Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: bf7766bfe8fe92f727ddf500ff8b9eb32fb367ab
Component: engine
The cgo in `meminfo_solaris.go` initializes variables in for loops, and
therefore requires a `-std=c99` `CFLAG` in order to compile (at least on
modern SmartOS).
Signed-off-by: James Nugent <james@jen20.com>
Upstream-commit: 4683f588ce893f3156ecfa63bfd16ebda1d09157
Component: engine
- Align output. Previously, output would end up unaligned because of
longer task names (e.g. web.1 vs web.10)
- Truncate task IDs and add a --no-trunc option
- Added a --no-ids option to remove IDs altogether
- Got rid of the generic ID Resolver as we need more customization.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 70a4369f5eae45fe1bc94ee4a151a63c9babd6f0
Component: engine
Some small changes to get the examples so that they run without error for me.
Improve consistency of presentation of the examples.
Fix some typos
Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com>
Update vlan-networks.md
Restore "ip" accidentally removed
Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com>
Update vlan-networks.md
Change prompt from container "$$" to host "$"
Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com>
Update vlan-networks.md
Some changes suggested by cpuguy83 and thaJeztah
Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com>
Upstream-commit: 6ea36d7d48a41225c8573ef649320c1a414b8995
Component: engine
Based on jessie-backports.
Signed-off-by: Boris Pruessmann <boris@pruessmann.org>
Upstream-commit: fcadb77b97b2a305ce83798f11e977d8925748c0
Component: engine
