14 commits

Author	SHA1	Message	Date
Daniel Nephin	9e7651db4d	Build two binaries client and daemon. ... Add a proxy to support 'docker daemon' Fix configFile option, and remove a test that is no longer relevant. Remove daemon build tag. Remove DOCKER_CLIENTONLY from build scripts. Signed-off-by: Daniel Nephin <dnephin@docker.com> Change docker-daemon to dockerd. Signed-off-by: Daniel Nephin <dnephin@docker.com>	2016-04-22 11:26:01 -04:00
Solomon Hykes	745edc49cd	Merge dockerd into docker. 'docker -d' runs in daemon mode. For all other commands, docker auto-detects whether to run standalone or to remote-control the daemon	2013-03-13 00:29:40 -07:00
Solomon Hykes	86854ffbc5	Merged master	2013-03-12 21:53:34 -07:00
Solomon Hykes	d2cba75d5f	Removed interactive mode ('docker -i'). Cool UI experiment but seems more trouble than it's worth	2013-03-12 15:05:41 -07:00
creack	453d49573c	Put back the github.com path for the import	2013-03-12 11:59:27 -07:00
creack	150a4fe7e5	Merge master within fs	2013-03-12 08:33:21 -07:00
Louis Opter	b2de17bf2c	Automatically remove the rcfile generated by docker -i from /tmp	2013-03-12 12:12:40 -07:00
Guillaume J. Charmes	18f4e7e196	Put back the relative paths for dev purpose	2013-03-12 05:17:51 -07:00
Guillaume J. Charmes	687d6f25ee	Change relative paths to absolute	2013-03-11 02:59:52 -07:00
shin-	5d6199b925	post-merge repairs	2013-03-11 07:39:06 -07:00
Solomon Hykes	aa12da6f50	go fmt	2013-02-26 17:26:46 -08:00
Solomon Hykes	db4c75f3c1	Interactive mode preserves existing PATH, to facilitate scripting	2013-02-20 14:45:43 -08:00
Solomon Hykes	d2885910bd	'docker start' and 'docker restart': start or restart a container	2013-02-14 13:49:05 -08:00
Solomon Hykes	e1b25e9b08	Moved server and client logic into sub-packages docker/server and docker/client, respectively. The UI is not affected.	2013-02-13 17:10:00 -08:00