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

3277 commits

Author SHA1 Message Date
Vincent Batts
5630d466b2 devmapper: include the version in info 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-09-25 15:51:02 -04:00
Victor Vieux
857b739e29 Merge pull request #8208 from estesp/7851-fix-hostname-fqdn 
Provide full hostname with domainname to underlying container layer
 2014-09-25 11:33:50 -07:00
Vincent Batts
8e7aa44f0e devmapper: include dm_deps information in debug 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-09-25 10:59:23 -04:00
Phil Estes
5239ba3d06 Provide full hostname with domainname to underlying container layer 
Addresses #7851

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2014-09-25 09:23:39 -04:00
Andrea Luzzardi
4479d69d56 Merge pull request #8200 from aluzzardi/f-ipallocator-check-range 
IPAllocator: Ensure the allocated IPs are within network range.
 2014-09-24 14:29:39 -07:00
Andrea Luzzardi
a471eb4d93 IPAllocator: Ensure the allocated IPs are within network range. 
Since it is possible to request a specific IP, IPAllocator has to verify
that the request is within boundaries.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2014-09-24 11:04:28 -07:00
unclejack
f2fad5c290 Merge pull request #8173 from crosbymichael/update-mem-limit 
Update memory limit for container
 2014-09-24 20:55:25 +03:00
Victor Vieux
827634d355 Merge pull request #7973 from LK4D4/persist_execdriver_dir 
Persist execdriver dir
 2014-09-23 16:01:03 -07:00
Victor Vieux
ab30e19b96 Improve error for docker exec & LXC 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-09-23 21:47:33 +00:00
Victor Vieux
f2bc723bc6 Merge pull request #8181 from rhatdan/selinux_btrfs 
--selinux-enabled flag should be ignored on Disabled SELinux systems
 2014-09-23 10:31:19 -07:00
Dan Walsh
9e2eb0f1cc --selinux-enabled flag should be ignored on Disabled SELinux systems 
On Fedora and RHEL we ship selinux-enabled flag in the docker.service config,
but if people setup the /var/lib/docker as btrfs and disable SELinux,
we should not block the daemon from running.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2014-09-23 13:21:25 -04:00
Tibor Vass
5c110b63dd Merge pull request #8127 from estesp/8107-fix-wait-error-return 
Fix container wait error message to match server template for returning ...
 2014-09-23 12:03:39 -04:00
Tibor Vass
9941b03af1 Merge pull request #8172 from vbatts/vbatts-devmapper_fix_devicset_status_devices 
devmapper: `docker info` devices hard coded
 2014-09-23 10:28:31 -04:00
Michael Crosby
9b755412ab Update memory limit for container 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-09-22 21:41:14 +00:00
Vincent Batts
636e8561a8 devmapper: resizepool hardcodes files as well 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-09-22 17:03:31 -04:00
Vincent Batts
7e9ba22dc3 devmapper: docker info devices hard coded 
If `--storage-opt dm.datadev=/dev/loop0 --storage-opt
dm.metadatadev=/dev/loop1 ` were provided, the information was not
reflected in the information output.

Closes: #7137

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-09-22 16:40:20 -04:00
Alexandr Morozov
4778d7d52d Merge pull request #8125 from somaopensource/8102-fix 
Check whether net.ParseIP returned nil or not
 2014-09-22 23:00:25 +04:00
Alexandr Morozov
623ebf203b Persistent directory for container in execdriver 
This is needed for persistent namespaces

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-22 22:48:26 +04:00
unclejack
950bfe4193 daemon/attach: avoid mem alloc for interface 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-22 21:17:50 +03:00
unclejack
d2c104c3a0 daemon/logs: lower allocations in loop 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-22 18:57:28 +03:00
Tibor Vass
9c7d975614 Merge pull request #8159 from LK4D4/fix_goroutine_leak_in_logs 
Fix goroutine leak in logs following
 2014-09-22 11:16:48 -04:00
unclejack
9fb34ae571 Merge pull request #6101 from LK4D4/ip_range_#4986 
Implement allocating IPs from CIDR within bridge network
 2014-09-22 17:09:16 +03:00
Alexandr Morozov
5ad82d3ea6 Merge pull request #8137 from jfrazelle/8135-event-log-die-start-fail 
After container fails to start, log the event die.
 2014-09-22 12:47:04 +04:00
Oh Jinkyun
c2dc4245f1 Check whether net.ParseIP returned nil or not 
This is fix of #8102

Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com>
 2014-09-22 16:52:23 +09:00
Alexandr Morozov
a7ee201ee8 Close logs pipes and catch write errors 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-22 10:55:46 +04:00
Alexandr Morozov
e7a9662974 Merge pull request #7972 from cpuguy83/split_volumes_from_daemon 
Split volumes out from daemon
 2014-09-20 16:23:20 +04:00
Michael Crosby
8a9e827216 This reduces the amount of logging in the integration tests 
There were a new areas in the brige driver that did not need to have log
output.  Those were removed.  Also set the engine's logging to false
when running the integration tests.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-09-19 17:30:37 -07:00
Jessica Frazelle
d64d55eca8 After container fails to start, log the event die. 
Fixes #8135.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-09-19 16:06:49 -07:00
Brian Goff
45407cf00a Split volumes out from daemon 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-09-19 17:47:47 -05:00
Phil Estes
be6bce6ab8 Fix container wait error message to match server template for returning 404 
Addresses #8107

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2014-09-19 13:33:00 -04:00
Michael Crosby
72e9015591 Merge pull request #7694 from eyakubovich/master 
Add an option to disable IP masquerading
 2014-09-18 18:33:45 -07:00
Vishnu Kannan
003afaf1ce Initialize execStore while restoring a container from checkpoint. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-18 21:40:53 +00:00
Frederick F. Kautz IV
3bb12d390a Adding additional documentation for fixed-cidr networking 
Docker-DCO-1.1-Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu> (github: fkautz)

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-18 08:48:24 +04:00
unclejack
9ae3134dc9 add the timeutils package 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-17 14:30:08 +03:00
Eugene Yakubovich
4dc4d56db9 Add an option to disable IP masquerading 
For the cases where --bip option is used it is sometimes best to disable
IP masquerading as the provided bridge IP range may be routable.

Signed-off-by: Eugene Yakubovich <eugene.yakubovich@coreos.com>
 2014-09-16 20:00:15 -07:00
Jessie Frazelle
f98a1f1f7d Merge pull request #8019 from thockin/add-host 
Allow extra lines in /etc/hosts
 2014-09-16 17:19:16 -07:00
Tim Hockin
68e48b65a6 Allow extra lines in /etc/hosts 
This adds a --add-host host:ip flag which appends lines to /etc/hosts.  This is needed in places where you want the container to get a different name resolution than it would through DNS.  This was submitted before as #5525, closed, and now I am re-opening.  It has come up 2 or 3 times in the last couple days.

Signed-off-by: Tim Hockin <thockin@google.com>
 2014-09-16 23:38:23 +00:00
Alexandr Morozov
ca39a3e36b Merge pull request #7110 from tiborvass/merge-6907 
Docker create (rebase of 6907)
 2014-09-17 03:23:50 +04:00
Tibor Vass
37b3b34afa Merge pull request #7989 from jlhawn/graphdriver_differ_refactor 
Refactor use of graphdriver.Differ
 2014-09-16 18:58:38 -04:00
Alexandr Morozov
ffbd8fe5b9 Merge pull request #8068 from jfrazelle/cleanup-various-fix-me-refs 
Cleanup various fix me refs
 2014-09-17 02:54:54 +04:00
Alexander Larsson
3a90004f3c Add "docker create" support 
This exposes the already existing "create container" operation.  It is
very similar to "docker run -d" except it doesn't actually start the
container, but just prepares it. It can then be manually started using
"docker start" at any point.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)

Conflicts:
	api/client/commands.go
	runconfig/parse.go
	server/container.go

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-09-16 18:40:24 -04:00
Josh Hawn
09ad65ebd5 graphdriver interface name change, typo fix 
Signed-off-by: Josh Hawn <josh.hawn@docker.com>
 2014-09-16 15:10:32 -07:00
Josh Hawn
dee6b481fe Refactor use of graphdriver.Differ 
Some graphdrivers are Differs and type assertions are made
in various places throughout the project. Differ offers some
convenience in generating/applying diffs of filesystem layers
but for most graphdrivers another code path is taken.

This patch brings all of the logic related to filesystem
diffs in one place, and simplifies the implementation of some
common types like Image, Daemon, and Container.

Signed-off-by: Josh Hawn <josh.hawn@docker.com>
 2014-09-16 15:10:32 -07:00
Brian Goff
0a3211f131 Fix #7792 - Order mounts 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-09-16 14:51:06 -07:00
Jessie Frazelle
51b26853ef Merge pull request #7976 from duglin/Issue7902 
Fix for issue 7902 - add trailing zeros to timestamps so logs align
 2014-09-16 13:55:03 -07:00
Alexandr Morozov
00fd008170 Merge pull request #8062 from vishh/run_in_phase2 
Add support for 'docker exec' - phase 2
 2014-09-16 23:56:12 +04:00
Vishnu Kannan
c786a8ee5e Adding docker exec support in CLI. 
Fixed a bug in daemon that resulted in accessing of a closed pipe.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-16 19:24:25 +00:00
Phil Estes
1b0b1ec657 Proper JSON handling of strings that could be represented as other types 
Addresses #6830

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2014-09-16 13:51:02 -04:00
Jessica Frazelle
23b2c39a40 Return errors in NewDaemonFromDirectory instead of calling Fatal 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-09-16 10:42:59 -07:00
Jessica Frazelle
67c254a60a DisableNetworkBidge doesn't need to be public anymore 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-09-16 10:37:50 -07:00