Commit Graph

1156 Commits

Author SHA1 Message Date
c1570d1a97 Merge pull request #11980 from sunyuan3/TestSearchCmdOptions
add TestSearchCmdOptions case
Upstream-commit: 5019f35111cb7253f4cf94e48193dc757d81d6aa
Component: engine
2015-04-14 08:34:40 -07:00
53daac3bca add TestSearchCmdOptions case
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 77f2a4a0e373225c145966c96d076d6d9f25b3b3
Component: engine
2015-04-14 09:23:26 +08:00
fc9842cd3d Merge pull request #12353 from sunyuan3/duplicate
duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunni...
Upstream-commit: 00eddf5e6718bca6fd011014d0acfbf71a84ac2c
Component: engine
2015-04-13 17:48:53 -07:00
bb0567addc duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunningContainer
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: b85ade79d5a2cceb926fcae13997a6dfa28be4bc
Component: engine
2015-04-14 08:32:25 +08:00
ce3584d9d7 cleanup test wrong key.json leading to other failures
wait for container to be running before trying to kill it in daemon tests

Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 9a87553e4fc6c0abdd298893deefc44050208dda
Component: engine
2015-04-13 16:58:44 -07:00
6165959ea5 Merge pull request #12025 from coolljt0725/add_exec_with_user
Add docker exec run command as a different user and in privileged mode
Upstream-commit: 12f7db18309950785e873119edb03e0a1621e7a3
Component: engine
2015-04-13 13:50:51 -07:00
20c653370b Merge pull request #12222 from chenhanxiao/cp-support-colon
cp: add support for copy filename with ":"
Upstream-commit: 75b911eb3cb12e4c4d86fd42aa12bc71458f77b1
Component: engine
2015-04-13 13:09:12 -07:00
64a92fd92c Merge pull request #12262 from YanFeng-Adam/daemon
A wrong key.json would remain if the TestDaemonwithwrongkey case fails. The issue would lead to failure of other cases.
Upstream-commit: 6b40377c189e77bcaf688e2b6a6f628a6dfe6927
Component: engine
2015-04-13 16:00:20 -04:00
e120033d69 Merge pull request #12275 from LK4D4/pid_host_hell
Get process list after PID 1 dead
Upstream-commit: 05433a4dabeb7204d6925606549ba79022f506d6
Component: engine
2015-04-13 14:50:23 -04:00
97f1b60257 Merge pull request #12301 from ewindisch/https_links
Use HTTPS links for URLs in READMEs / comments / docs
Upstream-commit: 3509132a6e28caa18003298521c58746f490b57b
Component: engine
2015-04-13 14:30:53 -04:00
6c72e654c8 Merge pull request #12325 from hqhq/hq_fix_build_test
fix build test by adding --no-cache
Upstream-commit: 0e46cc9be49f741b873cf1016cfd66b258947ffb
Component: engine
2015-04-13 10:57:19 -07:00
ab385b72f9 Fix errors due changed sockRequest signature
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 27fccdbabb277e29488de88f9af2e7b83af93132
Component: engine
2015-04-13 10:30:07 -07:00
05674d127e Merge pull request #12320 from runcom/fix-api-resize-exec-resize
fix api server resize&execResize
Upstream-commit: 6f928be7ef7d8610875e860e72433dc2477b1c5d
Component: engine
2015-04-13 09:59:11 -07:00
416e9ff40b Merge pull request #12304 from runcom/remove-job-logs
Remove job from logs
Upstream-commit: bfb487dc50e3b88b520678a9118bfb95891140cb
Component: engine
2015-04-13 08:38:46 -07:00
0d56f45991 Fix typo in testcase
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 1567cf2cdf07bcbafbb1555fd950f5c5ce7a1c66
Component: engine
2015-04-13 23:09:07 +08:00
4ee5160b6e fix build test by adding --no-cache
Testcase TestBuildResourceConstraintsAreUsed run build without
--no-cache, so if you run this test twice, it will fail the
second time.
TESTFLAGS='-v -run ^TestBuildResourceConstraintsAreUsed$' ./hack/make.sh binary test-integration-cli
[PASSED]
TESTFLAGS='-v -run ^TestBuildResourceConstraintsAreUsed$' ./hack/make.sh binary test-integration-cli
[FAIL]
Because we'll use cID to inspect field and will get empty cID
if we have cache.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: c49cc1f2fbd3d0256455750c885eadcaa3d17937
Component: engine
2015-04-13 16:24:49 +08:00
83596c55e6 fix api server resize&execResize
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 3341f3a3554524f0f5e6114dfa0ed988713803ef
Component: engine
2015-04-13 08:42:12 +02:00
b3c5a7d38d Remove job from logs
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 91bfed604959c591a076c2e330cb3ded7443f504
Component: engine
2015-04-13 08:25:31 +02:00
0551904b7c Link to HTTPS URLs in engine comments
Updates most of the instances of HTTP urls in the engine's
comments. Does not account for any use in the code itself,
documentation, contrib, or project files.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: ca37301d54e1525d4522dea266180072d4fd892b
Component: engine
2015-04-11 13:31:34 -04:00
aaaa676179 Add docker exec run a command in privileged mode
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 72a500e9e5929b038816d8bd18d462a19e571c99
Component: engine
2015-04-11 11:26:37 +08:00
d1f2626097 Add -u|--user flag to docker exec for running command as a different user
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2cce4791b0e75201cb65daad07d4203d1c4c2996
Component: engine
2015-04-11 11:04:24 +08:00
d555f3e70e 'docker rmi -f IMAGE_ID' untag all names and delete the image
If an image has been tagged to multiple repos and tags, 'docker
rmi -f IMAGE_ID' will just untag one random repo instead of
untagging all and deleting the image. This patch implement
this. This commit is composed of:

        *untag all names and delete the image

        *add test to this feature

        *modify commandline/cli.md to explain this

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: 795a58fb44a2bd18ec37d78c82d75c025f786c50
Component: engine
2015-04-11 09:24:21 +08:00
5dd956e210 Get process list after PID 1 dead
Fix #11087

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ac8bd12b39d39a9361adc174bdff7837e771460d
Component: engine
2015-04-10 16:23:57 -07:00
65951704ad Merge pull request #12103 from sunyuan3/pause
add TestContainerApiPause case
Upstream-commit: 001a7e6babbc832cd07304c2c3ec2ed4b852abbd
Component: engine
2015-04-10 18:04:29 -04:00
847b362ddd Merge pull request #12250 from runcom/remove-job-wait
Remove job from wait
Upstream-commit: 96313f7ce0c10ab2d038d35066cf9134358afdc8
Component: engine
2015-04-10 16:27:59 -04:00
928371a2db Remove job from wait
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: db0ffba3b92aeda667501aaa10926943a7738f82
Component: engine
2015-04-10 20:17:02 +02:00
6adf3865a5 Rename TestStartSilentAttach to TestStartAttachSilent
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: e7a2e2bf7e5adbbed0443cc99ab728d5118b3b7b
Component: engine
2015-04-10 10:45:38 -07:00
10d36e87f8 A wrong key.json would remain if the TestDaemonwithwrongkey case fails. The issue would lead to failure of other cases.
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
Upstream-commit: bfc68d10ed778bc0c2e2caedb80b65bd961c76b0
Component: engine
2015-04-10 11:10:26 -04:00
613e921976 Merge pull request #12263 from chenhanxiao/typo-resize-test
api_resize_test: fix a typo
Upstream-commit: 5c8e28ec7c992149c3d60186a82d1abd4804b98e
Component: engine
2015-04-10 05:46:42 -07:00
7c9d740c01 api_resize_test: fix a typo
s/cintainer/container

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: 4ddc721f234ebb721b9540af3a9358da2f3e6e58
Component: engine
2015-04-10 03:09:26 -04:00
88ea73a6aa cp: add support for copy filename with ":"
We use ":" as separator CONTAINER:PATH.
This patch enables copy filename with ":"
to host.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: 50372973884d96ee115094336ed1952b1e71250a
Component: engine
2015-04-10 00:08:05 -04:00
5ed91523df Rebase + some fixes
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: fa2ace00a833492123f7db1e2f867f70bab89be4
Component: engine
2015-04-09 21:29:42 -04:00
807d6f107a Add comment column in docker history command output
Signed-off-by: David Young <yangboh@cn.ibm.com>
Upstream-commit: bf57339527f153b502a6443a495824a40768e39f
Component: engine
2015-04-09 21:29:41 -04:00
cbe9a536c0 add TestContainerApiPause case
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 8636a219911536123decb547dab9bf50ebb2c8f8
Component: engine
2015-04-10 09:14:01 +08:00
e7731ac431 Fix TestBuildCancelationKillsSleep to not fail on Windows
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: d38c90140b8330bd355c40a0c8d1e9bd2b3664ec
Component: engine
2015-04-09 21:03:19 +02:00
146dc925a6 Merge pull request #12115 from cpuguy83/fix_events_filter_test
Cleanup events filter by container test
Upstream-commit: b02cf5239eedc9cddac5a331c97183dc53c1e8ef
Component: engine
2015-04-09 11:40:08 -07:00
cb9c496f89 fix #12188 integration-cli: tests using "sleep" can timeout too early - change to "top" instead
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
Upstream-commit: 42d47c31367d288c7a9ae3acff635e995254469c
Component: engine
2015-04-09 10:46:57 -07:00
78df6ff4a0 Merge pull request #11895 from liusdu/m
show the right image name in job log and docker ps
Upstream-commit: 2b96bd0bb82ce2344c94485ef1d6c4d43416a187
Component: engine
2015-04-09 10:21:07 -07:00
c900c31960 Merge pull request #12184 from duglin/RemoveJobImages
Remove Job from `docker images`
Upstream-commit: 6ba7bf440ee1604486015f421456668d00e795a2
Component: engine
2015-04-09 09:19:09 -07:00
898650d746 Merge pull request #12231 from ahmetalpbalkan/integ-cli/TestInfoEnsureSucceeds-all-required
cli_info_test: Check all required fields
Upstream-commit: 74b5c7b284c2794999aef1fae4a63e447d4d28de
Component: engine
2015-04-09 09:07:54 -07:00
adca7cca6d fix up Image-name related issues in docker ps and CI
This patch include the following fixs:
 - fix image name error when docker ps
 - fix docker events test failure: use the exact image name for filter
 - fix docker build CI test failure due to "docker events" change

Because of change of daemon log behavior. Now we record
the exact Image name as you typed. So docker run -d busybux sh
and docker run -d busybox:latest are not the same in the log.
So it will affect the docker events. So change the related CI

Signed-off-by: Liu Hua <sdu.liu@huawei.com>
Upstream-commit: 645c020f5ab7119cd06d7c6a790e9d99fe1cd309
Component: engine
2015-04-09 23:03:23 +08:00
f3865d2e92 Cleanup events filter by container test
This also seemed to be checking the ordering of the events, which
doesn't seem like something we sould be interested in this particular
test.

Added check to make sure the filtered events have the expected ID's.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7e70998bb80d47e3f3a363fb49feaeaf50d64cbc
Component: engine
2015-04-09 09:47:58 -04:00
73ef4f0ecf cli_info_test: Check all required fields
`TestInfoEnsureSucceeds` is supposed to check existence of all
expected fields that are going to be shown in `docker info` command.

If this list was complete, it could have helped catching the missing
`"Logging Driver:"` regression.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 4c69d0dd8ade90b6602147b8dfb8c1f4c267d3bc
Component: engine
2015-04-09 04:01:39 -07:00
8bd8b0185d Remove Job from docker images
Also removes engine.Table

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: d045b9776b5dc16e12b3d7c7558a24cdc5d1aba7
Component: engine
2015-04-08 19:33:01 -07:00
0d1c1d0efa cleanup/fix integration-cli for overlay in overlay
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 255b84444a86201995d8f688d71b83822f146c3e
Component: engine
2015-04-08 16:59:36 -07:00
c65fa515f2 Merge pull request #12066 from LK4D4/split_events
Remove engine usage from events
Upstream-commit: 3ebfc99d1057d841c1cdd4f19e80fceea5ab380e
Component: engine
2015-04-08 08:29:24 -07:00
4c243c6e3e duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: cc30282e94546048a3957bdf360f99d4626e7d7c
Component: engine
2015-04-08 13:33:05 +08:00
2f18e59567 Test case for network mode chain container -> container -> host
Issue #12130

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ce69dafe4d0424ddb5df53d9aee7728f0734cce7
Component: engine
2015-04-07 15:20:42 -07:00
7753b7bbca Fix fail message in TestEventsImageImport
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 8fd2b52146b443dd464df5199d79c69047c81eea
Component: engine
2015-04-07 14:22:43 -07:00
15349ce580 Fixing fail message in TestRunDeviceDirectory
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: 05dcf261992ee2fe639977a9e063051cadaf1c50
Component: engine
2015-04-07 13:14:47 -07:00