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

7184 commits

Author SHA1 Message Date
Alena Prokharchyk
dabd8a02ae Removed unused "mutex" field 
fixes #11659

Signed-off-by: Alena Prokharchyk <alena@rancher.com>
 2015-03-23 19:05:21 -07:00
Jessie Frazelle
d5eea4e8b0 Merge pull request #11636 from robertabbott/refactor_networkfs 
Refactor pkg/networkfs
 2015-03-23 16:58:29 -07:00
Anton Tiurin
f2c7b4d743 Syslog.Log - Remove redundant cast of msg.Line []byte to string as 
it's a fmt.Sprintf responsibility.

Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
 2015-03-24 01:35:54 +03:00
Jessie Frazelle
ccd4181d10 Merge pull request #11545 from cpuguy83/remove_allocator_warning 
Don't warn when ip_local_port_range not found
 2015-03-23 14:19:57 -07:00
Alexander Morozov
d852e5fde8 Merge pull request #11660 from paulbellamy/11626-portallocator 
Refactoring portallocator away from a global var
 2015-03-23 14:10:56 -07:00
Paul Bellamy
1257679876 Refactor global portallocator state into a global struct 
Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com>
 2015-03-23 20:41:41 +00:00
Brian Goff
8e4d9f3cf9 Improve err message when parsing kernel port range 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-03-23 13:29:25 -07:00
Alexander Morozov
2717302cc6 Merge pull request #11654 from runcom/11650-syslog-close-redunant-nil-check 
syslog Close() - Remove redunant nil check, s.writer cannot be nil
 2015-03-23 12:32:26 -07:00
Antonio Murdaca
e600df2d97 Remove redunant nil check, s.writer cannot be nil 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-23 20:03:24 +01:00
Antonio Murdaca
8f025aae36 Refactor syslog Log else clause 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-23 20:01:01 +01:00
Alexander Morozov
65e21f5703 Merge pull request #11458 from ibuildthecloud/syslog 
Add syslog logging driver
 2015-03-23 11:34:33 -07:00
Jessie Frazelle
1fe55b2f8b Merge pull request #10365 from cpuguy83/9981_fix_cannot_overwrite_nonbind_as_bind 
Allow path from normal volume existing to overwrite in start Binds
 2015-03-23 10:43:02 -07:00
bobby abbott
a91b2431a3 Refactor pkg/networkfs 
Solves #11591

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
 2015-03-22 23:53:47 -07:00
sidharthamani
eaecd8b1b5 add syslog driver 
Signed-off-by: wlan0 <sid@rancher.com>
 2015-03-21 18:01:18 -07:00
Jessie Frazelle
b6e20a67f9 Merge pull request #11454 from hqhq/fix_memoryswap_warning 
do not warning when we disable memoryswap
 2015-03-21 15:23:25 -07:00
Michael Crosby
84d3ab30d4 Merge pull request #11492 from coolljt0725/fix_hostname_missing_in_container_netmode 
Fix hostname missing when a container's net mode is contaienr mode
 2015-03-20 16:49:37 -07:00
Dan Walsh
3c136333af Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version 
They say we should only use the BTRFS_LIB_VERSION

They will no longer support this since it had to be managed manually

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-03-20 11:43:53 -04:00
Dan Walsh
fe9fe1473c We want to allow the sharing of /dev from the host into the 
container.

docker run -v /dev:/dev should stop mounting other default mounts in i
libcontainer otherwise directories and devices like /dev/ptx get mishandled.

We want to be able to run libvirtd for launching vms and it needs
access to the hosts /dev.  This is a key componant of OpenStack.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-03-20 08:56:21 -04:00
Jessie Frazelle
5a239c0022 Merge pull request #11507 from crosbymichael/container-state 
Cleanup libcontainer container state
 2015-03-19 16:02:24 -07:00
Michael Crosby
455a272aef Merge pull request #11428 from vishh/parent-cgroup 
Adding '--cgroup-parent' option.
 2015-03-19 14:41:57 -07:00
Michael Crosby
2b12b099b8 Mount libcontainer state dir in tmpfs 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-19 14:27:17 -07:00
Michael Crosby
06c939e527 Ensure the container state is removed on daemon boot 
This ensures that the libcontainer state is fully removed for a
container after it is terminated.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-19 14:21:19 -07:00
Mrunal Patel
60ef4ae6fc Update libcontainer to 4a72e540feb67091156b907c4700e580a99f5a9d 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-03-19 14:42:23 -04:00
Alexander Morozov
d338c613bf Merge pull request #11459 from simonswine/10001-ipv6-tests 
[WiP] Adds testing for bridge's IPv6 support
 2015-03-19 08:37:28 -07:00
Tibor Vass
fdf49d758f Merge pull request #11274 from MabinGo/selinux_enable_verify 
Add logs when Docker enabled selinux (closes #11197)
 2015-03-19 10:34:55 -04:00
Phil Estes
9d5eab1873 Merge pull request #11453 from duglin/HideDaemonDots 
Hide dots on daemon startup when loglevel != info
 2015-03-19 10:10:18 -04:00
Michal Fojtik
d62f25e422 Fix lxc-start in lxc>1.1.0 where containers start daemonized by default 
Signed-off-by: Michal Fojtik <mfojtik@redhat.com>
 2015-03-19 14:51:05 +01:00
Lei Jitang
74664dabff Fix hostname missing when a container's net mode is contaienr mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-03-19 17:03:40 +08:00
Vishnu Kannan
0b1e2b5a55 Adding '--cgroup-parent' flag to docker run. This feature helps users implement more complex 
resource isolation policies on top of what native docker provides.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2015-03-19 02:34:15 +00:00
Mabin
1bf529a456 Add logs when Docker enabled selinux 
Signed-off-by: Mabin <bin.ma@huawei.com>
 2015-03-19 09:46:53 +08:00
Jessie Frazelle
474f58e2e7 Merge pull request #11471 from LK4D4/wait_for_copier 
Wait for copier finishing it's work before closing logger
 2015-03-18 15:41:12 -07:00
Jessie Frazelle
e1a0bff6b8 Merge pull request #11474 from crosbymichael/null-masked-paths 
Do not mask /proc/kcore in privileged
 2015-03-18 14:43:13 -07:00
Michael Crosby
f4a458e67f Do not mask /proc/kcore in privileged 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-18 14:17:21 -07:00
Alexander Morozov
b6a42673ab Wait for copier finishing it's work before closing logger 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-18 13:48:01 -07:00
Alexander Morozov
bd8661e8fa Protect jsonfilelog writes with mutex 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-18 13:00:53 -07:00
Christian Simon
4307ec283b [WiP] Adds testing for bridge's IPv6 support 
* fixes #10001
* test for global subnets <= 80
* test for global subnets > 80
* test link local allocations
* test duplicated addresses
* test regression from bug #11427

Signed-off-by: Christian Simon <simon@swine.de>
 2015-03-18 08:51:14 +01:00
Alexander Morozov
cf071bb962 Merge pull request #11450 from crosbymichael/rlimitfix 
Don't hardcode default rlimit
 2015-03-17 20:27:05 -07:00
Qiang Huang
55cc166e53 do not warning when we disable memoryswap 
$ docker run -ti --rm -m 300M --memory-swap=-1 ubuntu:14.04
WARNING: Your kernel does not support swap limit capabilities. Limitation discarded.
root@813aafc019d5:/#

When we disable memoryswap, it should not warning swap limit not support.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-03-18 10:08:17 +08:00
Jessie Frazelle
a5269223a7 Merge pull request #11320 from estesp/fix-daemon-startup 
Fix daemon shutdown on error after rework of daemon startup
 2015-03-17 19:04:25 -07:00
Doug Davis
88dc6cc2df Hide dots on daemon startup when loglevel != info 
When the deamon starts up with log level set to INFO it will show something
like this:
```
INFO[0000] Loading containers: start.
................................................................
INFO[0000] Loading containers: done.
```
where the dots represent containers in the system.
When you run with log level set to "error" it will still show the dots
w/o the "Loading..." lines before and after which looks really odd.
This PR will fix it so that the dots are only shown IFF the "Loading..."
lines are also shown

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-17 17:27:53 -07:00
Michael Crosby
f5a154f2d2 Don't hardcode default rlimit 
The default for rlimit handling should be to inherit the rlimit of the
daemon unless explicitly set.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-17 16:04:15 -07:00
Phil Estes
459e58ffc9 Fix daemon shutdown on error after rework of daemon startup 
Currently the daemon will not stop on error because the serve API job is
blocking the channel wait for daemon init.  A better way is to run the
blocking serve API job as a goroutine and make sure that error
notification gets back to the main daemon thread (using the already
existing channel) so that clean shutdown can occur on error.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-03-17 14:15:00 -04:00
Vishnu Kannan
39d49ba7ba Reduce logging level from error to warning if "/proc/sys/net/ipv4/ip_local_port_range" proc file in not accessible. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2015-03-17 17:39:17 +00:00
Arnaud Porterie
1ff5a91007 Merge pull request #10568 from LK4D4/logging_drivers 
Logging drivers
 2015-03-17 09:45:58 -07:00
Arnaud Porterie
cb77ad4757 Merge pull request #11369 from coolljt0725/fix_link 
Fix --link to a container which net mode is container
 2015-03-17 08:36:33 -07:00
Alexander Morozov
8685af0b13 Merge pull request #11401 from Mashimiao/11385-fix-lxc-conf-error 
fix not show error when using --lxc-conf without lxc driver
 2015-03-17 08:35:18 -07:00
Lei Jitang
82e2e1a11a Fix --link to a container which net mode is container mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-03-17 07:50:12 -07:00
Andy Goldstein
a2b0c9778f Add ability to refer to image by name + digest 
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
 2015-03-17 10:10:42 +00:00
Arnaud Porterie
b6ac111abf Merge pull request #9882 from ibuildthecloud/labels 
Proposal: One Meta Data to Rule Them All => Labels
 2015-03-16 20:20:05 -07:00
Ma Shimiao
703cab12e7 fix not show error when using --lxc-conf without lxc driver 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-03-17 08:50:17 +08:00