f4980e7dfe
Gofmt -s (simplify)
...
Upstream-commit: da3962266a4103f2dbf019180585d206fb9e25ff
Component: engine
2013-07-03 14:35:18 -07:00
d9bf1bf281
Merge branch 'add-daemon-storage-path-param' of https://github.com/heavenlyhash/docker into heavenlyhash-add-daemon-storage-path-param
...
Upstream-commit: 862e223cecec203a96d3be4fd667bc9286703e82
Component: engine
2013-06-25 13:33:45 +00:00
ffff9b2ac4
Add argument to allow setting base directory for docker daemon's storage to values other than "/var/lib/docker".
...
Upstream-commit: e44f62a95cc8f3cab446205d66450ee37911e29c
Component: engine
2013-06-20 16:29:54 -05:00
a4e9bba7a3
Merge branch 'master' into simpler-build-upload
...
Conflicts:
api.go
builder_client.go
commands.go
Upstream-commit: e43323221b15d90956a200754bbf3e1d92d7bb1c
Component: engine
2013-06-20 14:19:09 -07:00
cbe318e165
add the possibility to use multiple -H
...
Upstream-commit: dede1585ee00f957e153691c464aab293c2dc469
Component: engine
2013-06-19 12:31:54 +00:00
11334d506a
add basic support for unix sockets
...
Upstream-commit: 3adf9ce04ef1632f82f7bd1585c135bb141aa450
Component: engine
2013-06-18 18:59:56 +00:00
54b69da177
Merge branch 'dns_server_side'
...
+ Configure dns configuration host-wide with 'docker -d -dns'
+ Detect faulty DNS configuration and replace it with a public default
Upstream-commit: 250e47e2eb12015fd436a9b695c50cc2fbfb3fdc
Component: engine
2013-06-14 14:39:05 -07:00
604adb2ef8
* Remote Api: Add flag to enable cross domain requests
...
Upstream-commit: 20bf0e00e81fdff34c821fd880a92e822fb5ba15
Component: engine
2013-06-11 10:12:36 +00:00
161e186417
Solve an issue with the -dns in daemon mode
...
Upstream-commit: afd325a8845ad7c4846747fb9561df12ebf9963a
Component: engine
2013-06-06 11:01:29 -07:00
72a9843fea
Add -dns to docker daemon
...
Upstream-commit: 84d68007cb36b68e1b5c574a0d23fcf583e0d75c
Component: engine
2013-06-05 14:20:54 -07:00
4747c5b99f
linted names
...
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
2013-06-04 18:00:22 +00:00
19f2b9dadf
Add flag to enable cross domain requests in Api
...
Add the -api-enable-cors flag when running docker
in daemon mode to allow CORS requests to be made to
the Remote Api. The default value is false for this
flag to not allow cross origin request to be made.
Also added a handler for OPTIONS requests the standard
for cross domain requests is to initially make an
OPTIONS request to the api.
Upstream-commit: 6d5bdff3942ce5e030b2cbd1510f418de25a1a53
Component: engine
2013-06-03 21:39:00 -04:00
e668458c4b
Simplify the Host flag parsing
...
Upstream-commit: bfb65b733a2cfa0dac6a5760897f09d8e2557381
Component: engine
2013-05-24 11:31:36 -07:00
68053e95b6
Gofmt
...
Upstream-commit: ae72c2f4d6c37a14fcd81658f6ae42d65f5c7169
Component: engine
2013-05-24 11:31:19 -07:00
1cfe074da1
use -H
...
Upstream-commit: 92e4a51965ce862ad1b4682a68b33550f2fd613f
Component: engine
2013-05-24 16:49:18 +00:00
c30cd2c29a
added warning
...
Upstream-commit: 59835135c572db08798dde7a5e211e7f4b453742
Component: engine
2013-05-23 16:15:36 +00:00
95bff3248e
switch to default 127.0.0.1, and mixed the two flags in one. -h
...
Upstream-commit: 13f1939a6316079c14bac5434ecc2c955af1d1fb
Component: engine
2013-05-23 16:09:28 +00:00
726c3246c2
add -host and -port
...
Upstream-commit: a3ccec197e847a996e725d87177067dba98bcca6
Component: engine
2013-05-21 10:14:58 +00:00
bc6fad489c
Create a subpackage for utils
...
Upstream-commit: 2e69e1727b4d5698a90c24c5800eecd5401dc319
Component: engine
2013-05-14 22:37:35 +00:00
fb004c54f0
fixed issue with viz
...
Upstream-commit: c423a790d629b13c2eb1bc553beb3f61e30b3888
Component: engine
2013-05-09 23:52:12 +02:00
3a6a7097c6
split api and server. run return exit code. import, pull and commit uses the smae endpoint. non zero status code on failure
...
Upstream-commit: 04cd20fa627635d30ea315d0d4e281e10e8d293c
Component: engine
2013-05-06 11:31:22 +02:00
2c79fdbc57
up to date with master
...
Upstream-commit: 4f0bda2dd5cfe382f7fd9cfb9f5522f42377673b
Component: engine
2013-05-02 18:36:23 +02:00
85eee11a06
Add -r flag to dockerd in order to restart previously running container. Fixes #26
...
Upstream-commit: 50144aeb42283848db730b936d6b5b6332ec6565
Component: engine
2013-04-24 19:01:23 -07:00
2a6be2d202
Check that the pid in pidfile exists before preventing docker to start
...
Upstream-commit: f079fbe3fa90d58d414341bed5246539c89b61b2
Component: engine
2013-04-22 15:57:31 -07:00
630116b2c0
Remove the NO_MEMORY_LIMIT constant
...
Upstream-commit: f68d107a1368b3d4f3342456a2b0675659688354
Component: engine
2013-04-18 21:08:20 -07:00
2140febcd7
skeleton remote API, only version working (wip)
...
Upstream-commit: c0d5d5969bb9c0bfe79e7a11977697e50cc185ae
Component: engine
2013-04-18 03:13:43 +02:00
204f13f820
Skeleton of http API
...
Upstream-commit: a11b31399b51a3d5bfd0696e13439196915bbbbb
Component: engine
2013-04-16 19:53:08 +02:00
b71d622550
Disabled standalone mode ( fixes #364 )
...
Upstream-commit: 2a47df020246cc08a0b72cf355c9d803404245b3
Component: engine
2013-04-15 11:44:11 -07:00
3fcc60d0f7
Allow to disable memory limit at compilation time
...
Upstream-commit: 1967c8342aef1a81eb33a41d673bb8e702daa5df
Component: engine
2013-04-12 10:48:20 -07:00
ebb6835d20
Go fmt
...
Upstream-commit: 22893429ed29dbb7a01eed7a90a4d1fbecfd5d90
Component: engine
2013-04-12 07:37:24 -07:00
7f83ef43de
docker daemon: create file containing PID
...
Ensure the docker daemon creates a file containing its PID under
/var/run/docker.pid.
The daemon takes care of removing the pid file when it receives either
SIGTERM, SIGINT or SIGKILL.
The daemon also refuses to start when the pidfile is found. An
explanation message is shown to the user when this happens.
This change is required to make docker easier to manage by tools like
checkproc which rely on this information.
Upstream-commit: fb0b375be70e79eaa8349143dceef048db6e0e19
Component: engine
2013-04-11 21:41:08 +02:00
2c9d6a2303
Move DockerLocalConn and terminal functions form package "main" to "rcli" in order to be able to use DockerLocalConn in commands_test.go
...
Upstream-commit: 246eed52de1038ccec462e500b942711735a7c24
Component: engine
2013-04-08 15:58:09 -07:00
e262b369bb
Simplification in the goroutine that restore the terminal state on SIGINT
...
Upstream-commit: b306a6073882e7995d74801d77d7baca4b12ec86
Component: engine
2013-04-08 15:58:09 -07:00
7815b9b259
Only set the terminal in raw mode for commands which need it
...
The raw mode is actually only needed when you attach to a container.
Having it enabled all the time can be a pain, e.g: if docker crashes
your terminal will end up in a broken state.
Since we are currently missing a real API for the docker daemon to
negotiate this kind of options, this changeset actually enable the raw
mode on the login (because it outputs a password), run and attach
commands.
This "optional raw mode" is implemented by passing a more complicated
interface than io.Writer as the stdout argument of each command. This
interface (DockerConn) exposes a method which allows the command to set
the terminal in raw mode or not.
Finally, the code added by this changeset will be deprecated by a real
API for the docker daemon.
Upstream-commit: 7d0ab3858e51a2cea244da72bb842fe15a5a9ded
Component: engine
2013-04-08 15:58:09 -07:00
a5a58e7b30
The flag to use a pre-existing bridge interface is '-b'. Added explanation
...
Upstream-commit: 22adb52c0aaf4ff53d37eb45566d6aeeb907ed09
Component: engine
2013-04-05 14:16:04 -07:00
5140fcb35f
Move the default bridge name to a constant
...
Upstream-commit: 1b370f9d8dbd1c476db766e8587617e795570d97
Component: engine
2013-04-04 05:33:28 -07:00
ae8058f403
Put the bridge interface name in the command line
...
Upstream-commit: f39af7e05da437d6ac95b19ccfa401598d1fb5d9
Component: engine
2013-04-03 16:15:43 -07:00
ca62613e60
Merged shawnsi/git-version
...
Upstream-commit: 35c68944c7a5c7b7778c6cdb54b149e22c4c0c64
Component: engine
2013-04-02 20:26:22 -07:00
96ec0e911c
Use an environment variable to activate debug mode, instead of a package-specific flag
...
Upstream-commit: 76663079312bb501f545823d9650df9eeda2c882
Component: engine
2013-04-02 10:58:16 -07:00
5f6e565b52
Adding git commit to the version output
...
The Makefile must be used in order to inject the git commit
via -ldflags.
Upstream-commit: 37a78902db9e968d307d0c0325612e8bef20bc69
Component: engine
2013-04-01 13:52:45 -05:00
e3924816a0
Merged Ctrl-C interception by @creack
...
Upstream-commit: c937e237ad0625fc0ae8049e745bf599c27b0af8
Component: engine
2013-03-29 13:12:04 -07:00
3e91a54abc
Camelize some snake_case variable names
...
Upstream-commit: a6da7f138c0b260d560c63e234c87db0f5c72bb1
Component: engine
2013-03-28 20:12:23 -04:00
22d5f7d988
Change hardcoded "0" onto os.Stdin.Fd()
...
Upstream-commit: 6a236184af6ae57e2f7475e9ab279b0684a869d4
Component: engine
2013-03-27 23:56:36 -07:00
3ebc70c951
#214 Better signal handling
...
Upstream-commit: 108acc0511fde98a8b5035d9ea7256d5449bb034
Component: engine
2013-03-27 23:54:53 -07:00
71cb06de21
Add a Debugf() helper and a -D (debug) flag to docker
...
Upstream-commit: 6e507b9460b81e830ef2f5d10035d08e3948fe4d
Component: engine
2013-03-22 11:44:12 -07:00
69e910efff
Moved Go() to the main package... And got rid of the useless docker/future package
...
Upstream-commit: 623e91e2e3f3d0b408a43606df8d3c037a6b03be
Component: engine
2013-03-21 01:13:55 -07:00
9ee9057ed1
Move commands into docker
...
Upstream-commit: e5e66716df901bcc40106497532b9c3bff0bb931
Component: engine
2013-03-14 02:43:16 -07:00
621d110d7f
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: 745edc49cdcf0dc02fe714b0772f146fc8a66d23
Component: engine
2013-03-13 00:29:40 -07:00
95b2e5b159
Merged master
...
Upstream-commit: 86854ffbc5423597d11932eb904cb6fe7dedcac9
Component: engine
2013-03-12 21:53:34 -07:00
547e13b585
Removed interactive mode ('docker -i'). Cool UI experiment but seems more trouble than it's worth
...
Upstream-commit: d2cba75d5f1e8ceea7f301ef146c571806252fa0
Component: engine
2013-03-12 15:05:41 -07:00
