Commit Graph

21804 Commits

Author SHA1 Message Date
66ebb69509 docs: fix link to "run reference"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f2705fa6ede76ad8b307ca184d3e146f5d69f7e6
Component: engine
2015-11-12 12:38:46 +01:00
6f7ab3ab7b Merge pull request #17934 from sdurrheimer/zsh-completion-run-create-volume-driver
Add zsh completion for 'docker {run,create} --volume-driver'
Upstream-commit: 7d783ea5eb4c31be85a9b21bfac0c462d3d2d4f3
Component: engine
2015-11-12 05:41:41 -05:00
3be28d73f6 Merge pull request #17923 from LK4D4/simple_ckill
daemon/kill.go: simplify if statement
Upstream-commit: b6899ad56fd4cd1636642c58fb7f7bc161fddef6
Component: engine
2015-11-12 05:36:40 -05:00
64b4b99455 Add zsh completion for log options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 76fe00c859745bfc9c128b951ab7575fe370b7f2
Component: engine
2015-11-12 09:53:35 +01:00
c34deb74dc kill TODO
Signed-off-by: mqliang <mqliang.zju@gmail.com>
Upstream-commit: 644471bac85ca0d03645013767a5961504419d7c
Component: engine
2015-11-12 16:41:25 +08:00
860252559c Add zsh completion for 'docker {run,create} --volume-driver'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 8446a5c88bd744df7f7468ec7eb8d8dee4e7c7e9
Component: engine
2015-11-12 08:35:32 +01:00
5a4e81dc0c Merge pull request #17388 from vikstrous/notary_docs
more notary documentation
Upstream-commit: 40ed821d2ebd9abb5cb9cf5c11c7b67c905ee3be
Component: engine
2015-11-11 20:07:55 -08:00
d9d92c1e64 more notary documentation
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>
Upstream-commit: e869e8aa3d0671394f83d0b6ea7d90cb310e5b61
Component: engine
2015-11-11 19:56:10 -08:00
14b70450aa Merge pull request #17925 from cpuguy83/fix_locker_unit_tests
Use timeouts instead of relying on runtime.GoSched
Upstream-commit: 2337db8205f72b190f46a73dd28a25cee0f968f9
Component: engine
2015-11-11 18:46:52 -08:00
c0a993088d Use timeouts instead of relying on runtime.GoSched
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: fd672d59269d100acbb36abef4e4eddc1d30bdc7
Component: engine
2015-11-11 20:59:07 -05:00
2552a392d2 daemon/kill.go: simplify if statement
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: fa7ec908c493161892ebdd7c51b440367f527805
Component: engine
2015-11-11 17:19:39 -08:00
bc3ac4cb1c Merge pull request #17919 from Microsoft/jjh/tp4
Windows [TP4] Require build 10586+
Upstream-commit: 87de5fdd5972343a11847922e0f41d9898b5cff7
Component: engine
2015-11-11 19:36:13 -05:00
53e497ffae Merge pull request #17916 from Microsoft/jjh/fix-cp-with-volumes
Windows [TP4] Fix docker cp when volumes
Upstream-commit: 5b046c71d8ab944ad88baf9f92ae6b3b78a28cdd
Component: engine
2015-11-11 19:35:05 -05:00
b05ed8c964 Merge pull request #17921 from thaJeztah/thou-shalt-not-use-we
Fix find and replace typo in dockerimages
Upstream-commit: 6c31b17dfdd08b437ebff0deb696f50c90dc4416
Component: engine
2015-11-12 00:09:46 +00:00
6b208d3136 Fix find and replace typo in dockerimages
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a4b2de674c7030e70f671d5d6dcedb0c7ca5b0cd
Component: engine
2015-11-12 00:52:31 +01:00
c7dd3d34fc Merge pull request #17918 from anusha-ragunathan/fsMagic
Include xfsprogs in build environment.
Upstream-commit: b664a8825ea20a729f14a49dcc0fc51ca4e01d8b
Component: engine
2015-11-11 15:43:52 -08:00
7a3117ab3d Using checkers assert for integration-cli/docker_cli_events_test.go
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
Upstream-commit: 2910f1101df088c20d22c1adf00c1c3ceb382ddf
Component: engine
2015-11-11 18:12:30 -05:00
a3794d804f Windows [TP4] Require build 10586+
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 122568b31465127537197cf6d9575b00bdd02045
Component: engine
2015-11-11 14:49:14 -08:00
83fc2cf8e7 Include xfsprogs in build environment.
devmapper uses xfs by default now. So include xfsprogs in build
environment. Also update docs to reflect the new default.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 2b766a455cc01f3fd51be886c9e61c0b6a5fdeb1
Component: engine
2015-11-11 14:42:08 -08:00
049a764149 Merge pull request #17913 from clnperez/oom-test-requires
Add the memoryLimitSupport requirement to Events OOM tests
Upstream-commit: 9d4e2f3992553b660d690093a0a294d1633b7dc6
Component: engine
2015-11-11 23:24:10 +01:00
470099dd9c Merge pull request #17894 from mqliang/deferMove
move defer statement for readability
Upstream-commit: 6c82fba2b32781e6cef4fda71e7b35c3dcdcb9da
Component: engine
2015-11-11 14:03:48 -08:00
d8d32d2bbf Windows [TP4] Fix docker cp when volumes
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3a852d8442f31651f0e776430432e5dda44455e0
Component: engine
2015-11-11 14:02:07 -08:00
7a892cd97a Merge pull request #17903 from rhvgoyal/default-to-xfs-v2
Devicemapper: Default to xfs instead of ext4
Upstream-commit: adb14543fd2a550a3b9a8cb12637e376cd398be4
Component: engine
2015-11-11 16:42:58 -05:00
60cb2034d2 Merge pull request #17883 from dave-tucker/bug/17709
Add required ports for Overlay to docs
Upstream-commit: 6c5395360fd9687fcd5962eb2b1c4fe0a7a2cabe
Component: engine
2015-11-11 13:10:22 -08:00
06bdd98fbf Merge pull request #17915 from moxiegirl/17764-fix
Adding in Contiv plugins
Upstream-commit: e49e6b7bfdf0e731aa0e846d1c29ab9d96a2a1d9
Component: engine
2015-11-11 20:56:57 +00:00
89f92046ef Adding in Contiv plugins
Fixes #17764
Also fixed problem where the menu ordering was off
Fix the wrap

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 40fc3a8bcf39e52e45c2aac3808987a5499094d8
Component: engine
2015-11-11 12:56:07 -08:00
7803fdccdd Merge pull request #17813 from davidcurrie/mhn-updates
Updates to Get started with multi-host networking
Upstream-commit: f74c423255d8b61b4a9a609449bc389f616eb637
Component: engine
2015-11-11 12:43:45 -08:00
5521134e65 Updates to Get started with multi-host networking
Updates primarily to expand usage of Swarm cluster and make Compose
section more verbose plus other minor corrections.

Signed-off-by: David Currie <david_currie@uk.ibm.com>
Upstream-commit: f16dceb63233bd2c1fd327b92d7112e8012347ac
Component: engine
2015-11-11 20:31:18 +00:00
940947b2d3 Merge pull request #17909 from LK4D4/info_simple
daemon/info.go: assign proxy fields directly
Upstream-commit: 37dfae3cde79966734c72a57ed2b2d4c653d61b6
Component: engine
2015-11-11 21:15:13 +01:00
5c10a00d00 Merge pull request #17807 from albers/completion-network-yes
Align configuration of bash completion with existing values
Upstream-commit: ee8aadbdd98c81d35e6072d4c1dc19cf1e79919e
Component: engine
2015-11-11 20:01:27 +00:00
c077545d83 Relabel BTRFS Content on container Creation
This change will allow us to run SELinux in a container with
BTRFS back end.  We continue to work on fixing the kernel/BTRFS
but this change will allow SELinux Security separation on BTRFS.

It basically relabels the content on container creation.

Just relabling -init directory in BTRFS use case. Everything looks like it
works. I don't believe tar/achive stores the SELinux labels, so we are good
as far as docker commit.

Tested Speed on startup with BTRFS on top of loopback directory. BTRFS
not on loopback should get even better perfomance on startup time.  The
more inodes inside of the container image will increase the relabel time.

This patch will give people who care more about security the option of
runnin BTRFS with SELinux.  Those who don't want to take the slow down
can disable SELinux either in individual containers or for all containers
by continuing to disable SELinux in the daemon.

Without relabel:

> time docker run --security-opt label:disable fedora echo test
test

real    0m0.918s
user    0m0.009s
sys    0m0.026s

With Relabel

test

real    0m1.942s
user    0m0.007s
sys    0m0.030s

Signed-off-by: Dan Walsh <dwalsh@redhat.com>

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: 1716d497a420f0cd4e53a99535704c6d215e38c7
Component: engine
2015-11-11 14:49:27 -05:00
16673ced03 docs: update supported drivers for docker logs
The journald driver also supports docker logs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3e9543fc61cbcfd4847be30699dfcd664bc0bfce
Component: engine
2015-11-11 20:47:42 +01:00
724166c497 daemon/info.go: assign proxy fields directly
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 1df0bb5a1309af0402d83061d4404afe7396e657
Component: engine
2015-11-11 11:03:53 -08:00
202ace0de5 Merge pull request #17858 from sanimej/libn
Allow port mapping only for endpoint created on docker run
Upstream-commit: 0b566566c66832ea7d78b6468fb960dd2d4975f9
Component: engine
2015-11-11 11:00:31 -08:00
82cddf7c00 Merge pull request #17193 from cpuguy83/refactor_store_errors
Refactor volume store's error usage
Upstream-commit: 2bb1c530d7e0f20b5822cbff7656c4e0a7cd4930
Component: engine
2015-11-11 10:25:00 -08:00
f5f4be1acc Add required ports for Overlay to docs
Fixes #17709

Signed-off-by: Dave Tucker <dt@docker.com>
Upstream-commit: 44a527d877faf0ef62bc9b0221f656041833ae66
Component: engine
2015-11-11 18:04:07 +00:00
4fe87618a6 Merge pull request #17890 from aboch/b6
Restore deterministic IPv6 from MAC behavior on default bridge network
Upstream-commit: 7a985cfafc211c8cc302e4c1e14059fc513663ba
Component: engine
2015-11-11 12:42:08 -05:00
abd797dbbd devmapper: Switch to xfs as default filesystem if supported
If platform supports xfs filesystem then use xfs as default filesystem 
for container rootfs instead of ext4. Reason being that ext4 is pre-allcating
lot of metadata (around 1.8GB on 100G thin volume) and that can take long
enough on AWS storage that systemd times out and docker fails to start.

If one disables pre-allocation of ext4 metadata, then it will be allocated
when containers are mounted and we will have multiple copies of metadata
per container. For a 100G thin device, it was around 1.5GB of metadata
per container.

ext4 has an optimization to skip zeroing if discards are issued and
underlying device guarantees that zero will be returned when discarded
blocks are read back. devicemapper thin devices don't offer that guarantee
so ext4 optimization does not kick in. In fact given discards are optional
and can be dropped on the floor if need be, it looks like it might not be
possible to guarantee that all the blocks got discarded and if read back
zero will be returned.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 07ff17fb850e5ddae6f38cc21776ebb9b1690f3e
Component: engine
2015-11-11 12:07:35 -05:00
edb4695814 devmapper: Warn if user specified a filesytem and base device already has fs
If user wants to use a filesystem it can be specified using dm.fs=<filesystem>
option. It is possible that docker already had base image and a filesystem
on that. Later if user wants to change file system using dm.fs= option
and restarts docker, that's not possible. Warn user about it.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 83a34e000b2332d9a1b4214a77fae021ed144acb
Component: engine
2015-11-11 12:07:35 -05:00
621ef05af0 Restore IPv6 from MAC on default bridge network
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 095a8ac5451de25a91fc569a6633fdd8d4cabb3f
Component: engine
2015-11-11 08:36:04 -08:00
1a0735060a Add support for blkio.weight_device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 0fbfa1449d917ee0778266139d6035fb0782f7c2
Component: engine
2015-11-11 23:06:36 +08:00
f6690c74eb Merge pull request #17880 from duglin/TweakMap
convert map value from struct to bool
Upstream-commit: 2a7b5f66574f626610f6bfcca86c15263f57c3cc
Component: engine
2015-11-11 13:49:50 +01:00
70a998c8d8 Merge pull request #17800 from Starefossen/patch-1
Utillize build cache for Node.js web app example
Upstream-commit: 9498e9b732234e103c41be0c91d64c46057e6fe0
Component: engine
2015-11-11 09:56:40 +00:00
9b1a025ea6 Merge pull request #17012 from fgimenez/9986-ipallocator-excludes-bridge-ip
Test to ensure that the bridge ip is excluded from the allocator pool
Upstream-commit: d6856db128212020e7d21f5121b3f0b4778910cb
Component: engine
2015-11-11 10:42:13 +01:00
7fb35a1e4a hack: make.sh: remove not used function
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: dc41fff56eb85552c38716533b2cd982d6e02f40
Component: engine
2015-11-11 10:19:03 +01:00
a6b34b6717 changed if else statements to c.Asserts in docker_cli_create_test.go.
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
Upstream-commit: 91041884f858087aafbf02fc456d9d1488e03c30
Component: engine
2015-11-10 23:15:32 -08:00
199c5fdeef Merge pull request #16774 from tonistiigi/15643-aufs-plnk
Copy aufs hardlinks to top layer
Upstream-commit: 10667253951a783785d3236192428a5decca3fef
Component: engine
2015-11-11 07:59:41 +01:00
789bc1f38f Vendoring libnetwork e8ebc0bf6510343c88d162db08b3d855cbbe75b9
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 43b3b6ecb4f838023478c484d32957386b7dd666
Component: engine
2015-11-10 21:13:25 -08:00
320a0d9081 Merge pull request #17853 from aboch/ipr
Fix fixed-cidr daemon option
Upstream-commit: 09980ef7ac2510cc67e160657f0829a47f5b5b28
Component: engine
2015-11-10 23:38:33 -05:00
7aea45d5d0 move defer statement for readability
Signed-off-by: mqliang <mqliang.zju@gmail.com>
Upstream-commit: d71eeb1c057cdb7ffdb0b5a2aac537671578b676
Component: engine
2015-11-11 11:28:23 +08:00