a3e0fa246c
Add container name validation test
...
Upstream-commit: c06ab5f9c237a647120b9b3cc433e094676fe75a
Component: engine
2013-12-17 20:19:23 -05:00
bc4bacc415
Merge pull request #3168 from discordianfish/2464-replace-lxc-ps
...
Reimplement lxc-ps
Upstream-commit: d9a1cc7e2beb9a8956ed97328a945868db107f52
Component: engine
2013-12-17 09:06:52 -08:00
0617d7b95b
Merge pull request #3230 from crosbymichael/allow-untag
...
Allow untag operations with no container validation
Upstream-commit: 47375ddf54bdc3eedd460e0385cfe03c468edcf0
Component: engine
2013-12-16 14:34:56 -08:00
8986c6ae1a
Allow untag operations with no container validation
...
Upstream-commit: 62213ee314d0669a278fae1e3052329f4ca35f75
Component: engine
2013-12-16 13:29:43 -08:00
e18bf01fe0
Merge pull request #3099 from vieux/fix_pull_build
...
added authConfig to docker build
Upstream-commit: b3ad3307829dc4601cb996be3d6d8cfa37e71c79
Component: engine
2013-12-16 10:53:10 -08:00
6dc8caeed5
Fix and re-enable TestGetContainersTop
...
Upstream-commit: 5cfcb05486d9b45e347324d92350799ab05c65c8
Component: engine
2013-12-16 16:01:55 +01:00
3e3c1af9cc
add GetenvInt64 ans SetenvInt64
...
Upstream-commit: 85b9338205da0c8f1d62f277db342cf4b9feaf13
Component: engine
2013-12-13 16:29:22 -08:00
77daf141f4
move docker info to the job api
...
Upstream-commit: 51e2c1794b50295607c6eddb29edf39d40816a88
Component: engine
2013-12-13 16:15:15 -08:00
f8c4f98d81
use args
...
Upstream-commit: 4b5ceb0f24285718620465bb4073269d6fb8097b
Component: engine
2013-12-13 14:29:27 -08:00
3eb9010924
move commit to job
...
Upstream-commit: 930ec9f52ceceabcb72589ac7f20e1e8bbccbed5
Component: engine
2013-12-13 14:19:56 -08:00
3c2d9ba7fe
Merge pull request #3175 from vieux/engine-job-stop
...
Move stop to job
Upstream-commit: aaa1c48d243e693b29bc52e382e3c37637c8bc3c
Component: engine
2013-12-13 14:15:58 -08:00
5570b7b013
Merge pull request #3185 from vieux/job_tag
...
Move tag to job
Upstream-commit: 8224e13bd25a41c3e3d8755edd3a754cd060adee
Component: engine
2013-12-12 17:02:39 -08:00
07befa45fc
move tag to job
...
Upstream-commit: e43ff2f6f2630f971c9494aed285f1d410e42df9
Component: engine
2013-12-12 11:52:11 -08:00
8ac6f87f86
Merge pull request #3145 from vieux/fix_docker_images
...
multiple fixed in docker images
Upstream-commit: 5b33ae5971ae1071ba377ec1761956a05bf7b21e
Component: engine
2013-12-12 11:17:19 -08:00
c49a4958ea
move t from arg to env
...
Upstream-commit: 6ba456ff87cfe2687db7df896e2983636ca9fe1e
Component: engine
2013-12-11 15:36:50 -08:00
342605f90e
Engine: new command 'stop' gracefully stops a container.
...
Upstream-commit: dbe1915fee1beb034459fb875928c96e27ecbfce
Component: engine
2013-12-11 11:52:59 -08:00
5cde259caa
Merge pull request #2735 from shykes/engine-job-kill
...
New engine command: 'kill'
Upstream-commit: 5fd3c8204de3a8188097add6a75ca70536e1375a
Component: engine
2013-12-11 10:35:57 -08:00
8644761a3b
Merge pull request #3119 from shykes/engine-version
...
Port 'docker version' to the engine API
Upstream-commit: 09d2c2351c4b016d57f979990698838a94173ec4
Component: engine
2013-12-09 17:35:44 -08:00
4ef02ca4a1
fix size in -tree
...
Upstream-commit: c618a906a4a50b4cc76e9230f971d737a59b8c27
Component: engine
2013-12-09 17:27:05 -08:00
47be100499
refactor and fix tests
...
Upstream-commit: 8291f00a0e656cf3bb52fb1dcdff7c266305f4d5
Component: engine
2013-12-09 16:25:19 -08:00
707fb0bfad
Port 'docker version' to the engine API
...
Upstream-commit: de35b346d17ef86ef091e1736575c60c41fc3771
Component: engine
2013-12-08 07:41:53 +00:00
d007e15eed
New engine command: 'wait'
...
Upstream-commit: 3569d080afc721a1eb04ad4a65f1309b53da1238
Component: engine
2013-12-06 23:05:21 +00:00
1b6ebfe317
Hack: use new 'kill' command in integration tests
...
Upstream-commit: 2546a2c645c59d094bc2c09dc9eb0d8eb5c36786
Component: engine
2013-12-06 23:02:27 +00:00
8c54ea502c
Enable engine to take Stderr and Stdout for mocking in tests
...
Upstream-commit: 25d3db048e761ee2c61a2cc8d58196786616988b
Component: engine
2013-12-06 01:18:18 -08:00
629f490217
Merge pull request #3074 from crosbymichael/dm-history-calc
...
Save layersize on pull
Upstream-commit: ef157cee30795229d781c6b91dafded75c3e96c0
Component: engine
2013-12-05 14:13:03 -08:00
18b9488ee1
Save layersize on pull
...
Do not display size and virtual size on the cli.
Only display virtual size on the cli
Upstream-commit: 697707e4afe6f1e7e5e33c24ada2f1f2af279142
Component: engine
2013-12-05 14:03:23 -08:00
7dfca4d041
Merge pull request #3057 from crosbymichael/test-cpu-share
...
Move test cpu shares out of test start
Upstream-commit: 797bac2344b17e1fe0ea2c629c12f0ab90907013
Component: engine
2013-12-05 13:58:01 -08:00
3f773fbd23
Merge pull request #2966 from andrewsmedina/govet2
...
fixed some `go vet` issues.
Upstream-commit: 5f55c1aee1a6acdce35f5d7be776104d66e44483
Component: engine
2013-12-04 17:57:10 -08:00
f84d85cd37
Move test cpu shares out of test start
...
Fixes #2107
Upstream-commit: 0d1506adb30ecd56f5e413c3ff376a1acfbe3697
Component: engine
2013-12-04 16:31:09 -08:00
7e8e4fe649
Ensure that the init layer is removed with the container
...
Upstream-commit: 5976c26c1e7bc7b29489250b8100412ea3d27b60
Component: engine
2013-12-03 09:44:48 -08:00
eade1687a5
Fix unit test with new buildfile prototype
...
Upstream-commit: 98ed1dc433e423b93ae0619c5a2c474ccec1454d
Component: engine
2013-12-02 12:51:37 -08:00
8118fea381
Merge pull request #2775 from daniel-garcia/2671-bindmount_files
...
fixes #2671 , add support for bind mounting individual files in to contai...
Upstream-commit: d6cdbca6c118a1022f6cb4cd5e260a01aa342009
Component: engine
2013-12-02 09:30:08 -08:00
85e4b81e0c
Make docker build return exit code of build step
...
If a command during build fails, `docker build` now returns with
the exit code of that command.
This makes it necessary to change the build api endpoint to
return a json object stream.
Upstream-commit: b04c6466cdc89a107879af7a22b0917006b38730
Component: engine
2013-12-02 17:52:37 +01:00
3d5cd2c032
Merge pull request #2781 from shykes/engine-status-int
...
Engine: integer status, better streaming, lots of tests
Upstream-commit: 2dac7b5209d1b7926889c8ecc04ec984fc73865f
Component: engine
2013-11-29 17:57:28 -08:00
26d7cf1b0c
fixed some go vet issues.
...
Upstream-commit: a6c9a332d040a98c5cf4325491fc8d9aa7e5475b
Component: engine
2013-11-29 22:53:20 -02:00
b0f24a88da
Engine: integer job status, improved stream API
...
* Jobs return an integer status instead of a string
* Status convention mimics unix process execution: 0=success, 1=generic error, 127="no such command"
* Stdout and Stderr support multiple thread-safe data receivers and ring buffer filtering
Upstream-commit: a4f8a2494b0fb755db52c68cf61ddc8ff52d2965
Component: engine
2013-11-30 00:25:46 +00:00
94c476ace9
go fmt.
...
result of `gofmt -w -s .` without vendors.
Upstream-commit: fe72f15e4ab25cc6e96c76d2da2c379569756843
Component: engine
2013-11-29 22:20:59 -02:00
1f411096dd
Add unit test to check bind / server side
...
Upstream-commit: ab35aef6b5b15c7c2d7aff4315025563b93ee379
Component: engine
2013-11-29 13:43:37 -08:00
a0f64049ec
Merge branch 'master' into fix_tests
...
Upstream-commit: bb284ce59d661d9ec6e8dc9fd5b8fe21b588484b
Component: engine
2013-11-29 13:17:36 -08:00
ccfe71909e
Reduce the timeout for restart/stop
...
Upstream-commit: 34353e782e1cdbd6aae078b3e660875e703d35ff
Component: engine
2013-11-29 11:08:01 -08:00
2135aa6aca
Fix behavior of tty tests
...
Upstream-commit: 86c00be180f1e6831ca426576a55f5106f156448
Component: engine
2013-11-29 10:17:25 -08:00
90e04ec65d
Remove an unit test from integrations test
...
Upstream-commit: 2ec1146679598837cd8bab62dc672bcda2a9610c
Component: engine
2013-11-29 10:17:04 -08:00
30abdabd65
Fix TestAttachDetachTruncatedID (behavior + tty issue)
...
Upstream-commit: 2e6a958612d65a0665a9396372fe82706987d085
Component: engine
2013-11-29 10:03:36 -08:00
e107dad484
Create helper function for tests
...
Upstream-commit: 697be6aaa009cd2bea5f07ae0b0780703e6565e1
Component: engine
2013-11-29 10:02:22 -08:00
4a151bb6e6
Actually test the detach (was not the case before)
...
Upstream-commit: 63d6cbe3e4d6f29c2491b0f1f505ef79b7191d8e
Component: engine
2013-11-29 09:11:20 -08:00
eab6c90e20
Make the PTY in raw mode before assert test (TestAttachDetach)
...
Upstream-commit: 67e9e0e11bb932ef9113ac91b2c1b0af6ee4db6d
Component: engine
2013-11-29 08:29:56 -08:00
9f9072c9ad
Make sure the container is running before testing against it (TestAttachDetach)
...
Upstream-commit: e535f544c7bc9c32b23e5505110a5513ff36be5a
Component: engine
2013-11-29 07:39:51 -08:00
34e8bb0db2
Merge pull request #2692 from SvenDowideit/add-specific-feedback-for-bad-ADD
...
Add specific feedback for ADD outside context
Upstream-commit: 926f7b579e48dcd5bda26bcd7a0ef0e25aed94da
Component: engine
2013-11-28 17:55:11 -08:00
014494a3f4
Make race condition more obvious by performing more asserts
...
Upstream-commit: ad43d88af5bda8dc5b3d06f64de380bb985191ba
Component: engine
2013-11-28 16:12:45 -08:00
8a3d9c6cf3
Fix a race condition in the integration tests
...
Upstream-commit: 23022932440006aca0a954763bf8e3a5882f94d3
Component: engine
2013-11-26 05:28:00 +00:00
