Daniel Nephin
ef9ad85429
Cleanup from CR.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-23 15:05:15 -04:00
Daniel Nephin
91dd0c0c69
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
7f13a9cf3a
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
a790f96feb
Merged master
2013-03-12 21:53:34 -07:00
Solomon Hykes
ae5f2d9a56
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
20c2c684b2
Put back the github.com path for the import
2013-03-12 11:59:27 -07:00
creack
c4a0001d99
Merge master within fs
2013-03-12 08:33:21 -07:00
Louis Opter
d895b3a7f8
Automatically remove the rcfile generated by docker -i from /tmp
2013-03-12 12:12:40 -07:00
Guillaume J. Charmes
ab1211bcb8
Put back the relative paths for dev purpose
2013-03-12 05:17:51 -07:00
Guillaume J. Charmes
39ad2cf8d3
Change relative paths to absolute
2013-03-11 02:59:52 -07:00
shin-
b4b078c5ae
post-merge repairs
2013-03-11 07:39:06 -07:00
shin-
04adbcb80c
Merged upstream changes in fs branch
2013-03-11 05:50:09 -07:00
Solomon Hykes
3de7ff271c
gofmt
2013-03-09 19:44:09 -08:00
Solomon Hykes
df5134f46e
go fmt
2013-02-26 17:26:46 -08:00
Solomon Hykes
754cf30b0e
Interactive mode preserves existing PATH, to facilitate scripting
2013-02-20 14:45:43 -08:00
Jeff Lindsay
52fa34605c
white space
2013-02-20 12:23:47 +00:00
Jeff Lindsay
4e24b235c3
make sure the standard "replace input carriage returns with line feeds" and "replace output line feeds with carriage return and line feed" flags are set, even on raw (I dont think it should actually be raw)
2013-02-20 12:19:22 +00:00
Solomon Hykes
29aab0e4bf
'docker start' and 'docker restart': start or restart a container
2013-02-14 13:49:05 -08:00
Solomon Hykes
f5594142a8
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