aca4ae8c90
Merge pull request #13280 from runcom/test-clean-from-inspect
...
Clean tests from not needed inspect call
2015-05-18 11:06:18 -07:00
a268e36719
Clean tests from not needed inspect call
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-16 18:12:54 +02:00
b5e932a3bf
Merge pull request #13237 from ahmetalpbalkan/tag/event
...
Introduce daemon event 'tag' upon image tagging
2015-05-16 09:05:03 -07:00
35b4ed4d17
Remove dead code of integration-cli/utils.go
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-05-16 16:49:55 +08:00
1630ed97ac
Introduce daemon event 'tag' upon image tagging
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-05-15 20:21:59 +00:00
0db7365c66
Merge pull request #13221 from duglin/ReenableDebug
...
add link between -D and --log-level=debug back in
2015-05-15 11:45:44 -07:00
5d2ef30a38
Merge pull request #13251 from cpuguy83/13233_fix_log_follow_goroutine_check
...
Extend sleep/timeout for ngoroutine check
2015-05-15 08:57:25 -07:00
f207322c0a
Extend sleep/timeout for ngoroutine check
...
In cases where this is failing it's ok to have the test take extra time,
but we don't want it to fail because of some race/performance
differences between systems.
So make the timeout go to 30s and double the sleep time in between
checks so it's not pounding the daemon quite so fast.
Originally I couldn't make this test fail (pre-change), but changed
graphdrivers and saw a failure pretty quickly.
This change seems to smooth that out.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-15 09:54:43 -04:00
e4855eebf2
Merge pull request #13188 from ahmetalpbalkan/inputs-standard-rfc3339
...
Parse input timestamps with standard RFC3339
2015-05-14 16:49:01 -07:00
b2ad9314a2
Merge pull request #13196 from crosbymichael/update-libocntainer-may13
...
Update libcontainer to a37b2a4f152e2a1c9de596f54c0
2015-05-14 10:49:25 -07:00
a85ca8b7c4
add link between -D and --log-level=debug back in
...
Due to popular demand :-)
See #11965
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-14 10:29:49 -07:00
fe6f77df2c
Merge pull request #13087 from duglin/FixNatTest
...
Fix random errors in DockerSuite.TestNetworkNat
2015-05-14 08:35:27 -07:00
ac81cd1fc3
Merge pull request #13202 from duglin/ImportFix
...
Fix a regression in `docker import` on error from URL
2015-05-14 10:36:50 -04:00
3f4926e49b
Fix a regression in `docker import` on error from URL
...
when the daemon can't download the image from a `docker import` the
error message was lost due to 'err' being redefined with a block by
mistake. This removes the ":" from "... err := " which fixes it.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-14 06:56:52 -07:00
999f464feb
Parse input timestamps with standard RFC3339
...
Fix for #13175 .
This change allows user-input timestamps (e.g. to `docker events
--since/--until` or `docker logs --since` to be parsed using
standard RFC3339Nano layout in Go instead of the layout that parses
all timestamps into fixed-length strings (currently buggy).
User inputs need not to be complying to the internal format
(`RFC3339NanoFixed`) anyway.
Added test case for `events --since/--until` with all possible
timestamp input formats.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-05-14 07:44:42 +00:00
ed25742002
Merge pull request #12667 from ibuildthecloud/host-uts
...
Add --uts=host to allow sharing the UTS namespace
2015-05-13 18:30:32 -07:00
f2e5207fc9
Add --uts=host to allow sharing the UTS namespace
...
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-05-13 17:56:32 -07:00
b37abf2528
Merge pull request #13146 from rajdeepd/dry-run-test-1
...
Modified Test Case to include check for Memory and MemorySwap
2015-05-14 01:10:35 +02:00
64ea54c0ed
Merge pull request #13154 from coolljt0725/typo_remove_redundant_dot
...
Minor typo: remove redundant dot in error message in runconfig/parse.go
2015-05-13 15:24:01 -07:00
677d76cd4a
Update test for /sys mounting
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-05-13 15:02:53 -07:00
1eea2c589d
Modified Test Case to include check for Memory and MemorySwap
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
2015-05-13 13:39:07 -07:00
3da0013ac4
Merge pull request #13155 from coolljt0725/fix_validate_tag_name
...
Fix validate tag name. Fix #13149
2015-05-13 12:03:22 -07:00
1b678f86b3
Merge pull request #13174 from ahmetalpbalkan/TestLogsSince
...
integ-cli: Fix race in TestLogsSince
2015-05-13 11:35:17 -07:00
ebe9a85486
Merge pull request #13183 from runcom/fix-typo-tests-grouping
...
Fix typo to run tests grouped by RunUnprivileged
2015-05-13 11:33:14 -07:00
a36f6a140b
Fix typo to run tests grouped by RunUnprivileged
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-13 14:24:54 +02:00
fdec5197f1
integcli: change Dettach to Detach
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-05-13 12:49:19 +03:00
e00cfbb6f2
Fix invalid tag name
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-05-13 14:28:52 +08:00
56847ec4d4
Merge pull request #13106 from duglin/HumanizeCliErrors
...
Use stderr instead of logrus for CLI error messages
2015-05-13 05:23:56 +02:00
c6dad07b1b
Minor typo: remove redundant dot in error message in runconfig/parse.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-05-13 11:04:07 +08:00
2fe2f7a186
integ-cli: Fix race in TestLogsSince
...
TestLogsSince used to rely on time synchronization and precision of
the timestamps. This change provides a less flaky alternative.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-05-13 02:59:11 +00:00
36d995a291
Merge pull request #11965 from duglin/DEBUG
...
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
2015-05-12 18:24:04 -07:00
0024935f64
Use stderr instead of logrus for CLI error messages
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-12 17:22:41 -07:00
37cb2a15bf
Merge pull request #13040 from cpuguy83/13014_fix_goroutine_leak_on_logs_follow
...
Make sure log pipes are closed
2015-05-12 13:52:49 -07:00
f35038dfba
Merge pull request #13160 from runcom/remove-api-codepath-less-than-1-12
...
Remove API codepaths < 1.12
2015-05-12 13:08:36 -07:00
73387bf15a
Merge pull request #13105 from duglin/FixRunOutput
...
Fix RUN err msg (again)
2015-05-12 11:36:55 -07:00
7284b08204
Remove API codepaths < 1.12
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-12 20:09:49 +02:00
e3ba3dd5b8
Make sure log pipes are closed
...
Pipes are still not closed (and goroutines leaked) if neither pipe is
used.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-12 13:50:51 -04:00
d0459abe6e
Merge pull request #12362 from ahmetalpbalkan/logs/since
...
Add --since argument to docker logs cmd
2015-05-12 09:40:16 -04:00
8cc93856e3
Merge pull request #13074 from runcom/11824-short-link-if-equals-alias
...
Allow links to be specified with only the name if it matches the alias
2015-05-11 13:18:29 -07:00
c6e6223ed7
Allow links to be specified with only the name if this matches the alias
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-05-11 21:50:47 +02:00
cb9a6b9aed
Add --since argument to docker logs cmd
...
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.
Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-05-10 20:42:14 +00:00
006c066b6c
Fix RUN err msg (again)
...
Previous fix used %q which incorrectly go-escaped things. For example:
```
RUN echoo A \& B C
```
would result in the user seeing:
```
INFO[0000] The command '/bin/sh -c echoo A \\& B\tC' returned a non-zero code: 127
```
Note the double-\ and the \t instead of a tab character
The testcase had to double escape things due to logrus getting in the way
but I'm going to fix that in another PR because its a change to the UX.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-09 09:22:30 -07:00
dd4693f67c
Add missing "ok" on "common ok" idiom in test util
...
w/o this the "ok" we're checking is from the previous type assertion.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-09 05:56:10 -07:00
dccb8b5c33
add cpu.cfs_period_us support
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-05-09 10:02:46 +08:00
769df832a3
Fix random errors in DockerSuite.TestNetworkNat
...
I believe this was failing because 'nc' wouldn't show the data
it received sometimes. So intead of looking for that data we now
look for the output of the echo that comes after the nc command
successfully runs
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-05-08 10:59:26 -07:00
af9dac9627
Merge pull request #13069 from runcom/dry-run-test
...
API tests - Container create with Hostname, Domainname and Network
2015-05-07 22:07:41 -04:00
52118df432
fix lxc because it doesnt have the hardened libcontainer stuff
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-05-07 17:40:37 -07:00
6b6a26c769
Merge pull request #11516 from coolljt0725/add_show_error_set_some_flag_in_container_netmode
...
add support --net=container with --mac-address, --add-host error out
2015-05-07 17:13:32 -07:00
de32f5c431
Merge pull request #11802 from hqhq/hq_add_blkio_weight
...
add blkio.weight support
2015-05-07 17:10:39 -07:00
e03ac8d5b9
Merge pull request #12175 from dqminh/fix-allocate-port
...
#12148 : sort ports mapping before allocating
2015-05-07 17:04:20 -07:00
Michael Crosby
Antonio Murdaca
Alexander Morozov
Hu Keping
Ahmet Alp Balkan
Brian Goff
David Calavera
Doug Davis
Sebastiaan van Stijn
Darren Shepherd
Antonio Murdaca
Rajdeep Dua
Jessie Frazelle
unclejack
Lei Jitang
Ma Shimiao
Jessica Frazelle