Tianon Gravi
bde45636d6
Fix various MAINTAINERS format inconsistencies
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: defecac2799ca0c72532b7e6ed6005cc54ee2e25
Component: engine
2014-04-30 11:22:11 -06:00
Solomon Hykes
760aa19df4
Merge pull request #5320 from JackDanger/jackdanger/typo-doc-fix
...
Upstream-commit: 20e9f61971a858baef1c8035f5f08ceefdc7c92d
Component: engine
2014-04-29 17:41:16 -07:00
Solomon Hykes
6f6b2c01f3
Merge pull request #5422 from shykes/engine-spawn
...
engine/spawn: run an engine in a subprocess, remote-controlled by Beam
Upstream-commit: d8332f433f667971e84d5ecfb30348797f50e83c
Component: engine
2014-04-28 12:56:02 -07:00
Solomon Hykes
cdda6fcada
engine.Len returns the number of keys in an env
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 9b23178f585f65b9dc9558694d6de4207c479801
Component: engine
2014-04-28 00:37:42 -07:00
Solomon Hykes
da3f4afb39
engine/spawn: run an engine in a subprocess, remote-controlled by Beam
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: b4b83ef8ae788cb7e016fbf90f0c1b890af7b23d
Component: engine
2014-04-27 14:11:46 -07:00
Solomon Hykes
823835353e
Fix bug in engine.Sender
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 9236e088eb5a9a6d662b08ef7983dbecf01e6ef0
Component: engine
2014-04-27 14:11:45 -07:00
Solomon Hykes
c5be0fd91f
Merge pull request #5374 from shykes/beam-engine
...
Remote communication between engines using beam
Upstream-commit: 62f4c884439044475eeaf7a18cd8a260df08a880
Component: engine
2014-04-27 14:10:59 -07:00
Solomon Hykes
c0ccb32841
Merge pull request #5365 from crosbymichael/job-status
...
Add exported status code from a job
Upstream-commit: 4701f8ee60db9af11f35d24f8d4b163490722d60
Component: engine
2014-04-25 17:27:07 -07:00
Solomon Hykes
e77e02d78a
engine: 'rengine' is a small command-line utility to debug remote engine
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 7e3624a498b8b96a4e8a0f1d59fc2c50bf48efb3
Component: engine
2014-04-25 17:23:47 -07:00
Solomon Hykes
bceccfa5cf
engine.Sender and engine.Receiver support stdin
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: b63b98ee2766321e2ca6f3b159c2bfb303870105
Component: engine
2014-04-25 17:23:47 -07:00
Solomon Hykes
2e9c0c6ca2
Remote communication between engines using beam
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 3c1d5ca33ecbd644d4e8d864ff59b389f4a4a555
Component: engine
2014-04-25 17:23:47 -07:00
Solomon Hykes
35fee9d895
engine: allow registering a "catchall" handler which receives all commands
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 68d3e757503fab422fc96a00d511336a3fdfd619
Component: engine
2014-04-25 17:23:16 -07:00
Solomon Hykes
8fdb34e01b
engine.Installer: a standard interface for "installable" services
...
Installer is a standard interface for objects which can "install"
themselves an engine by registering handlers.
This can be used as an entrypoint for external plugins etc.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 9422451ac3f541a17daba0d5f6dc8b40a6edc9e9
Component: engine
2014-04-25 17:23:16 -07:00
Solomon Hykes
f06dbcb7ce
Merge pull request #5345 from shykes/engine-installer
...
engine.Installer: a standard interface for "installable" services
Upstream-commit: 0fe48b0e5914fa1384d061546970e23fb348b53f
Component: engine
2014-04-23 16:16:55 -07:00
Michael Crosby
4ac9260833
Add exported status code from a job
...
This allows the job's status code to be consumed externally so that we
can use it as an exit code or saving to a state file.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: f90029611fec082a41b5629e43a88a39f0674fe2
Component: engine
2014-04-23 13:47:56 -07:00
Michael Crosby
d8eb119f29
Remove error from engine.New()
...
Without creating a root there is no way for the engine to return an
error from the new function.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 7100ace42bda2660d1eaecb2ec096ba6753688ea
Component: engine
2014-04-23 11:54:35 -07:00
Michael Crosby
5c5b3c1ca6
Remove the concept of a root dir out of engine
...
This makes the engine more general purpose so that we can
use it and the job routing functionality for reexec'ing our binary
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Conflicts:
integration/runtime_test.go
Upstream-commit: 672edfe807c597a1c245bce996a150dfdf273a3c
Component: engine
2014-04-22 19:04:03 -07:00
Solomon Hykes
bea68ba524
engine.Installer: a standard interface for "installable" services
...
Installer is a standard interface for objects which can "install"
themselves an engine by registering handlers.
This can be used as an entrypoint for external plugins etc.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 4353f25e10d19f414bdd5b20488824fb2b834d6e
Component: engine
2014-04-22 16:51:06 -07:00
Solomon Hykes
44ed49fbeb
Clean up MAINTAINERS files
...
* Remove out of date "vacation mode"
* Fix my email address
* Remove infrastructure maintainers to reflect reality (core maintainers
are currently maintaining their own infrastructure).
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 19e6614eeb31d6a986ef61486e15aeb09cc952b8
Component: engine
2014-04-21 18:17:13 -07:00
Jack Danger Canty
66881af057
typo fix: 'methid' -> 'method'
...
Upstream-commit: 611a1d711bc382fb0dafafbdea5a5091383de972
Component: engine
2014-04-19 23:25:48 -07:00
Solomon Hykes
e5168686ec
Engine: optional Logging field to disable custom logging in engine.
...
* The default behavior is preserved
* This disables the use of the `TEST` environment variable in engine.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: ea2fba5ce04d3eb2a8959b8f5116604faae1e88a
Component: engine
2014-04-07 21:41:25 +00:00
Michael Crosby
76c76ce8f5
Revert "engine: fix engine.Env.Encode() to stop auto-guessing types."
...
This reverts commit 76057addb255e6f14dd03c276317abc759a15a80.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 95e6fd819bbef09032bf680e0f7dadd7fbf44559
Component: engine
2014-04-04 11:29:56 -07:00
Solomon Hykes
53e20d9286
engine: fix engine.Env.Encode() to stop auto-guessing types.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 76057addb255e6f14dd03c276317abc759a15a80
Component: engine
2014-04-03 23:53:42 +00:00
unclejack
04d68b69ad
handle symlinks for Docker's root dir & TMPDIR
...
This removes the incomplete symlink handling from engine.go and it adds
it one place in docker.go.
It also enables handling symlinks for TMPDIR.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 611acf7a7c1c3a6796e862fb94143890a9aa4573
Component: engine
2014-03-03 23:00:53 +02:00
Solomon Hykes
764f9b0016
Merge pull request #4314 from shykes/engine-commands
...
Engine: builtin command 'commands' returns a list of registered commands
Upstream-commit: 56584a92f43f7f05789b345970d672bcbbdd32b0
Component: engine
2014-02-25 09:59:26 -08:00
Victor Vieux
c924c9e051
Merge pull request #4315 from shykes/engine-parsejob-test
...
Engine: add tests for ParseJob()
Upstream-commit: ad88d0be83fa317010fbeabe09471948256b1207
Component: engine
2014-02-24 14:27:19 -08:00
Victor Vieux
102c3daac9
Merge pull request #4312 from shykes/engine-error-reporting
...
Engine: clearer job error reporting
Upstream-commit: 4a4915c8eef8d49f9d68a85f01435301a203acb4
Component: engine
2014-02-24 13:58:12 -08:00
Solomon Hykes
1560c87c83
Engine: tiny cosmetic fix
...
To make @creack happy :)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 0469e7d0622add573f2f9c357564ff0076db9346
Component: engine
2014-02-24 12:31:39 -08:00
Solomon Hykes
0070aebcd1
Engine: add tests for ParseJob()
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: d985fd49843b31b227b46d5ed71914002e2e0de9
Component: engine
2014-02-24 12:31:39 -08:00
Solomon Hykes
171ee11139
Engine: builtin command 'commands' returns a list of registered commands
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: cd846ecb60ad936d58d70762ed91cffa906cef93
Component: engine
2014-02-24 12:29:49 -08:00
Solomon Hykes
32c3efbd4e
Engine: cleanup side effects between tests
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 62b21daded2ea9b703a6e5fa0479e007016b1edb
Component: engine
2014-02-24 12:29:39 -08:00
Solomon Hykes
e69a84baec
Engine: clearer job error reporting
...
* Job.Error and Job.Errorf always print a newline.
* Avoid redundant prefixing of error messages.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 8a1778301bffaf46abbce5cb76c1add47bd241a0
Component: engine
2014-02-24 11:53:56 -08:00
Solomon Hykes
f14c0fd180
Engine.ParseJob: create a new job from a shell-like text command.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 2019a73f0387af273be3b6e085fdae0e5a67ba3b
Component: engine
2014-02-24 11:38:13 -08:00
Solomon Hykes
d029fb179f
Fix engine tests on systems where temp directories are symlinked.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 353cc8c2a5d9ae4c02dc94e14cd2ad6d3393992d
Component: engine
2014-02-15 14:39:51 -08:00
Victor Vieux
9365dcaac9
add setSubEnv and getSubEnv
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 8fbdb7b59eba078bf24546686e005cc86a60e493
Component: engine
2014-01-31 04:01:46 +00:00
Victor Vieux
b237b19a08
job.error\* now return engine.StatusErr
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 24086fa75dff1ebb56dfb8fbf2c80fdfd5be0e8a
Component: engine
2014-01-31 04:01:46 +00:00
Victor Vieux
f6edb78234
use exists
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 1498cd4e0540c73546a4847948f7d6a75b596178
Component: engine
2014-01-31 02:21:59 +00:00
Victor Vieux
c57257cc3c
changed default value of getenvint to 0. fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 28b5ae8cc4492f7b3cc2eb2b30b0f41713822b25
Component: engine
2014-01-31 02:06:08 +00:00
Victor Vieux
c7071fbcda
fix convertion issues
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 187646127fa80a5ba39a53619b410eb2a13f0ffd
Component: engine
2014-01-30 00:56:42 +00:00
Victor Vieux
b7a9dba025
Move containers to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 5ea2986ce5cfce1b86fdc92610dbc6d670691168
Component: engine
2014-01-24 16:07:42 -08:00
Victor Vieux
32ee8c9560
fix error handling
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: f41e0cf0485eac21d65c1af19a732b350292d200
Component: engine
2014-01-24 14:59:46 -08:00
Victor Vieux
336aee840a
remove useless flush method
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 35641f0ec7ecae16f88ba9affe0aeea0ae864874
Component: engine
2014-01-24 14:46:31 -08:00
Victor Vieux
0b480b0b5d
fix flush
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 90e9a2d85a6c981b137df0c22c31d6f32f4b6f66
Component: engine
2014-01-24 14:46:31 -08:00
Victor Vieux
10c689f549
move pull and import to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 9dcbdbc4b1addb67c0fdcadab1c8f98f30e58b4c
Component: engine
2014-01-24 14:46:31 -08:00
Victor Vieux
c491c97966
remove useless anonymous field mentions
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 42e35ecff36fcb07e45c19f880af84f8532a3fac
Component: engine
2014-01-23 16:20:51 -08:00
Victor Vieux
a82c275068
don't user os.Stderr in attach
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e7a9d236402363b402df43f25624a4e7e049f40f
Component: engine
2014-01-22 15:54:22 -08:00
Victor Vieux
2a860faf85
switch back to the valid json format
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e3461bc8d694fa4b104a9cdd08e11de26a04d923
Component: engine
2014-01-21 15:06:23 -08:00
Victor Vieux
1de8e12295
clean up test log
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 8cbabf2c3e24b6fc0f676a8696133742622f7249
Component: engine
2014-01-16 16:07:42 -08:00
Victor Vieux
547b5e1700
move attach to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e1d8543c7889c1bf456641fa1ee5f676820076b6
Component: engine
2014-01-15 17:11:44 -08:00
Victor Vieux
9b65fcb5fa
use the same 'Used' method as before
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: a33bc3018bf091725b7faca9a6039a07b6fd0ca7
Component: engine
2014-01-15 14:52:58 -08:00