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

8199 commits

Author SHA1 Message Date
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
Doug Davis
cd7a5f5c09 Fix for issue 7902. 
Use utils.RFC3339NanoFixed ("2006-01-02T15:04:05.000000000Z07:00")
instead of time.RFC3339Nano to format our log timestamps - this way
things are aligned, in particular the nano seconds are padded with zeros

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-09-16 10:28:37 -07:00
Vishnu Kannan
39030382c4 Adding state to exec commands to prevent multiple starts of a single exec command. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 23:14:04 +00:00
Vishnu Kannan
bfebdfde78 Splitting the exec remote API into two separate APIs inorder to support resizing of tty sessions. 
1. /container/<name>/exec - Creates a new exec command instance in the daemon and container '<name>'. Returns an unique ID for each exec command.
2. /exec/<name>/start - Starts an existing exec command instance. Removes the exec command from the daemon once it completes.

Adding /exec/<name>/resize to resize tty session of an exec command.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 22:56:47 +00:00
Alexandr Morozov
fbae71326c Merge pull request #8020 from erikh/rewrite_hosts_files 
Links v2: Mutable network files
 2014-09-15 23:03:30 +04:00
Vishnu Kannan
669561c2aa Address review comments. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 17:00:00 +00:00
Vishnu Kannan
d130c10ab7 Fix bug in attach handling for docker exec. Add docs for 'docker exec' feature. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 16:59:05 +00:00
Vishnu Kannan
e1cf95b593 Import nsenter in docker. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 16:59:05 +00:00
Vishnu Kannan
985d579586 Adding 'exec' command to remote API and CLI. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 16:59:03 +00:00
Vishnu Kannan
5130fe5d38 Adding support for docker exec in daemon. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 16:57:52 +00:00
Vishnu Kannan
f3c767d798 Adding Exec method to native execdriver. 
Modified Attach() method to support docker exec.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 16:57:52 +00:00
unclejack
a10a86d437 Merge pull request #7698 from tamsky/tune2fs_base_filesystem 
use tune2fs to disable ext4 mount counts and mount intervals
 2014-09-15 15:42:52 +03:00
unclejack
c751e1739d Merge pull request #8010 from LK4D4/fix_ps_s_hang_#7999 
Fix ps -s hang
 2014-09-15 13:54:29 +03:00
Erik Hollensbe
09b700288e Allow /etc/hosts and /etc/resolv.conf to be updated both outside and 
inside the container.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-13 11:27:34 -07:00
unclejack
da4dba2e8c Merge pull request #8014 from jfrazelle/8012-prevent-container-names-starting-dash 
Ensure container names start with a-zA-Z0-9
 2014-09-12 23:15:16 +03:00
Jessica Frazelle
aa2af817be Ensure container names start with a-zA-Z0-9 
Closes #8012.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-09-12 10:45:07 -07:00
Alexandr Morozov
82bdd88e9c Use unlocked version of changes for GetImage 
Fixes #7999

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-12 11:44:51 +04:00
Alexandr Morozov
555ce0cb54 Use defined variable 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-12 11:42:12 +04:00
Alexandr Morozov
41e9e93e27 Fix my own comments from #7927 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-12 10:05:07 +04:00
Erik Hollensbe
3b6a29b81a Fix an issue where already allocated ports would not trigger an error. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-12 09:51:14 +04:00
Michael Crosby
32b5d145fa Merge pull request #7963 from jfrazelle/7845-remove-image-fail-dont-untag 
Failing to remove an image, will not remove the image name/tag.
 2014-09-11 18:06:18 -07:00
Jessica Frazelle
b2efdc538d Removing an image that fails, also removes the image name/tag. 
Fixes #7845 and #7801, and a real pain point I had :)

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-09-11 11:29:25 -07:00
Michael Crosby
ed7fb3bbda Merge pull request #7202 from timbot/add-registry-mirror-flag 
Add daemon flag to specify public registry mirrors
 2014-09-11 11:11:01 -07:00
Michael Crosby
25f7840993 Merge pull request #7955 from LK4D4/ignore_delete_err_on_unmap_#7954 
Deallocate port before trying to delete iptables chain
 2014-09-09 17:41:26 -07:00
Michael Crosby
f9c345ddfa Merge pull request #7897 from LK4D4/refactoring_net_mode 
Add IsPrivate method for NetworkMode
 2014-09-09 14:20:59 -07:00
Alexandr Morozov
080ca86191 Add IsPrivate method for NetworkMode 
This method indicates that container using private network stack

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-10 00:46:43 +04:00
Alexandr Morozov
2e7cf6b0ce Deallocate port before trying to delete iptables chain 
Fixes #7954
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-10 00:40:46 +04:00
Tim Smith
69a75c673c Add daemon flag to specify public registry mirrors 
Adds support for a --registry-mirror=scheme://<host>[:port]
daemon flag. The flag may be present multiple times. If
provided, mirrors are prepended to the list of endpoints used
for image pull. Note that only mirrors of the public
index.docker.io registry are supported, and image/tag resolution
is still performed via the official index.

Docker-DCO-1.1-Signed-off-by: Tim Smith <timbot@google.com> (github: timbot)
 2014-09-09 19:03:38 +00:00
Jessie Frazelle
971240696f Merge pull request #7660 from rhatdan/selinux-volumes 
Change default label of container volumes to shared SELinux Label
 2014-09-09 11:16:19 -07:00