beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19980 commits 14 branches 412 tags 338 MiB
Commit graph

2550 commits

Author SHA1 Message Date
Michael Crosby
104dab87ea Merge pull request #17478 from vdemeester/pr-13921 
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
 2015-11-17 15:44:57 -08:00
Alexander Morozov
adce1981f4 Merge pull request #17593 from daehyeok/refactoring_json_log 
Refactoring json log driver
 2015-11-17 15:38:52 -08:00
Alexander Morozov
d3744fbeb1 Merge pull request #18002 from Microsoft/10662-registerlinks 
Windows: Disable links
 2015-11-17 11:48:53 -08:00
Michael Crosby
1ecb9a40db Merge pull request #17974 from anusha-ragunathan/fsMagic 
Fix devmapper backend in docker info
 2015-11-17 11:44:48 -08:00
Alexander Morozov
9187656305 Merge pull request #16639 from mrunalp/skip_dev_setup 
Skip /dev setup in container when it is bind mounted in
 2015-11-17 11:36:00 -08:00
Alexander Morozov
4dda67b801 Merge pull request #16452 from rhatdan/btrfs-selinux 
Relabel BTRFS Content on container Creation
 2015-11-17 11:03:40 -08:00
Alexander Morozov
f18d5da6a7 Merge pull request #17300 from kunalkushwaha/plugin-info 
Patch for Plugin drivers in docker info
 2015-11-17 10:46:29 -08:00
David Calavera
6f1bc096a6 Merge pull request #18025 from Microsoft/10662-ArgumentEscaping 
Windows: Fix docker exec
 2015-11-17 11:14:54 +01:00
Darren Stahl
d7692b02bd Typo in previous PR processConfig, not c.ProcessConfig 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2015-11-16 11:56:01 -08:00
Alexander Morozov
a3065fa48f Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels 
Allow configurable metadata for Splunk log driver
 2015-11-16 10:11:27 -08:00
Tibor Vass
92487d7fb4 Merge pull request #17985 from Microsoft/jjh/firstboot 
Windows: [TP4] Fix regression on second or later container starts
 2015-11-16 10:03:46 +01:00
Kunal Kushwaha
aa7fd884e6 Supported added for reterving Plugin list for Network and Volume. 
Also, plugin information in docker info output.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2015-11-16 15:28:09 +09:00
John Howard
b2771b4456 Windows: Disable links 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-15 21:32:31 -08:00
Sebastiaan van Stijn
cf824d9749 Merge pull request #17479 from coolljt0725/show_warning 
Show warning when user specify dm.basesize for already initialized devicemapper driver
 2015-11-15 08:51:33 +01:00
daehyeok mun
086c0b4a66 Extract rotate file writer from json log driver 
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
 2015-11-14 16:15:44 -07:00
Vincent Demeester
49779b674a Add pkg/parsers/architecture and pkg/platform 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-14 23:03:02 +01:00
Olle Jonsson
4e8fcd4002 /info: Add keys Architecture, OSType 
- introduces Swarm-relevant keys, see #13634
  - docs updated

Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com>
 2015-11-14 22:21:45 +01:00
John Howard
8da449055f Windows: Fix regresion on first boot 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-14 11:06:19 -08:00
Antonio Murdaca
ad8a66573c Merge pull request #17851 from Microsoft/10662-ArgumentEscaping 
Prevent double escaping of Dockerfile commands on Windows
 2015-11-14 17:25:53 +01:00
Anusha Ragunathan
fdc2641c2b Fix devmapper backend in docker info 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2015-11-13 21:05:47 -08:00
Michael Crosby
439633cee6 Merge pull request #17977 from Microsoft/jjh/archivewindowscomment 
Windows: Fixes comment in archive_windows.go
 2015-11-13 16:00:14 -08:00
Michael Crosby
58244392e5 Merge pull request #17979 from Microsoft/jjh/tidytodowindows 
Remove 'TODO Windows' unnecessary comment
 2015-11-13 15:59:06 -08:00
unclejack
13963957eb Merge pull request #17877 from aaronlehmann/capped-bytespipe 
Cap the amount of buffering done by BytesPipe
 2015-11-14 00:51:11 +02:00
Alexander Morozov
5e2d4aaec2 Merge pull request #17980 from Microsoft/jjh/configuresysinit 
Remove uncalled configureSysInit
 2015-11-13 14:30:03 -08:00
John Howard
2648655a4a Remove uncalled configureSysInit 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-13 13:43:09 -08:00
John Howard
208ad80605 Remove TODO Windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-13 13:07:27 -08:00
John Howard
e5261d6e4a Windows: Fixes comment 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-13 12:51:05 -08:00
Alexander Morozov
42fa8e3128 Merge pull request #17417 from cpuguy83/15815_add_log_file_poller 
Fallback to file polling for jsonlog reader on err
 2015-11-13 11:49:54 -08:00
Darren Stahl
9db5db1b94 This fixes the case where arguments are escaped twice from Dockerfiles on 
Windows

Signed-off-by: Darren Stahl <darst@microsoft.com>
 2015-11-13 10:43:06 -08:00
Alexander Morozov
cccf674943 Merge pull request #16873 from coolljt0725/expand_docker_info 
Add more cgroup config to docker info
 2015-11-13 09:37:06 -08:00
Alexander Morozov
f9daecc880 Rename daemon/utils_*.go to selinux 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-11-12 15:48:41 -08:00
Vincent Demeester
588fedef4a Merge pull request #17949 from Microsoft/jjh/cpuweighttp4 
Windows: TP4 fix cpu weight
 2015-11-12 21:13:09 +01:00
Vincent Demeester
318a13b0af Merge pull request #17948 from LK4D4/splunk_windows 
Enable Splunk logdriver for windows
 2015-11-12 20:44:31 +01:00
Vincent Demeester
812a1c149a Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device 
Add support for blkio.weight_device
 2015-11-12 20:42:13 +01:00
John Howard
90eac6b48b Windows: TP4 fix cpu weight 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-12 11:08:24 -08:00
Alexander Morozov
705b50850c Enable Splunk logdriver for windows 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-11-12 10:57:21 -08:00
Aaron Lehmann
64f8ee444d Cap the amount of buffering done by BytesPipe 
Turn BytesPipe's Read and Write functions into blocking, goroutine-safe
functions. Add a CloseWithError function to propagate an error code to
the Read function.

Adjust tests to work with the blocking Read and Write functions.

Remove BufReader, since now its users can use BytesPipe directly.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2015-11-12 10:11:29 -08:00
David Calavera
8cf38b6a8b Merge pull request #17589 from Microsoft/jjh/refactorprocessconfig 
Refactor ProcessConfig
 2015-11-12 07:28:32 -08:00
Denis Gladkikh
26855c7801 Allow configurable metadata for Splunk log driver 
Add support of `tag`, `env` and `labels` for Splunk logging driver.
Removed from message `containerId` as it is the same as `tag`.

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
 2015-11-12 06:36:51 -08: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
John Howard
122568b314 Windows [TP4] Require build 10586+ 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-11 14:49:14 -08: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
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
Dan Walsh
1716d497a4 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>
 2015-11-11 14:49:27 -05: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