2df1795660
Update test for /sys mounting
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 677d76cd4aadf7514a3ba4e6761880fc3817f573
Component: engine
2015-05-13 15:02:53 -07:00
b9cea2b317
Merge pull request #13155 from coolljt0725/fix_validate_tag_name
...
Fix validate tag name. Fix #13149
Upstream-commit: 3da0013ac4c12cacc36dfb8746ed6403e358256f
Component: engine
2015-05-13 12:03:22 -07:00
c6760c3f88
Merge pull request #13174 from ahmetalpbalkan/TestLogsSince
...
integ-cli: Fix race in TestLogsSince
Upstream-commit: 1b678f86b37e836e6f6cf1f58f18fde36672bfce
Component: engine
2015-05-13 11:35:17 -07:00
28e112fb4d
Merge pull request #13183 from runcom/fix-typo-tests-grouping
...
Fix typo to run tests grouped by RunUnprivileged
Upstream-commit: ebe9a854869d1b5470e67e3657a62432e36680a3
Component: engine
2015-05-13 11:33:14 -07:00
0ea0631fe7
Fix typo to run tests grouped by RunUnprivileged
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: a36f6a140bb7987c18a8177115cbc315672f9e53
Component: engine
2015-05-13 14:24:54 +02:00
5be78509f7
integcli: change Dettach to Detach
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: fdec5197f145a1aa18329337746f6a94389da0a1
Component: engine
2015-05-13 12:49:19 +03:00
9babc5a64f
Fix invalid tag name
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: e00cfbb6f2b953301bfcd7270e9bdfde1a2d17c7
Component: engine
2015-05-13 14:28:52 +08:00
af27a9480d
Merge pull request #13106 from duglin/HumanizeCliErrors
...
Use stderr instead of logrus for CLI error messages
Upstream-commit: 56847ec4d4c24535bd8f4763e895f609eec9e8cf
Component: engine
2015-05-13 05:23:56 +02:00
276b0e4ce0
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 >
Upstream-commit: 2fe2f7a1864068e7d268833bb40536064f69b8aa
Component: engine
2015-05-13 02:59:11 +00:00
d58b604612
Merge pull request #11965 from duglin/DEBUG
...
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
Upstream-commit: 36d995a291c672205d1e8f93f19fb07de253c3d7
Component: engine
2015-05-12 18:24:04 -07:00
2e83148ffd
Use stderr instead of logrus for CLI error messages
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 0024935f641ab596732f9162d3eab795bbc2ae06
Component: engine
2015-05-12 17:22:41 -07:00
fe20784d8c
Merge pull request #13040 from cpuguy83/13014_fix_goroutine_leak_on_logs_follow
...
Make sure log pipes are closed
Upstream-commit: 37cb2a15bf05f8d0b12423230f57998e90d5d8a2
Component: engine
2015-05-12 13:52:49 -07:00
ac35a75674
Merge pull request #13160 from runcom/remove-api-codepath-less-than-1-12
...
Remove API codepaths < 1.12
Upstream-commit: f35038dfba2bae0f2183a0caa366e8d7cb959220
Component: engine
2015-05-12 13:08:36 -07:00
b33908cc47
Merge pull request #13105 from duglin/FixRunOutput
...
Fix RUN err msg (again)
Upstream-commit: 73387bf15a3f3a35192cb78aefa5c32e1569cb5c
Component: engine
2015-05-12 11:36:55 -07:00
4a0ddadbc0
Remove API codepaths < 1.12
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 7284b08204fb85838170bdf82e2c379e1a4713c9
Component: engine
2015-05-12 20:09:49 +02:00
792a1ace8a
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 >
Upstream-commit: e3ba3dd5b828307c3970d0036b019eca405e4a2c
Component: engine
2015-05-12 13:50:51 -04:00
b60e82567d
Merge pull request #12362 from ahmetalpbalkan/logs/since
...
Add --since argument to docker logs cmd
Upstream-commit: d0459abe6e29548c6df045483f08797840620b0a
Component: engine
2015-05-12 09:40:16 -04:00
84543fc3ec
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
Upstream-commit: 8cc93856e37f045060cce5345e28421514ba7833
Component: engine
2015-05-11 13:18:29 -07:00
60d5f903de
Allow links to be specified with only the name if this matches the alias
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c6e6223ed735b4ff6a15f5d5716376d765f60b09
Component: engine
2015-05-11 21:50:47 +02:00
365c18080f
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 >
Upstream-commit: cb9a6b9aed1577bb5590300125d05d9b1c201c16
Component: engine
2015-05-10 20:42:14 +00:00
52da2e9683
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 >
Upstream-commit: 006c066b6ce0b8b16f7d68b0ef997717bfb35662
Component: engine
2015-05-09 09:22:30 -07:00
104194a4ef
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 >
Upstream-commit: dd4693f67cb0ce5dc14c87ddf2a9a9f6a3406763
Component: engine
2015-05-09 05:56:10 -07:00
560ba9b809
add cpu.cfs_period_us support
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: dccb8b5c339e218222bae4ce74bbeccb9e020c82
Component: engine
2015-05-09 10:02:46 +08:00
450b717836
Merge pull request #13069 from runcom/dry-run-test
...
API tests - Container create with Hostname, Domainname and Network
Upstream-commit: af9dac9627e7b04a803df152cc24f0db073ea17a
Component: engine
2015-05-07 22:07:41 -04:00
7ea0137fad
fix lxc because it doesnt have the hardened libcontainer stuff
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 52118df432353dee2a37dd284462c4c021174a50
Component: engine
2015-05-07 17:40:37 -07:00
92cec4b2c1
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
Upstream-commit: 6b6a26c7697978bf7d43fec11d14ef6ee7e3e4d6
Component: engine
2015-05-07 17:13:32 -07:00
5c2686119c
Merge pull request #11802 from hqhq/hq_add_blkio_weight
...
add blkio.weight support
Upstream-commit: de32f5c431bbdb56d6a446af0e5660fae9539bd8
Component: engine
2015-05-07 17:10:39 -07:00
9fb1f7589d
Merge pull request #12175 from dqminh/fix-allocate-port
...
#12148 : sort ports mapping before allocating
Upstream-commit: e03ac8d5b98f525c3d32bb5a6ac84b2c5717a0dc
Component: engine
2015-05-07 17:04:20 -07:00
f08d29d6d6
Merge pull request #12278 from duglin/12267-Wildcards
...
Fix for Daemon crashing when wildcards are used for COPY/ADD
Upstream-commit: d0bc0153c637f0e61207fa90b0346174cd5e92e3
Component: engine
2015-05-07 17:01:16 -07:00
0af54ca869
Merge pull request #12952 from sunyuan3/trunc
...
Verify the no-trunc option for the search operation
Upstream-commit: 0ed20135904b079a1ff8505c3247cf7ca158f826
Component: engine
2015-05-07 16:52:46 -07:00
20e9b6f15f
Merge pull request #12961 from hqhq/hq_remove_err_out
...
a few cleanups for client output
Upstream-commit: 372977148dffe11bc0fee395dfd85dc86a558999
Component: engine
2015-05-07 16:51:56 -07:00
fd731a59d6
Merge pull request #13076 from LK4D4/fix_api_daemon_order
...
Fix api servers creation and daemon start order
Upstream-commit: b4e894236792e830b6df45f3444ff6800e571ae4
Component: engine
2015-05-07 16:23:44 -07:00
149aebf1ee
bump version back to 1.7.0-dev
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 2c2f6fd2728067a5d3ab6ea393d8b5593de4bc0c
Component: engine
2015-05-07 15:42:36 -07:00
6da49015e7
Fix api servers creation and daemon start order
...
* daemon creation wasn't parallel to request buffering
* it was possible that empty volume will be created in
/var/run/docker.sock by some container
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 08230703fdd0f7bcd9a87a0d61d88fdf2b901e66
Component: engine
2015-05-07 15:38:02 -07:00
ac6f208e83
Allow libcontainer to eval symlink destination
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Add tests for mounting into /proc and /sys
These two locations should be prohibited from mounting volumes into
those destinations.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: f25bbedc85e8a99c1389dbe8f48436907ce24526
Component: engine
2015-05-07 14:43:39 -07:00
c87ab46f22
Mask reads from timer_stats and latency_stats
...
These files in /proc should not be able to be read as well
as written to.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: a7a51306b1459a67da3a9cbbe8c9f80d3950c084
Component: engine
2015-05-07 14:42:23 -07:00
54739fa6d1
Mount RO for timer_stats and latency_stats in proc
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 27ae108b4eda48a621afc5bf2157ef11c314a858
Component: engine
2015-05-07 14:42:23 -07:00
50f626562d
Prevent write access to /proc/asound
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Conflicts:
integration-cli/docker_cli_run_test.go
Upstream-commit: d87da59c79eabb794087f731d3ad51ea98f7a3cc
Component: engine
2015-05-07 14:42:23 -07:00
2ee6387cbc
Merge pull request #12165 from icecrime/optional_userland_proxy
...
Optional userland proxy
Upstream-commit: 74bfa3675353aaf10ca760e82a79d758bea0ff6b
Component: engine
2015-05-07 14:01:16 -07:00
217a680718
Test Cases for API - Container create with Hostname, DomainName and NetworkMode
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com >
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 80d73c838a279a3354713b56687e0c3f90c1efff
Component: engine
2015-05-07 21:03:39 +02:00
b9064ad316
Merge pull request #12822 from brahmaroutu/container_stop_api
...
restapi stop fails if ?t=int not present
Upstream-commit: d78755d15972fd1d3115d9927932f82bc09483df
Component: engine
2015-05-07 09:38:59 -07:00
e580063058
Restapi for stop fails if ?t=int not present
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 68e9c07850c95ded1e0a8adda39a8efe68e1c0ee
Component: engine
2015-05-07 15:43:50 +00:00
4f3515319b
add blkio.weight support
...
We can use this to control block IO weight of a container.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: f133f11a7d25e6262558dd733afaa95ddd1c7aee
Component: engine
2015-05-07 11:55:58 +08:00
e90b34218e
Do not check and return strconv.Atoi error in api container restart, regression
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 74121a42118750e560e772a3fee33e9d7bd903d0
Component: engine
2015-05-07 01:49:16 +02:00
51100e4c20
Merge pull request #13033 from icecrime/12715_carry
...
Logs with follow=1 immediately send HTTP response
Upstream-commit: 4b4adae41c33da727b2d6be97f2257e169841ff8
Component: engine
2015-05-06 15:42:48 -07:00
c2f0a6e87e
Logs with follow=1 immediately send HTTP response
...
Signed-off-by: Anthony Baire <Anthony.Baire@irisa.fr >
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 589de35651ce8c91a2f01be2a5c99274d548d9ae
Component: engine
2015-05-06 14:39:45 -07:00
3ae1ad9fa9
Merge pull request #12878 from cpuguy83/move_chunked_encoding_test_to_from_integration
...
Move ChunkedEncoding from integration
Upstream-commit: 10f4bf514d8d03a02a3c63698baa47b538773dcc
Component: engine
2015-05-06 13:59:13 -07:00
797d0589a2
Merge pull request #12999 from duglin/BadRUNerrMsg
...
Fix RUN's error msg when it fails
Upstream-commit: f9b20ad9e4fa7e7e200105b617ebcdedf38e8adf
Component: engine
2015-05-06 15:49:24 -04:00
b0726ee2a6
Merge pull request #13017 from cpuguy83/12859_fix_lxc_wait_exitcodes
...
Fix LXC stop signals
Upstream-commit: 71c1a7ea7f28a4e4bf3412af228524a28226ebeb
Component: engine
2015-05-06 11:21:44 -07:00
61793a6050
Move ChunkedEncoding from integration
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7c574b9e9d62f14c8d73ea358a557a771dcd8d4d
Component: engine
2015-05-06 13:00:17 -04:00
