5b6d6020fa
Initialize devicemapper in NewRuntimeFromDIrectory
...
Upstream-commit: 7093411a8dd36612ddc636c14395e33ecff47f7f
Component: engine
2013-10-15 03:53:48 +00:00
715688eb5e
Merged master into device-mapper branch
...
Upstream-commit: 1804fcba93368b4e115f607e060eb345b0594e62
Component: engine
2013-10-10 12:50:30 -07:00
3ce3024fa4
keep -r, but default true
...
Upstream-commit: e594c788e4f42d4878c1b3d16139db0291ed830c
Component: engine
2013-10-03 22:42:35 +00:00
7dc11f73be
Random improvments
...
Upstream-commit: 8b2f4aab232880cb0d7faa18ae12adb33f483b2c
Component: engine
2013-10-02 20:18:15 -07:00
1812696aef
Revert "add a -mount-method flag"
...
This reverts commit e52d756f40c9ccf8b37ca496cb72be057c909ed7.
Upstream-commit: 5e1d540209342fa2d6e2ab7117062a897ccf8fe8
Component: engine
2013-09-26 15:14:03 +00:00
4c426bcdc1
add a -mount-method flag
...
Upstream-commit: c1e25d7273f7f520a0dbac675db4e7e26c8a4a9b
Component: engine
2013-09-26 15:10:01 +00:00
676dd4d044
Server: Pass in device-mapper DeviceSet to server
...
This makes docker (but not docker-init) link to libdevmapper and will
allow it to use the DeviceSet
Upstream-commit: 87e248f52458eca2a40ed6e54e36de89228f6790
Component: engine
2013-09-26 15:08:54 +00:00
fb9071f221
only os.Exits on error
...
Upstream-commit: 46a1cd69a99a9adc7bc366f1eb2c03b62f464d39
Component: engine
2013-09-09 21:26:35 +00:00
0731b44888
Improve formatting with 'go fmt' as stated in CONTRIBUTING.md
...
As 'go fmt' doesn't support verifying files in multiple directories,
it's probably a good idea to run it on all '*.go' files from time to
time with something like this:
find . -name "*.go" | xargs dirname | sort -u | xargs -n 1 echo go fmt
Upstream-commit: d80b50d4b4759665b93e713b99239aba9893416e
Component: engine
2013-08-27 10:05:25 +02:00
436a1e7c85
docker -v: show version and build information without making remote connections
...
Upstream-commit: 9fce6f662ae3e31832bbc45938e509824bea67d5
Component: engine
2013-08-20 19:32:37 -07:00
0bebe41d5e
Move VERSION to a dedicated file to facilitate automated builds and releases
...
Upstream-commit: 9087ef9a770789e6987cd1ca4396d6b20a446724
Component: engine
2013-08-20 19:32:37 -07:00
efc4a51c0c
Fixed typos
...
Upstream-commit: 9b2a5964fc2067014f24e26bd2f99873751ebdc3
Component: engine
2013-08-12 18:53:06 +01:00
810e95ee21
Change daemon to listen on unix socket by default
...
Upstream-commit: 8934f13615e95a0c9f4bc52eefb5c97360e114f3
Component: engine
2013-08-06 00:12:56 +00:00
0c11df3e01
Merge pull request #1267 from sridatta/new-clean-init
...
* Runtime: Fix to "Inject dockerinit at /.dockerinit"
Upstream-commit: f6fa353dd8be732aaed20f0c64a5ae8ccc9f1dbc
Component: engine
2013-08-05 13:23:22 -07:00
466341e775
Document -b none
...
Upstream-commit: 964e826a9beb69a0246ed22c7935fd86df6712e1
Component: engine
2013-07-21 18:01:52 -07:00
7c7e6abf06
+ Runtime: inject dockerinit at /.dockerinit instead of overwriting /sbin/init. This makes it possible to run /sbin/init inside a container.
...
Upstream-commit: 5d8efc107d2c7b7da61a6d22657190c6f13713d2
Component: engine
2013-07-17 17:13:34 -07:00
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
