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
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
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
2a72640146
Always use the 'vfs' storage driver in integration tests. To test other drivers, we need a dedicated driver validation suite.
...
Upstream-commit: a93731374705188f1434001dd1deaf4af9c77fcd
Component: engine
2013-11-26 05:05:15 +00:00
21e81bd668
Move all graph tests into integration, because they now rely on the underlying graph driver, which currently cannot be mocked.
...
Upstream-commit: fb3d60f27adba32ab60022298702a4376c1f4d0d
Component: engine
2013-11-26 05:05:15 +00:00
2f447b8d32
add more searchable info to the error message when ADD tries to go outside the context
...
Upstream-commit: 96b5be9dd9606a9bfbf0fdbe98bcaf8b6e77e4b1
Component: engine
2013-11-23 12:23:31 +10:00
2e819ef8cf
fixes #2671 , add support for bind mounting individual files in to containers, rebases of #1757 #2301
...
Upstream-commit: 0198f8a879df8506189cf3024c4b64c9ea8f6aa6
Component: engine
2013-11-21 23:40:35 -06:00
cf914fd88c
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
image.go
Upstream-commit: 0cecc2a78c246a5b809954059650a4c22442e0d6
Component: engine
2013-11-21 17:18:41 -08:00
915356af08
Refactor State to be 100% thread safe
...
Upstream-commit: 33e70864a2c4321bf6968d6d521c159a1b72b220
Component: engine
2013-11-21 16:34:58 -08:00
cdb93a78ac
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
server.go
Upstream-commit: 2382a0f920f7473b2b2762d886470a417a5dbac7
Component: engine
2013-11-20 11:07:42 -08:00
eeb01414c6
Merge pull request #2747 from jpoimboe/test-fixes
...
Test fixes
Upstream-commit: 304a80fcd5ed6d3a73db6b7e73ab5e5ac5e9462d
Component: engine
2013-11-20 10:07:40 -08:00
e7eec12a53
Fix unit-tests
...
Upstream-commit: 12e993549df025d072add1a0bcb9bfcc7fe5bdb5
Component: engine
2013-11-19 15:24:14 -08:00
b6950e3878
Merge branch 'master' into creack-merge-master
...
Conflicts:
api_params.go
graph.go
graph_test.go
image.go
integration/api_test.go
integration/container_test.go
integration/runtime_test.go
runtime.go
Upstream-commit: 28d4cbbc59e419f00c1ad75991b106241933ca5d
Component: engine
2013-11-19 14:58:12 -08:00
c4cad6571f
test: remove extra args in TestExitCode
...
The extra blank argument isn't needed and confuses libvirt.
Upstream-commit: 4b80ec9aae2f43e831de64f3746c7838252e9203
Component: engine
2013-11-18 15:07:11 -06:00
ef3400502c
test: fix TestRmi race condition
...
Upstream-commit: fef41ef7bf83ed04c7df8e0247e60c0d495eefdc
Component: engine
2013-11-18 15:07:06 -06:00
00d1972d8e
Merge pull request #2752 from dotcloud/gofmt_test
...
Go fmt tests
Upstream-commit: 4546832507694fc675fe1604b219de25d454cd35
Component: engine
2013-11-18 11:34:59 -08:00
e0cb0011ff
gofmt_test
...
Upstream-commit: ed8f75d25ca0fb46d8c06bfe74bbc386bf4e8a8f
Component: engine
2013-11-18 11:25:13 -08:00
6c91c91066
More informative error message on name collisions
...
This is the proposed fix for #2506 . It provides a more complete message
with regards to name collisions including informing of the opposing
containers ID.
I have included a test to ensure that the correct short id is displayed
to make the message easier to understand.
Upstream-commit: 3c67a2849337f3b9bd92dd389f0e02e48a36028b
Component: engine
2013-11-18 17:51:47 +00:00
0c60a3c3a0
test: 2 second timeout (not 2000)
...
Upstream-commit: fe302fbfd26fc7db5d751d4bec8a0bd4ce6030a4
Component: engine
2013-11-18 10:23:30 -06:00
b0f8db9d1b
test: skip TestCreate on Fedora due to lxc utils bug
...
In the dind environment running on a Fedora host, the lxc utils get
confused by the /sys/fs/cgroup/cpuacct,cpu cgroup mount and lxc-start
fails trying to access the wrong cgroup directory.
Upstream-commit: 72d02ecdde2ba6f39739a0a942f2c4a057b4d45f
Component: engine
2013-11-18 10:23:30 -06:00
4527e73586
test: fix TestCreateStartRestartStopStartKillRm
...
cat needs stdin opened, otherwise it dies immediately.
Upstream-commit: baa687bed2f1f9ee6e44c70d95baad8757ac529c
Component: engine
2013-11-18 10:23:30 -06:00
ed492661bb
test: put each arg in a separate string
...
Each arg to docker run should be placed in a separate string.
Otherwise, when starting the command via exec.Cmd, the command is
interpreted as "echo test", which can't be found.
Upstream-commit: 30ea0bebce340dfc257b5b45835234cb921f3a48
Component: engine
2013-11-18 10:23:06 -06:00
25c99ca04e
Re-enable api integration tests using only public remote API.
...
Upstream-commit: afe230718ead8cb1d1053a7132a034f0bd55b424
Component: engine
2013-11-16 02:12:14 +00:00
