Commit graph

19837 commits

Author SHA1 Message Date
James Turnbull
ef6cb749f0 Merge pull request #17947 from Blaisorblade/patch-1
Replace now broken link with a "permalink"
2015-11-12 14:05:44 -05:00
Vincent Demeester
b99b23ba93 Merge pull request #17929 from mqliang/hardCode
Removing TODO in pkg/term/windows
2015-11-12 19:56:09 +01:00
Paolo G. Giarrusso
6b02876362 Replace now broken link with a "permalink"
Fix #17927.

Instead of pointing to a file in Docker's GitHub repo on `master`
(which got renamed, breaking the link), point to a specific version
(the current latest). As a bonus, we now highlight the most
relevant lines, without becoming more fragile.

Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com>
2015-11-12 19:17:29 +01:00
Tianon Gravi
8b9856dbd7 Merge pull request #17699 from jfrazelle/update-release-script-to-new-process
update release script and release process
2015-11-12 09:51:36 -08:00
Vincent Demeester
ce29a8cc37 Merge pull request #17200 from maaquib/16756-integration-cli-events-test
Using checkers assert for integration-cli/docker_cli_events_test.go
2015-11-12 16:43:12 +01:00
David Calavera
fc36475184 Merge pull request #17898 from zelahi/16756-createtest-dockercli
changed if  else statements to c.Asserts in docker_cli_create_test.go.
2015-11-12 07:37:29 -08:00
David Calavera
8cf38b6a8b Merge pull request #17589 from Microsoft/jjh/refactorprocessconfig
Refactor ProcessConfig
2015-11-12 07:28:32 -08:00
David Calavera
eed704f7d9 Merge pull request #17901 from runcom/remove-not-needed-func
hack: make.sh: remove not used function
2015-11-12 07:16:43 -08:00
Sven Dowideit
9c6e3396ef Merge pull request #17631 from sallyom/docker-login-non-root
clarify docker login
2015-11-12 22:39:35 +10:00
Sally O'Malley
f9657819cd docker-login man/doc add security info
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-11-12 07:25:35 -05:00
Sven Dowideit
715ddd6ee5 Merge pull request #17938 from thaJeztah/fix-docs-run-reference-link
docs: fix link to "run reference"
2015-11-12 22:09:56 +10:00
Sebastiaan van Stijn
f2705fa6ed docs: fix link to "run reference"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-12 12:38:46 +01:00
Brian Goff
7d783ea5eb Merge pull request #17934 from sdurrheimer/zsh-completion-run-create-volume-driver
Add zsh completion for 'docker {run,create} --volume-driver'
2015-11-12 05:41:41 -05:00
Brian Goff
b6899ad56f Merge pull request #17923 from LK4D4/simple_ckill
daemon/kill.go: simplify if statement
2015-11-12 05:36:40 -05:00
mqliang
644471bac8 kill TODO
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-11-12 16:41:25 +08:00
Steve Durrheimer
8446a5c88b Add zsh completion for 'docker {run,create} --volume-driver'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-11-12 08:35:32 +01:00
moxiegirl
40ed821d2e Merge pull request #17388 from vikstrous/notary_docs
more notary documentation
2015-11-11 20:07:55 -08:00
Viktor Stanchev
e869e8aa3d more notary documentation
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>
2015-11-11 19:56:10 -08:00
Alexander Morozov
2337db8205 Merge pull request #17925 from cpuguy83/fix_locker_unit_tests
Use timeouts instead of relying on runtime.GoSched
2015-11-11 18:46:52 -08:00
Brian Goff
fd672d5926 Use timeouts instead of relying on runtime.GoSched
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-11 20:59:07 -05:00
Alexander Morozov
fa7ec908c4 daemon/kill.go: simplify if statement
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-11 17:19:39 -08:00
Brian Goff
87de5fdd59 Merge pull request #17919 from Microsoft/jjh/tp4
Windows [TP4] Require build 10586+
2015-11-11 19:36:13 -05:00
Brian Goff
5b046c71d8 Merge pull request #17916 from Microsoft/jjh/fix-cp-with-volumes
Windows [TP4] Fix docker cp when volumes
2015-11-11 19:35:05 -05:00
Sebastiaan van Stijn
6c31b17dfd Merge pull request #17921 from thaJeztah/thou-shalt-not-use-we
Fix find and replace typo in dockerimages
2015-11-12 00:09:46 +00:00
Sebastiaan van Stijn
a4b2de674c Fix find and replace typo in dockerimages
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-12 00:52:31 +01:00
Michael Crosby
b664a8825e Merge pull request #17918 from anusha-ragunathan/fsMagic
Include xfsprogs in build environment.
2015-11-11 15:43:52 -08:00
Mohammed Aaqib Ansari
2910f1101d Using checkers assert for integration-cli/docker_cli_events_test.go
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
2015-11-11 18:12:30 -05:00
John Howard
122568b314 Windows [TP4] Require build 10586+
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-11 14:49:14 -08:00
Anusha Ragunathan
2b766a455c 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>
2015-11-11 14:42:08 -08:00
Antonio Murdaca
9d4e2f3992 Merge pull request #17913 from clnperez/oom-test-requires
Add the memoryLimitSupport requirement to Events OOM tests
2015-11-11 23:24:10 +01:00
Alexander Morozov
6c82fba2b3 Merge pull request #17894 from mqliang/deferMove
move defer statement for readability
2015-11-11 14:03:48 -08:00
John Howard
3a852d8442 Windows [TP4] Fix docker cp when volumes
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-11 14:02:07 -08:00
Tibor Vass
adb14543fd Merge pull request #17903 from rhvgoyal/default-to-xfs-v2
Devicemapper: Default to xfs instead of ext4
2015-11-11 16:42:58 -05:00
moxiegirl
6c5395360f Merge pull request #17883 from dave-tucker/bug/17709
Add required ports for Overlay to docs
2015-11-11 13:10:22 -08:00
Sebastiaan van Stijn
e49e6b7bfd Merge pull request #17915 from moxiegirl/17764-fix
Adding in Contiv plugins
2015-11-11 20:56:57 +00:00
Mary Anthony
40fc3a8bcf 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>
2015-11-11 12:56:07 -08:00
moxiegirl
f74c423255 Merge pull request #17813 from davidcurrie/mhn-updates
Updates to Get started with multi-host networking
2015-11-11 12:43:45 -08:00
David Currie
f16dceb632 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>
2015-11-11 20:31:18 +00:00
Arnaud Porterie
37dfae3cde Merge pull request #17909 from LK4D4/info_simple
daemon/info.go: assign proxy fields directly
2015-11-11 21:15:13 +01:00
Sebastiaan van Stijn
ee8aadbdd9 Merge pull request #17807 from albers/completion-network-yes
Align configuration of bash completion with existing values
2015-11-11 20:01:27 +00:00
Alexander Morozov
1df0bb5a13 daemon/info.go: assign proxy fields directly
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-11 11:03:53 -08:00
David Calavera
0b566566c6 Merge pull request #17858 from sanimej/libn
Allow port mapping only for endpoint created on docker run
2015-11-11 11:00:31 -08:00
Alexander Morozov
2bb1c530d7 Merge pull request #17193 from cpuguy83/refactor_store_errors
Refactor volume store's error usage
2015-11-11 10:25:00 -08:00
Dave Tucker
44a527d877 Add required ports for Overlay to docs
Fixes #17709

Signed-off-by: Dave Tucker <dt@docker.com>
2015-11-11 18:04:07 +00:00
Tibor Vass
7a985cfafc Merge pull request #17890 from aboch/b6
Restore deterministic IPv6 from MAC behavior on default bridge network
2015-11-11 12:42:08 -05:00
Vivek Goyal
07ff17fb85 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>
2015-11-11 12:07:35 -05:00
Vivek Goyal
83a34e000b 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>
2015-11-11 12:07:35 -05:00
Alessandro Boch
095a8ac545 Restore IPv6 from MAC on default bridge network
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-11 08:36:04 -08:00
Vincent Demeester
2a7b5f6657 Merge pull request #17880 from duglin/TweakMap
convert map value from struct to bool
2015-11-11 13:49:50 +01:00
Sebastiaan van Stijn
9498e9b732 Merge pull request #17800 from Starefossen/patch-1
Utillize build cache for Node.js web app example
2015-11-11 09:56:40 +00:00