p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,514 Commits 2 Branches 295 Tags
f37e910c9fd01b1444eab31aecfecea8a161f1dd
Commit Graph

128 Commits

Author SHA1 Message Date
Jessica Frazelle
c55ffb34ca fix for iptables cleanup 8307 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: e171eda9989cb5d10e7fe14b258f239edb124541
Component: engine
 2014-10-29 10:59:20 -07:00
Alexandr Morozov
06bafa7589 Use common logging in engine 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: b3b40433451d8e76d02dc70d591027f680c9a3bf
Component: engine
 2014-10-24 15:03:24 -07:00
Alexandr Morozov
a4666e24dd Merge pull request #8238 from vbatts/vbatts-daemon_timestamps 
daemon logging: unifying output and timestamps
Upstream-commit: cb106e74a14a37157b09459965a69c944f9c19f0
Component: engine
 2014-10-16 15:55:49 -07:00
Doug Davis
56d2073a6d Fix error paring null JSON - Issue7941 
Closes #7941

Treat a null in JSON, when reading the config of a container, as if the
property was never included.  W/o this fix the null would be saved in the
property as a string with a value of "null".

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: a7cd25b8b69fe23c6458f5242dcd9f9039c99f48
Component: engine
 2014-09-28 19:51:00 -07:00
Vincent Batts
50457aefd5 daemon logging: unifying output and timestamps 
A little refactor of the ./pkg/log so engine can have a logger instance

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 92df943fbf225d78b160babb36e9c6fd38cdc0d0
Component: engine
 2014-09-26 14:44:46 -04:00
Vishnu Kannan
8b57e6f159 Adding docker exec support in CLI. 
Fixed a bug in daemon that resulted in accessing of a closed pipe.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: c786a8ee5e9db8f5f609cf8721bd1e1513fb0043
Component: engine
 2014-09-16 19:24:25 +00:00
Vincent Batts
6556d7f015 engine.Env: comments and tests for Get() 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 6e0bc06018b28ac46689708343b8dd57cae772c2
Component: engine
 2014-09-10 22:20:49 -04:00
unclejack
e9ab736d16 move some io related utils to pkg/ioutils 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 76212635b594d4472dd8d5b2e071fac416addbe7
Component: engine
 2014-09-03 11:36:21 +03:00
Tibor Vass
f1ec175d76 Merge pull request #7800 from djbk/master 
Cleanup: Typo in job.go
Upstream-commit: 426fbee81001cadd1231903fb7219121616fe814
Component: engine
 2014-09-02 17:47:18 -07:00
Byung Kang
475881edb2 Cleanup: Typo in job.go 
Signed-off-by: Byung Kang <byungk91@gmail.com>
Upstream-commit: cc84ec3f6182a7af9ef881939305cf1ac13a383a
Component: engine
 2014-09-02 19:37:14 -05:00
Alexandr Morozov
cc2787ae0d Some more style fixes 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 114838cbda38f4808d3a7a0d40b33d2ee445d158
Component: engine
 2014-08-29 15:21:28 +04:00
Rajdeep Dua
fd70e8abe8 Added Test case for Engine shutdown 
Docker-DCO-1.1-Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com> (github: rajdeepd)
Upstream-commit: 0800f8cc19732a41d8f04aaf42427399557afa54
Component: engine
 2014-08-19 04:59:13 -07:00
Solomon Hykes
230d6c3581 Workaround to avoid 5 second delay on graceful daemon restart 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 6aecdb4f8e73031f0deeac88a88ffc3fad9d5377
Component: engine
 2014-08-13 21:40:25 +00:00
Solomon Hykes
a74b20717e Engine.Shutdown only waits 5 seconds for active jobs to complete 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: eb79dc14fe45f3805d83e5e5e64b335da6389d6a
Component: engine
 2014-08-06 17:56:12 +00:00
Solomon Hykes
145b9864d4 Remove unused field from engine.Job 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 92105ea0fa774607ea4c7f487aedfd22eb5598bc
Component: engine
 2014-08-06 17:56:12 +00:00
Solomon Hykes
f56c09a5b4 Extra testing for engine.Shutdown 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 61eab759397a0915a0dd69de399d49d2a0ed0ba6
Component: engine
 2014-08-06 17:56:12 +00:00
Solomon Hykes
d8f9865870 Subsystems can register cleanup handlers with Engine.OnShutdown 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: d745067487fe2a750cfa2625ed7f652a56abc17c
Component: engine
 2014-08-06 17:56:11 +00:00
Victor Vieux
6ae4c9014c update go import path and libcontainer 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
 2014-07-24 22:19:50 +00:00
LK4D4
5281f733c2 Change floats to ints recursively on env encoding 
Fixes #6246
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1d3d1c5d2b762a32fbee348702af96f9c00fff83
Component: engine
 2014-06-24 23:39:26 +00:00
LK4D4
a93d5dc92d Benchmarks for engine/env 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 01b424028ed0ab7d673c7ae2221457ae12304557
Component: engine
 2014-06-24 21:48:16 +04:00
LK4D4
172faefd3c Fix go vet errors 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: f08cd445b0d2e44a4977a3bd0dca0a1cd4e76d2f
Component: engine
 2014-06-18 17:39:57 +00:00
Victor Vieux
99dc4301cc remove unused beam, will be back later as libchan 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 384b60b940e07d37c1ff544168a2407513114d80
Component: engine
 2014-06-11 19:09:55 +00:00
Solomon Hykes
0311fdd2c0 pkg/testutils: utility functions to facilitate writing Go tests 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: ca231b3de52f718d96c0ff6e7af40c7c0fade623
Component: engine
 2014-06-01 23:23:31 +00:00
Solomon Hykes
24c85b9176 Merge pull request #5706 from vieux/remove_add_string 
Upstream-commit: 8d213e91b3ef0ed77d43ec20d378be01dfe7ed5c
Component: engine
 2014-05-14 17:31:52 -07:00
Solomon Hykes
69200e5e03 Engine: Receiver and Sender preserve Job.Env 
When sending a new job to a `engine.Sender`, the corresponding
`engine.Receiver` will receive that job with its environment preserved.
Previously the job name, arguments and streams were preserved but the
env was lost.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: a1754c7e46b321c2a079fc5186984a847aa50218
Component: engine
 2014-05-09 17:10:33 -07:00
Solomon Hykes
371479ab9f Engine: Env.MultiMap, Env.InitMultiMap: import/export to other formats 
* `Env.MultiMap` returns the contents of an Env as `map[string][]string`
* `Env.InitMultiMap` initializes the contents of an Env from a `map[string][]string`

This makes it easier to import and export an Env to other formats
(specifically `beam/data` messages)

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: c7978c98097b92b659e2ea1763cd134b0695407e
Component: engine
 2014-05-09 17:06:32 -07:00
Solomon Hykes
9cb18397df Engine: ensure all pipes are properly closed by Receiver and Sender 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)

[michael@docker.com: fix stdin closing in engine.Job.Run]
[michael@docker.com: fix fd leak in engine.Receiver.Run]
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)

Docker-Tested-By: Solomon Hykes <solomon@docker.com>
Docker-Tested-by: Michael Crosby <michael@docker.com>
Upstream-commit: d61190169de27bc58f1fe4a8f49b37bd2294d489
Component: engine
 2014-05-09 16:12:21 -07:00
Solomon Hykes
1b604a326b Engine: slightly more stress-testing of Receiver/Sender to reproduce the hang problem 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: bf25951837440286fb185f97f7c9cfda11962cab
Component: engine
 2014-05-09 15:49:44 -07:00
Solomon Hykes
4cfcc681e6 Engine: fix a timeout bug in Sender/Receiver 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: dfdc03b061d5bd5a7557f077b500304d4da26d2e
Component: engine
 2014-05-09 15:49:44 -07:00
Solomon Hykes
c3352a3b6c Fix stdin handling in engine.Sender and engine.Receiver 
This introduces a superficial change to the Beam API:

* `beam.SendPipe` is renamed to the more accurate `beam.SendRPipe`
* `beam.SendWPipe` is introduced as a mirror to `SendRPipe`

There is no other change in the beam API.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 0aeff69e5900a15e3872494ac0009600f6c1c372
Component: engine
 2014-05-09 15:39:55 -07:00
Victor Vieux
1e0b101a68 Merge pull request #5686 from crosbymichael/cast-to-closer 
Cast Input and Output to io.Closer
Upstream-commit: 0f6fe22833213cc09ffc39f9584dcd3ce10ac9fa
Component: engine
 2014-05-09 11:17:53 -07:00
Victor Vieux
cc0e75c911 remove addString and replace Tail 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: e304e3a6624e740159e99e83d6d13f0a3cdfeb49
Component: engine
 2014-05-09 18:09:59 +00:00
Michael Crosby
0d11cb3ece Cast Input and Output to closer 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 170e4d2e19258c4e45b975177618640cb554c32b
Component: engine
 2014-05-08 12:57:19 -07:00
Bryan Murphy
e6d82972c8 move Table to a separate file and add additional unit tests 
Docker-DCO-1.1-Signed-off-by: Bryan Murphy <bmurphy1976@gmail.com> (github: bmurphy1976)
Upstream-commit: fdccfaf72a614872aeeb79e9cee7f42abcaacf6d
Component: engine
 2014-05-08 02:31:23 +00:00
Solomon Hykes
e8fbf35f7c Engine: empty job names are illegal, catchall or not 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 3b73c26194836c1e2b737146a5b0c840226c65d2
Component: engine
 2014-05-02 15:25:33 -07:00
Solomon Hykes
8727b434c7 engine: catchall handler is shadowed by specific handlers 
This allows using `Engine.Register` and `Engine.RegisterCatchall` on the
same engine without the catchall hiding all other handlers.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: de75af9fe2d91df7297e498d320b496addfb52f4
Component: engine
 2014-05-02 15:25:32 -07:00
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