Daniel Nephin
8becd69255
Cleanup from CR.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ef9ad85429
2016-04-23 15:05:15 -04:00
Daniel Nephin
fb521be467
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 >
Upstream-commit: 91dd0c0c69
2016-04-22 11:26:01 -04:00
Solomon Hykes
b5dcd430d5
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
...
Upstream-commit: 7f13a9cf3a
2013-03-13 00:29:40 -07:00
Solomon Hykes
a59a03bb59
Merged master
...
Upstream-commit: a790f96feb
2013-03-12 21:53:34 -07:00
Solomon Hykes
ab2846c881
Removed interactive mode ('docker -i'). Cool UI experiment but seems more trouble than it's worth
...
Upstream-commit: ae5f2d9a56
2013-03-12 15:05:41 -07:00
creack
f9945bccac
Put back the github.com path for the import
...
Upstream-commit: 20c2c684b2
2013-03-12 11:59:27 -07:00
creack
ddc08abc64
Merge master within fs
...
Upstream-commit: c4a0001d99
2013-03-12 08:33:21 -07:00
Louis Opter
cf4a1a8ac7
Automatically remove the rcfile generated by docker -i from /tmp
...
Upstream-commit: d895b3a7f8
2013-03-12 12:12:40 -07:00
Guillaume J. Charmes
45ad596952
Put back the relative paths for dev purpose
...
Upstream-commit: ab1211bcb8
2013-03-12 05:17:51 -07:00
Guillaume J. Charmes
4b2bbc5754
Change relative paths to absolute
...
Upstream-commit: 39ad2cf8d3
2013-03-11 02:59:52 -07:00
shin-
82b549063d
post-merge repairs
...
Upstream-commit: b4b078c5ae
2013-03-11 07:39:06 -07:00
Solomon Hykes
034971c8ee
go fmt
...
Upstream-commit: df5134f46e
2013-02-26 17:26:46 -08:00
Solomon Hykes
00a0161ee7
Interactive mode preserves existing PATH, to facilitate scripting
...
Upstream-commit: 754cf30b0e
2013-02-20 14:45:43 -08:00
Jeff Lindsay
2d5e2c98cb
white space
...
Upstream-commit: 52fa34605c
2013-02-20 12:23:47 +00:00
Jeff Lindsay
477023814c
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)
...
Upstream-commit: 4e24b235c3
2013-02-20 12:19:22 +00:00
Solomon Hykes
066591d505
'docker start' and 'docker restart': start or restart a container
...
Upstream-commit: 29aab0e4bf
2013-02-14 13:49:05 -08:00
Solomon Hykes
cb4e2fcf43
Moved server and client logic into sub-packages docker/server and docker/client, respectively. The UI is not affected.
...
Upstream-commit: f5594142a8
2013-02-13 17:10:00 -08:00
