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

2565 commits

Author SHA1 Message Date
NIWA Hideyuki
5aeaf2a0c4 Addition of "--shm-size" to which size of /dev/shm is changed. 
- Optional "--shm-size=" was added to the sub-command(run, create,and build).
- The size of /dev/shm in the container can be changed
  when container is made.
- Being able to specify is a numerical value that applies number,
  b, k, m, and g.
- The default value is 64MB, when this option is not set.
- It deals with both native and lxc drivers.

Signed-off-by: NIWA Hideyuki <niwa.hiedyuki@jp.fujitsu.com>
 2015-11-20 09:24:18 +09:00
Alexander Morozov
8e6e38990c Merge pull request #18084 from wenchma/18054_exec_start_fix 
Update docs and test of exec create api return codes
 2015-11-19 13:51:46 -08:00
Alexander Morozov
24fb3659df Merge pull request #18076 from rhvgoyal/unmount-recursive 
Unmount recursively to unmount volumes
 2015-11-19 13:46:48 -08:00
Alexander Morozov
37f64ded44 Merge pull request #17908 from calavera/carry_17059 
[Carry 17059] allow filtering containers by any status
 2015-11-19 13:24:43 -08:00
Vivek Goyal
b9e701b203 Use lazy unmount to unmount volumes 
Volumes can have more mount points beneath them and unmount will fail. This
is the case when a bind mounted directory on host already had a mount point
underneath it. So use lazy unmount instead.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
 2015-11-19 20:46:07 +00:00
Kamil Domański
f30364c583 allow filtering containers by any status 
Signed-off-by: Kamil Domański <kamil@domanski.co>
(cherry picked from commit 9ada6a06c5)
 2015-11-19 14:11:41 -05:00
John Howard
37d2a70038 Windows: [TP4] docker info crashes 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-19 11:02:25 -08:00
Wen Cheng Ma
01b86d612c Update docs and test of exec create api return codes 
Fixes issue #18054

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2015-11-19 22:22:27 +08:00
Vincent Demeester
c32f8bb36a Merge pull request #17704 from LK4D4/default_cgroupfs 
Use fs cgroups by default
 2015-11-19 14:01:13 +01:00
Alexander Morozov
419fd7449f Use fs cgroups by default 
Our implementation of systemd cgroups is mixture of systemd api and
plain filesystem api. It's hard to keep it up to date with systemd and
it already contains some nasty bugs with new versions. Ideally it should
be replaced with some daemon flag which will allow to set parent systemd
slice.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-11-18 16:16:13 -08:00
Michael Crosby
877fe61f75 Merge pull request #18065 from calavera/one_container_constructor_to_rule_them_all 
Remove the container initializers per platform.
 2015-11-18 14:06:47 -08:00
David Calavera
060f4ae617 Remove the container initializers per platform. 
By removing deprecated volume structures, now that windows mount volumes we don't need a initializer per platform.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-11-18 08:41:46 -05:00
Kenjiro Nakayama
84781a5df7 docker info suppports case-insensitive proxy env settings 
Signed-off-by: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
 2015-11-18 10:58:19 +09:00
Michael Crosby
3f508f08de Merge pull request #17261 from mountkin/remove-unused-daemon-config 
remove the unused DefaultNetwork member from daemon.Config
 2015-11-17 16:33:11 -08:00
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