Commit Graph

22309 Commits

Author SHA1 Message Date
e27d461e96 Update DCT docs with 1.11 info, fix typos
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 77da3bcb72ba4f936c428cb2b912c007a94cb87a
Component: engine
2016-04-27 09:57:54 -07:00
aeb44b5505 Merge pull request #22171 from mlaventure/always-disable-metrics
Always disable containerd metrics when started by docker
Upstream-commit: ccf83c94d18df4b27ca3d46ffbe008df76aa3275
Component: engine
2016-04-21 01:38:07 +02:00
1563e3998f Merge pull request #22200 from jfrazelle/remove-self
Remove Jess from Maintainers
Upstream-commit: 0f14b566d98304e3bd7e24d87bb509e2e18ca7ca
Component: engine
2016-04-21 01:14:56 +02:00
9a6bda4bd8 Merge pull request #22173 from amitkris/uprev_dbus
Update godbus/dbus to v4.0.0
Upstream-commit: 24076ed4d9c82d387029b8a65e21873db5676f6a
Component: engine
2016-04-20 15:39:00 -07:00
1542891d6f Merge pull request #22203 from alimate/name-gen-patch
Added Lamport & Agnesi to the list of scientists
Upstream-commit: 483063ad85f7eff587f6dbf99a71f31def8d4c76
Component: engine
2016-04-20 21:03:18 +02:00
6418621ca6 Added Lamport & Agnesi to the list of scientists
Leslie B. Lamport is an American computer scientist. Lamport is
best known for his seminal work in distributed systems and as the
initial developer of the document preparation system LaTeX.
Maria Gaetana Agnesi was an Italian mathematician, philosopher,
theologian and humanitarian. She was the first woman to write a
mathematics handbook and the first woman appointed as a Mathematics
Professor at a University.

Signed-off-by: Ali Dehghani <ali.dehghani.g@gmail.com>
Upstream-commit: 85e880205f305aa7b566ac4d7dc6280d5015c2b2
Component: engine
2016-04-20 21:44:22 +04:30
4d75557ec6 Removing ref to old google group; adding forum
Adding email notice
user > dev and an > a

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 344784707918b39f2d23d1117b09e5a0cbbb6eb8
Component: engine
2016-04-20 09:34:49 -07:00
823e3f54b6 Remove Jess from Maintainers
Signed-off-by: Jess Frazelle <jess@mesosphere.com>
Upstream-commit: 145fb8de9ee2f57fdec74a1ea27432c68cd5820a
Component: engine
2016-04-20 08:50:42 -07:00
60ca663014 Merge pull request #22191 from mavenugo/jp
Initialize activateWait for plugins activated by json spec
Upstream-commit: cf03e17c5cfb7617d91aa4177f4bb4a5112496ad
Component: engine
2016-04-20 08:37:20 -07:00
9ddd4e8416 Merge pull request #22187 from thaJeztah/add-madhu-to-maintainers
Add Madhu Venugopal to maintainers
Upstream-commit: afbe2869f02d4891ab1dc3feeadd47fd3be2c340
Component: engine
2016-04-20 17:17:41 +02:00
f7b3af0900 Merge pull request #21389 from chenchun/resize_direct_lvm
Resize direct lvm
Upstream-commit: f96d15d3c361a08ad892759d5e885625b0d48302
Component: engine
2016-04-20 06:33:37 -07:00
ee5a4917fb Initialize activateWait for plugins activated by json spec
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: de806a672b0810e48facc74e198e6728c1fe2c6d
Component: engine
2016-04-20 05:59:19 -07:00
a1c0412063 docs: use tables for available plugins
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 79351caec1b413c9da1080fceff49eb994323734
Component: engine
2016-04-20 13:45:31 +02:00
e790582111 Merge pull request #22179 from wenchma/fix_asa
Fix asa
Upstream-commit: 3cf4cad0821698cefaf852c9d4b7b65df314ab35
Component: engine
2016-04-20 12:44:29 +02:00
300e337d40 Add Madhu Venugopal to maintainers
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 06753c6df666ca77adb4d4d7a2c95425b6d31b0c
Component: engine
2016-04-20 11:17:32 +02:00
a8bb60bfa2 Merge pull request #21380 from sainath14/improve_help_text_test_time
Improve the time taken by DockerSuite.TestHelpTextVerify
Upstream-commit: 34cc274a801cd38df3006484b14e4c9671c47b94
Component: engine
2016-04-20 08:03:45 +02:00
605211aab5 Fix asa
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 6d4e7b67be77e3f290d4048c3da5d0f6540f1704
Component: engine
2016-04-20 11:14:47 +08:00
7c4fbf51d2 Add docs about how to extend devicemapper thin pool
Signed-off-by: Chun Chen <ramichen@tencent.com>
Upstream-commit: b21d90c28faaa9f906c4e3b2145ddf661a19e994
Component: engine
2016-04-20 10:49:51 +08:00
2d475a4388 Improve the time taken by DockerSuite.TestHelpTextVerify. This test runs docker <command> --help on all commands supported and also check the output
when it is passed with bad arguments and no arguments. This patch would divide the total number of commands into five sets and runs them in parallel.
Test time is improved from around 9 seconds to around 3 seconds

Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
Upstream-commit: 7f33ec750770ea751f64d516c73ce98dae64b536
Component: engine
2016-04-19 16:46:59 -07:00
9247bf6e84 Merge pull request #22043 from WeiZhang555/remove-start-event-failed-start
Remove start/die event when fail to start container
Upstream-commit: bb91bd3a89d93f74de99ea5158d68a92e4c6cd6a
Component: engine
2016-04-19 19:45:40 -04:00
2a1aa1222c Update godbus/dbus to v4.0.0
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
Upstream-commit: 1c967911b979040a6316050b3c00d89e17cb4cb1
Component: engine
2016-04-19 14:51:55 -07:00
a950119eaf Always disable containerd metrics when started by docker
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 42f9c25b5168e3bc8e19003cd8bfd4eabbad654c
Component: engine
2016-04-19 13:37:18 -07:00
0a813c13d3 Merge pull request #22123 from crosbymichael/restart-canceled
Remove restart canceled error
Upstream-commit: ab6b82b85668eaa5be5ee1ba04febfae5fcec433
Component: engine
2016-04-19 16:28:33 -04:00
2f96f680c7 Merge pull request #22153 from vdemeester/update-engine-api-again
Update engine api again for CopyToContainer and versions
Upstream-commit: eab65e438ecc406baf935c8df544982164cff72f
Component: engine
2016-04-19 11:05:27 -07:00
ba66548e04 Remove restart canceled error
It should not be an error to call a common option to cancel restarts.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: fc2e2234c614379d21c16e32c1b82e7819fc3eac
Component: engine
2016-04-19 10:46:21 -07:00
121a98a71e Merge pull request #22148 from thaJeztah/remove-old-api-versions
Remove API versions 1.17 and older from documentation
Upstream-commit: 4a8519ba29a0b1f1aa2f9e9ac6d991114d8b8253
Component: engine
2016-04-19 10:26:56 -07:00
4ebf703e54 Merge pull request #21495 from HackToday/addnetworkfilter
Add network label filter support
Upstream-commit: 75cc2c926b3296ed07af130a91ed2409f823ff70
Component: engine
2016-04-19 19:15:14 +02:00
089a9530bf Merge pull request #22121 from tonistiigi/fix-exec-cleanup
Clean up exec fifos on process exit
Upstream-commit: 2f7df8e5dec7c4ab121d0ea0d337b5cc4c3d5c77
Component: engine
2016-04-19 09:45:54 -07:00
f2f56b9e01 Add the NetApp Docker Volume Plugin to the documentation
Signed-off-by: Jared Hocutt <jaredh@netapp.com>
Upstream-commit: f310fd14a9a99362635198cd5b1517a053813c92
Component: engine
2016-04-19 11:30:39 -04:00
3fab5dcc0b Remove pkg/version
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 49f7b4dafb2fc3d702304ae1bfe5834764692e1d
Component: engine
2016-04-19 16:57:02 +02:00
03d17b8c5f Update code for latest engine-api
- Update CopyToContainer uses
- Use engine-api/types/versions instead of pkg/version

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7534f17261d0bb74557ca2f7cd893d5b7b531d49
Component: engine
2016-04-19 16:56:54 +02:00
f4a20799d2 Vendoring engine-api to a2999dbd3471ffe167f2aec7dccb9fa9b016dcbc
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 04bb3a2f45de32794a031f09dbe03fdbba711906
Component: engine
2016-04-19 15:50:20 +02:00
2052cabd5a Remove API versions 1.17 and older from documentation
Docker 1.5 and older is no longer supported by Docker Hub,
so there's not much need to document the API for those
versions.

Documentation is still available on GitHub, and through
the older versions of the documentation for those
that really need it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 68f9a45440c1d87316ec5106f942a8cae9113ca0
Component: engine
2016-04-19 14:39:14 +02:00
c026bc562f Merge pull request #21901 from mavenugo/sid
Add container's short-id as default network alias
Upstream-commit: 8adc8c3a686be09212a894cc91dcd974b830f330
Component: engine
2016-04-19 08:16:41 -04:00
dbfba75d3e Merge pull request #22122 from Microsoft/jjh/defaultdir
Windows: Set default directory
Upstream-commit: 42a7efd69171e94063f0be2b1ad88262ee6bad81
Component: engine
2016-04-19 07:27:13 -04:00
888a7f4130 Docs: Container creation param descriptions not under HostConfig
This fix tries to fix issues mentioned in #22100 for incorrect
description of remote API's container creation params.

Several issues have been fixed:
1. CPU and memory related params (e.g., `MemorySwap`, `CpuShares`, etc.)
were incorrectly placed under the top level instead of under the HostConfig.
(v1.18-v1.24)
2. The param `Cpuset` has been deprecated but was never removed.
(v1.18-v1.24)
3. The param `PidsLimit` was not added even though the description
has been added.
(v1.23-v1.24)

This fix fixes #22100

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 332e3b545b0c0e825364c0f09315f82546c791f0
Component: engine
2016-04-18 21:15:33 -07:00
f8a8c81f4e Merge pull request #21657 from vdemeester/update-engine-api
Update engine api with required arguments
Upstream-commit: 7fd53f7c711474791ce4292326e0b1dc7d4d6b0f
Component: engine
2016-04-18 19:47:22 -07:00
3c7ba98def Merge pull request #22130 from Microsoft/jstarks/win_pidfile
Windows: don't overwrite PID file if process exists
Upstream-commit: aeb1e45e60b49dc2208a9857dce1867d2191bd16
Component: engine
2016-04-18 19:45:18 -07:00
b02df70f6f Windows: don't overwrite PID file if process exists
pidfile.New() was opening a file in /proc to determine if the owning
process still exists. Use syscall.OpenProcess() on Windows instead.

Other OSes may also need to be updated here.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 9e5b93565c8a10f4b06d2bcf61305fdfb7128628
Component: engine
2016-04-18 16:41:37 -07:00
a55432da08 Merge pull request #22120 from crosbymichael/stats-panic
Create a copy of stats value before modifications
Upstream-commit: eed9c930b85ac1489129e4e36e0945bb3ee6954f
Component: engine
2016-04-18 16:26:23 -07:00
430ab207ac Windows: Set default directory
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c2d183426ba2fb4e850dc006d3ad3cc3bd86cc24
Component: engine
2016-04-18 15:59:41 -07:00
0ed3dd83e3 Merge pull request #22080 from amitkris/pkg_term_solaris
Get pkg/term to build for Solaris
Upstream-commit: 2b5512a3be52424583adada7206107f65ff8fd18
Component: engine
2016-04-18 15:04:24 -07:00
487a876338 Merge pull request #22069 from rhvgoyal/overlay-private
Make overlay home dir Private mount
Upstream-commit: 7f767d8ff5c23979042dfd66db8e9487ee8f7eb8
Component: engine
2016-04-18 14:56:34 -07:00
f3325d63fe Make overlay home dir Private mount
People have reported following issue with overlay

$ docker run -ti --name=foo -v /dev/:/dev fedora bash
$ docker cp foo:/bin/bash /tmp
$ exit container

Upon container exit, /dev/pts gets unmounted too. This happens because
docker cp volume mounts get propagated to /run/docker/libcontainer/....
and when container exits, it must be tearing down mount point under
/run/docker/libcontainerd/... and as these are "shared" mounts it
propagates events to /dev/pts and it gets unmounted too.

One way to solve this problem is to make sure "docker cp" volume mounts
don't become visible under /run/docker/libcontainerd/..

Here are more details of what is actually happening.

Make overlay home directory (/var/lib/docker/overlay) private mount when
docker starts and unmount it when docker stops. Following is the reason
to do it.

In fedora and some other distributions / is "shared". That means when
docker creates a container and mounts it root in /var/lib/docker/overlay/...
that mount point is "shared".

Looks like after that containerd/runc bind mounts that rootfs into
/runc/docker/libcontainerd/container-id/rootfs. And this puts both source
and destination mounts points in shared group and they both are setup
to propagate mount events to each other.

Later when "docker cp" is run it sets up container volumes under
/var/lib/dokcer/overlay/container-id/... And all these mounts propagate
to /runc/docker/libcontainerd/... Now mountVolumes() makes these new
mount points private but by that time propagation already has happened
and private only takes affect when unmount happens.

So to stop this propagation of volumes by docker cp, make
/var/lib/docker/overlay a private mount point. That means when a container
rootfs is created, that mount point will be private too (it will inherit
property from parent). And that means when bind mount happens in /runc/
dir, overlay mount point will not propagate mounts to /runc/.

Other graphdrivers like devicemapper are already doing it and they don't
face this issue.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: e076bccb458aeadab9380ce0636456ad6317a85f
Component: engine
2016-04-18 21:48:09 +00:00
7e0d42a8a5 Add container's short-id as default network alias
link feature in docker0 bridge by default provides short-id as a
container alias. With built-in SD feature, providing a container
short-id as a network alias will fill that gap.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: ea531f061d3c511e376753f9863cb41f1b96d87e
Component: engine
2016-04-18 14:45:16 -07:00
b394d53e14 Clean up exec fifos on process exit
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 84d170129a19855829d282e5416ce08ddb2edbd6
Component: engine
2016-04-18 14:03:37 -07:00
4ea62ef8f4 Merge pull request #22029 from talex5/gitcommit
Build: pass through DOCKER_GITCOMMIT
Upstream-commit: c3533d58c36835c9560e859f09f15dbce82c3ac1
Component: engine
2016-04-18 12:46:09 -07:00
51b831f818 Merge pull request #22082 from tiborvass/revert-go-security-fix-for-windows
Workaround Windows bug discovered with Go security fix
Upstream-commit: 1cd7dd89175bea9a89c433093180e5aa3c8f04b3
Component: engine
2016-04-18 12:44:13 -07:00
c341b1945f Merge pull request #22088 from amitkris/update_fsnotify
Update fsnotify to v1.2.11
Upstream-commit: 2b6d7f728e163a82b3114c819bc7785ad22b5756
Component: engine
2016-04-18 12:38:29 -07:00
8cd702acc5 Merge pull request #22065 from thaJeztah/remove-deprecation-message
Remove deprecation warning
Upstream-commit: 4e898ae64be25bc5a86e0e7865a37b9f596e4d17
Component: engine
2016-04-18 15:29:05 -04:00