d25b9e78b6
Fixes docker events since beginning of unix time
...
Fixes issue #11555
Applied a workaround to check if since and until flags are valid or not.
Signed-off-by: André Martins <martins@noironetworks.com >
Upstream-commit: 8f7ac20bacfa6964ea830bfc6dfd4fc8c66bc9c3
Component: engine
2015-04-01 18:14:59 +01:00
e8ab23fa21
Increase timeout on TestRunOOMExitCode test
...
I can never get it to work for me when its just 3 seconds.
With this change it generates the OOM message around 17 seconds, but
I increased the timeout to 30 for people with slower machines
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 8d1455d88b66011713da67098dc3464b897af9cd
Component: engine
2015-03-31 16:57:43 -07:00
1541e9c937
Merge pull request #11934 from cpuguy83/fix_volume_symlink_check
...
Fix volume symlink check
Upstream-commit: 749a117267c4c0f74b0162af9ed42c3307737dde
Component: engine
2015-03-31 13:56:23 -07:00
d0e4d6404c
Merge pull request #11473 from pradeepchhetri/docker-wait-cli-integration-test
...
Added basic integration tests for docker wait command
Upstream-commit: a381a1bb0385c9f499025f632413bf6a9abc3f43
Component: engine
2015-03-31 13:23:23 -07:00
419d6ae6f9
Use getResourcePath instead
...
Also cleans up tests to not shell out for file creation.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 63708dca8a633d68f9342eebd4f7a616e8c48234
Component: engine
2015-03-31 15:10:30 -04:00
0fa6cf44f7
Merge pull request #11896 from vdemeester/9998-cp
...
Docker cp handles resolv.conf, hostname & hosts, fixes #9998
Upstream-commit: b6d6ffa1dd7172ba6e5f2eb8adf1626a6ee47a01
Component: engine
2015-03-30 13:15:00 -07:00
6052094333
Verify MaximumRetryCount=0 if the restart policy is always.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: f5310f403da573e28477e142e5f70efe0045b323
Component: engine
2015-03-30 09:08:33 +08:00
82aa49d3e7
Docker cp handles resolv.conf, hostname & hosts, fixes #9998
...
Add a integration test TestCpSpecialFiles
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8bc330d8632ef0129b433b877a5e2fc88bb2eb39
Component: engine
2015-03-29 22:10:14 +02:00
3cecae722e
Fix create volume in a directory which is a symbolic link
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 7583b491250beac9caeeac13b7b68c4e0f03eb60
Component: engine
2015-03-29 13:35:36 +08:00
0544f5e034
Fix error from daemon no such image even when the image exist
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 013fb87543a47524efba3c371a1d22afe151287c
Component: engine
2015-03-28 09:07:20 +08:00
3495bd3522
Merge pull request #11848 from duglin/CleanupIntTests
...
Clean up integration-cli tests
Upstream-commit: 240f3e14c78f34102672b121a43b612989856d0d
Component: engine
2015-03-27 14:11:56 -07:00
98bfac2331
Merge pull request #11842 from brahmaroutu/events_tests
...
Events tests
Upstream-commit: 8c58bdd3a7d5aff31c446dfd6044c6e0d8afa7fb
Component: engine
2015-03-27 13:45:11 -07:00
4f989f959c
Use common code to test all events, when using filter that expect all lifecycle events.
...
Addresses: #10654
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: f5ad895ba624b6baddfa0c54a2da439b41b0535f
Component: engine
2015-03-27 02:47:46 +00:00
5897cb3c81
Clean up integration-cli tests
...
My AR couldn't take it any more:
- one logDone per test
- PASSED lines don't wrap
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 9a9d23dbc40c9b650bd1f9f98a421b7ff2312f36
Component: engine
2015-03-26 17:25:50 -07:00
0913f2905d
Changed snake case naming to camelCase
...
Signed-off-by: Peter Choi <phkchoi89@gmail.com >
Upstream-commit: ae907e7af16136225417242ef5d55d3f6062fb3b
Component: engine
2015-03-26 15:05:45 -06:00
dbb27bd9c9
Added integration tests for docker wait command
...
Signed-off-by: Pradeep Chhetri <pradeep@indix.com >
Upstream-commit: 1401b8fe0da7e4cd5ee8a1774c2352c6183be10b
Component: engine
2015-03-27 01:24:11 +05:30
0b6cf588fa
Merge pull request #11791 from moo-mou/11768-vetwarning
...
Fix vet warning
Upstream-commit: a196cc943ccb02a857c8509b6badb12e8e2071ac
Component: engine
2015-03-26 10:52:07 -07:00
d4e188856d
Fix TestBuildResourceConstraintsAreUsed Cpuset test
...
Set cpuset to "0" so that it works on single core machines.
W/o this (and set to "1") we'll see something like this error
when running:
System error: write /cgroup/cpuset/docker/66689499bbd08cd8dccc9b7bfd1d6b34e85d73ce8c84d3c69b5e91944322da60/docker/79d7c548b58c85c4cfad6cd01eb7c3b30db254d1014c496137edd93ddc528a6f/cpuset.cpus: invalid argument"
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 389d0ae45327926a9d20b2a3e6c15499f3c9c570
Component: engine
2015-03-26 07:31:39 -07:00
35acd2c3eb
Add fixes for integration-cli tests w/ --net none
...
Adds network to integration tests that were failing without network.
Fixes #10964
Fixes #10968
Signed-off-by: Jake Champlin <jake.champlin.27@gmail.com >
Upstream-commit: c2fe26243906ad2641876e877d23a419bb4bdb75
Component: engine
2015-03-25 23:46:04 -04:00
8f2d65bf21
Fix vet warning
...
Signed-off-by: Paul Mou <ppymou@gmail.com >
Upstream-commit: c5bf2145f172a264d3d8fc63d6717826b95b5ee2
Component: engine
2015-03-25 20:31:02 -07:00
24a2c3a692
Merge pull request #11751 from tiborvass/revert-validate-spaces
...
Revert "Dealing with trailing whitespaces"
Upstream-commit: a0cfe83435e5f62fc8de4f18b5120332bbfa37c2
Component: engine
2015-03-25 13:01:58 -04:00
23d80e7ccb
Merge pull request #11729 from icecrime/11048_carry
...
Carry #11048
Upstream-commit: 5f7e142c46574c473a3b9e9dee4ef3e956b6c645
Component: engine
2015-03-25 09:27:07 -07:00
abd71318ca
Revert "Dealing with trailing whitespaces"
...
The validation script from #10681 is too pedantic, and does not handle
well situations like:
```
cat <<EOF # or <<-EOF
Whether the leading whitespace is stripped out or not by bash
it should still be considered as valid.
EOF
```
This reverts commit 4e65c1c319afffc325853b88c9aef0c42ec83482.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 0252ad0adc37a34b88fa908ae74a13b940febdcb
Component: engine
2015-03-25 10:04:56 -06:00
8e0111a19d
Merge pull request #11737 from duglin/FixTestOutput
...
TestBuildCancelationKillsSleep sends exec cmd to stdout
Upstream-commit: f08e9f44a9d27dfd3780e8c3d89b0236f7672688
Component: engine
2015-03-25 08:45:09 -07:00
944966da9a
fix 2 integration tests on lxc
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: c959d26d2f413fa93b60174c4e19111eff0a845d
Component: engine
2015-03-24 21:12:16 -07:00
5e050af7a5
TestBuildCancelationKillsSleep send exec cmd to stdout
...
and makes the testing output ugly.
This hides the output since it not used.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: fbd47969a86793c4e87e2da1abea1f806ba0a526
Component: engine
2015-03-24 20:56:26 -07:00
11fbf94cfd
Revert all but TestPullImageFromCentralRegistry changes
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 8900ae2928cea8f4b5d52ff68253cad2504edd6c
Component: engine
2015-03-24 16:27:35 -07:00
d5ac91b394
Merge pull request #11716 from LK4D4/root_in_run
...
Use /var/run/docker as root for execdriver
Upstream-commit: f3fc857e018dc919fddfea645b8308379343cb4e
Component: engine
2015-03-24 14:58:30 -07:00
a6001c7df9
Use /var/run/docker as root for execdriver
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 1e788ec9855058913de6ac8a2be7acee0f001954
Component: engine
2015-03-24 10:47:30 -07:00
1e47557825
Refactor pkg/common, Fixes #11599
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: b80fae735684406d848b16a0f148a746e17ed25f
Component: engine
2015-03-24 18:19:59 +01:00
7074731d32
Merge pull request #11636 from robertabbott/refactor_networkfs
...
Refactor pkg/networkfs
Upstream-commit: d5eea4e8b04074b709d1bbe19b5336504df44446
Component: engine
2015-03-23 16:58:29 -07:00
19aa69e7d8
Merge pull request #11667 from icecrime/integration-cli_image_cleanup
...
Cleanup "hello-world" image in build tests
Upstream-commit: 4e3c72a026f356508c3f530a15aa2dc09bcb27c9
Component: engine
2015-03-23 16:42:46 -07:00
925b84807a
Merge pull request #11657 from GeorgeMac/cleanup-redundant-else
...
#11602 - Cleanup redundant else statements find via golint
Upstream-commit: 92f9e2d3955fcc3341407809c9db33ac702e1508
Component: engine
2015-03-23 18:27:29 -05:00
92fbf90d6e
Fix the TestPullImageFromCentralRegistry to skip and add local v1 registry test when net=none
...
Closes #10966
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 5d70a97b1fff8286220d2bef9ceb248401f046d1
Component: engine
2015-03-23 22:53:04 +00:00
d10460e7af
Merge pull request #11570 from runcom/9658-consistent-autoremove
...
Remove container if --rm flag is passed and container cannot be started
Upstream-commit: 197a3f0a98bbedc1253df3fae42837769871beb1
Component: engine
2015-03-23 15:38:51 -07:00
293d14edd7
Merge pull request #11264 from brahmaroutu/fixtest_10967
...
Test image api through local V1 repo, skip network test.
Upstream-commit: 3b4ff1c132669017f04d3b2e67517ff0c9a1a3df
Component: engine
2015-03-23 15:20:39 -07:00
b27a399633
Cleanup "hello-world" image in build tests
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: bfc748221b15a0f6e42a6ab520ed6e31fa9e90c8
Component: engine
2015-03-23 15:16:13 -07:00
0221549820
Cleanup redundant else statements find via golint #11602
...
Signed-off-by: George MacRorie <gmacr31@gmail.com >
Upstream-commit: 664ef0cbe2113e8307135e656cc6db9199f8268e
Component: engine
2015-03-23 20:40:29 +00:00
9b9105b3b2
Remove hardcoded error
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 8b02d85e1728b48729b2fb8553b2ec4b56a30d37
Component: engine
2015-03-23 20:58:16 +01:00
69bd180001
Merge pull request #10431 from duglin/Issue10391
...
Clarify ENV non-recursivenes w.r.t. env var substitution + fix escaping
Upstream-commit: 61966d281bb715a2359b27bcd30d0d59c98d2812
Component: engine
2015-03-23 13:30:11 -05:00
7dfdb9ea11
Merge pull request #11573 from icecrime/11572-restore_pull_test
...
Restore TestPullVerified test
Upstream-commit: 85ab3c3b49f902a3e0837e52ab3ce8fdfa2c8e5b
Component: engine
2015-03-23 11:21:16 -07:00
2ae5f5eb68
Merge pull request #10365 from cpuguy83/9981_fix_cannot_overwrite_nonbind_as_bind
...
Allow path from normal volume existing to overwrite in start Binds
Upstream-commit: 1fe55b2f8bc966c0784527b30f507cbc90325df7
Component: engine
2015-03-23 10:43:02 -07:00
2ed910fd38
Merge pull request #11406 from MabinGo/CmdStart_fix
...
Fix hanging up problem when start and attach multiple containers at once
Upstream-commit: bd952021613b26b7d8b8d078adda72d9ff6def00
Component: engine
2015-03-23 10:17:50 -07:00
950464de97
Merge pull request #11395 from mitchcapper/master
...
Change windows default permissions to 755 not 711, read access for all p...
Upstream-commit: 56acb1aac87c489674b708d0d2b2128fa7944f66
Component: engine
2015-03-23 09:59:40 -07:00
31ae66ceae
Test image api through local V1 repo
...
Closes #10967
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 5daa9260bcef2a47c493adc04e6638c9d200a9cf
Component: engine
2015-03-23 16:45:48 +00:00
2d5a6d9e9b
Remove container if --rm flag is passed and container cannot be started
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: d124197cc726a3b69cc3cde8c4d560f3f0e1af9c
Component: engine
2015-03-23 13:03:31 +01:00
4b8e196164
Refactor pkg/networkfs
...
Solves #11591
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com >
Upstream-commit: a91b2431a303f919b0737d95639d8e445124cb23
Component: engine
2015-03-22 23:53:47 -07:00
a1d0fa6752
Fix hanging up problem when start and attach multiple containers
...
Signed-off-by: Mabin <bin.ma@huawei.com >
Upstream-commit: 7dc1af146d24c346ac74c9dcb1df98f9ef51339d
Component: engine
2015-03-23 12:10:22 +08:00
9dcfa784ef
Merge pull request #11538 from duglin/EmptyVolume
...
Check volume path to make sure its not the empty string
Upstream-commit: ded0ada9b47ab48b57d14225ec663e3756faff7f
Component: engine
2015-03-22 19:25:50 -07:00
088f0e2cb3
Merge pull request #9774 from pwaller/cancellation
...
Add basic build cancellation
Upstream-commit: 45ee402a631a59e2a33df7b2f63a49f6f3f84f09
Component: engine
2015-03-22 19:16:23 -07:00
