ab2c20ea99
Test on execdriver dir behavior
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 652cd6a842377ec55b53333c7ddc0fc50b587a99
Component: engine
2014-09-22 22:49:21 +04:00
788ec364da
Persistent directory for container in execdriver
...
This is needed for persistent namespaces
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 623ebf203bc4f4e6ddefdd494f201a1401ab72a6
Component: engine
2014-09-22 22:48:26 +04:00
ab7d3fd292
daemon/attach: avoid mem alloc for interface
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 950bfe419390bc0e5777ae70bd01f781ae61701a
Component: engine
2014-09-22 21:17:50 +03:00
680ee7cfce
Merge pull request #5956 from vbatts/vbatts-tarsum_hashes
...
tarsum: allow for generic hashes
Upstream-commit: 350b1cf6ea5681e26ea752e2e54ef6c9a04d91e0
Component: engine
2014-09-22 11:11:25 -07:00
dd63155260
Merge pull request #7942 from estesp/7747-stderr-stdout-bug
...
Fix gh#7747: filter bare newline output and log client pull to stdout
Upstream-commit: 28e308c25ed431da14bf010df8a9beca05b32018
Component: engine
2014-09-22 10:53:34 -07:00
e9760e60ca
Merge pull request #8109 from unclejack/avoid_jsonlog_alloc
...
daemon/logs: avoid JSONLog struct alloc in loop
Upstream-commit: ac758359312783c123b5173ceb84a6e703b73485
Component: engine
2014-09-22 12:53:31 -04:00
901086a5c9
integcli: pull scratch for pull test
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 77d29847e2a59a7b3e56144c774c28a3b7370c91
Component: engine
2014-09-22 19:03:19 +03:00
73f9db0dca
daemon/logs: lower allocations in loop
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: d2c104c3a01217f1a860d23143672af74a32e93a
Component: engine
2014-09-22 18:57:28 +03:00
98789bf31d
pkg/jsonlog: avoid JSONLog allocation in loop
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 473bb5274ce7a520bc73ccb3529f99729a799062
Component: engine
2014-09-22 18:57:28 +03:00
3b7b455265
Merge pull request #8159 from LK4D4/fix_goroutine_leak_in_logs
...
Fix goroutine leak in logs following
Upstream-commit: 9c7d97561499b1fd92bef755ea485b6942e65a66
Component: engine
2014-09-22 11:16:48 -04:00
a6582123ef
Merge pull request #8164 from unclejack/fix_utils_race
...
integcli: fix race in runCommandWithStdoutStderr
Upstream-commit: 1df4255102d1a00df7d646561ce406959e92e4a5
Component: engine
2014-09-22 19:14:40 +04:00
18f1860b4a
integcli: fix race in runCommandWithStdoutStderr
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: c69896d8a013fca05ffee479e08605552715f901
Component: engine
2014-09-22 17:53:12 +03:00
0c49058cda
Merge pull request #8121 from bbinet/cleanup-hello-world-container
...
Automatically clean up hello-world container with --rm
Upstream-commit: 3c03506cc29fe60eb36dba24dd72dcf0c6185f68
Component: engine
2014-09-22 10:52:50 -04:00
eb02e608df
Merge pull request #6101 from LK4D4/ip_range_#4986
...
Implement allocating IPs from CIDR within bridge network
Upstream-commit: 9fb34ae5710faaadc730a7005f785cefc56eed4b
Component: engine
2014-09-22 17:09:16 +03:00
4420332c09
Merge pull request #8137 from jfrazelle/8135-event-log-die-start-fail
...
After container fails to start, log the event die.
Upstream-commit: 5ad82d3ea641a9cc569fc49853759bb98f043fa9
Component: engine
2014-09-22 12:47:04 +04:00
f5deb7d0f9
Close logs pipes and catch write errors
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: a7ee201ee85c95afb8556323d79e32cf9e2d8737
Component: engine
2014-09-22 10:55:46 +04:00
750e7b6a57
Change unused WriteCloser to Writer
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: fd3f2e175fa6ddb606d2c681ff86a97faccfebbd
Component: engine
2014-09-22 10:54:58 +04:00
3ebe7ce35b
Merge pull request #8124 from jyrkiput/patch-1
...
Fix detaching from attached container
Upstream-commit: 27226d47c17588c867f2c533b87977955f2ca66e
Component: engine
2014-09-22 09:28:10 +10:00
c2a971c0cd
Cleanup: Fix cli docs: Sorted command headers.
...
Signed-off-by: Andrey Petrov <andrey.petrov@shazow.net >
Upstream-commit: c5805c8772b2439ce9d8c7022bd8c8208648bc5b
Component: engine
2014-09-20 18:10:11 -07:00
d3a449f426
Merge pull request #7972 from cpuguy83/split_volumes_from_daemon
...
Split volumes out from daemon
Upstream-commit: e7a9662974ad12e1926599e64dca44aaf1a90145
Component: engine
2014-09-20 16:23:20 +04:00
3a9c8d29c9
This reduces the amount of logging in the integration tests
...
There were a new areas in the brige driver that did not need to have log
output. Those were removed. Also set the engine's logging to false
when running the integration tests.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 8a9e827216eb5db4fcbe67c3c638f9e85f4de9bf
Component: engine
2014-09-19 17:30:37 -07:00
b74caf4edc
After container fails to start, log the event die.
...
Fixes #8135 .
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: d64d55eca85232af721859a8cc6f20ff473ce94c
Component: engine
2014-09-19 16:06:49 -07:00
6ce5061aaf
Merge pull request #8139 from aluzzardi/fix-drone-integration-goenv
...
Fix drone integration
Upstream-commit: 11446d30f798c3568343b306cc74644d09a66e60
Component: engine
2014-09-19 16:05:52 -07:00
1ce355084d
Split volumes out from daemon
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 45407cf00af95b04dd2ff11ce330dd397bf1e095
Component: engine
2014-09-19 17:47:47 -05:00
05552c0632
Drone Config: Disable integration-cli/docker_cli_exec_test as it breaks.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 07cedaab8640a68c480cb90722cb08fcf0a2c043
Component: engine
2014-09-19 15:40:48 -07:00
f94b4ccad2
Drone Config: Use AUTO_GOPATH instead of hacking around.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 72fe4c8daa86158fef97dceb1bae6395c2b4e05e
Component: engine
2014-09-19 15:20:35 -07:00
0539887817
Merge pull request #8129 from vbatts/vbatts-archive_comments
...
archive: adding comment to exported functions
Upstream-commit: ba726d9148ee616f0ad069bff6c7732815beb6c6
Component: engine
2014-09-19 14:36:52 -07:00
69e9467696
Merge pull request #8130 from aluzzardi/f-drone-integration
...
Add drone.io configuration
Upstream-commit: 77193089d8b7dba9e3a045e9e58b65466f6a3c3a
Component: engine
2014-09-19 14:59:40 -06:00
cb5b85db40
Merge pull request #8133 from crosbymichael/update-libcontainer-sep7
...
Update libcontainer to 185328a42654f6dc9a41814e578
Upstream-commit: 7fafe170cfdf9ba96b6eabe03e06a53199d386db
Component: engine
2014-09-19 14:58:51 -04:00
6e1d9ca051
Merge pull request #8131 from unclejack/fix_perm_detection
...
integcli: fix permission detection for aufs
Upstream-commit: 63c8b8bf302d945d9e0dd974f2dbe55b78e59995
Component: engine
2014-09-19 11:55:56 -07:00
97ca9c8cb5
Merge pull request #8134 from LK4D4/prefix_naming_cli
...
Prefix naming integration-cli tests
Upstream-commit: a8e964ebb2873c76a4ed6bd44114449630b849a3
Component: engine
2014-09-19 11:54:04 -07:00
c085c947d2
Merge pull request #8118 from tiborvass/merge-8031
...
FIX 6613:launch docker fail with space named drive (squashed commits from 8031)
Upstream-commit: c41bc790986137f8f6dad97f7567a3371d0b0b3e
Component: engine
2014-09-19 11:44:43 -07:00
fee8abc42e
Update libcontainer to 185328a42654f6dc9a41814e578
...
Mac address support to the netlink pkg.
Cgroup performance and memory issues.
Netlink refactoring.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 2531fba389c8bd25ed1ec7bea38f0ee19c974a26
Component: engine
2014-09-19 11:21:44 -07:00
0766eee2fa
Use prefix naming for rmi tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 2e2422b0eb163829127692250973472456d0ed77
Component: engine
2014-09-19 22:11:54 +04:00
c622ad158e
Use prefix naming for rm tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: cc54b77fce1ab0d6bfa78947ee46ffdd104f21c5
Component: engine
2014-09-19 22:11:54 +04:00
4884c0c1a5
Use prefix naming for restart tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 1ddd013b194d7f551547bd2940a92ba3db72f95e
Component: engine
2014-09-19 22:11:54 +04:00
7983e51d5c
Use prefix naming for ps tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 00b82fcab6492a853958a3a5f43f95469a60e12f
Component: engine
2014-09-19 22:11:54 +04:00
2a20f56a59
Use prefix naming for port tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 6e8c9e7bee5319b1e324c72240ef9d7a77946135
Component: engine
2014-09-19 22:11:54 +04:00
0476801567
Use prefix naming for links tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: b6325907e9de4020381ad1d016614f819da58cc6
Component: engine
2014-09-19 22:11:54 +04:00
d8c88456d9
Use prefix naming for create tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 27a27b73880c4e79d23b65c9032264a4a8fca1cd
Component: engine
2014-09-19 22:11:54 +04:00
6e01160f0a
Use prefix naming for build tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 66cd3640f16f5b91893dacd6de3f8c5ae55e2f2c
Component: engine
2014-09-19 22:11:50 +04:00
987f4f8cee
integcli: fix permission detection for aufs
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 1a0347ff1dd1035066b5faf86db0587491b5d638
Component: engine
2014-09-19 21:08:57 +03:00
32e1dc80f1
archive: adding comment to exported functions
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 0fe56ce1b97736c374d3d649d2df0a19f3b2884f
Component: engine
2014-09-19 14:02:12 -04:00
f32be6203d
Add drone.io configuration
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: ed072ed71dfbd3539d769fc2aa882f6029b7bc64
Component: engine
2014-09-19 11:00:28 -07:00
2941f9c6d5
Use prefix naming for attach tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: f312f784e18f3a0a087e615162c1e38b1bae8e51
Component: engine
2014-09-19 21:56:25 +04:00
1d842ff63a
Use prefix naming for inspect tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 3812a6a8466f639cfd538c05c3ff2730a70b1440
Component: engine
2014-09-19 21:56:25 +04:00
0103b6d058
Use prefix naming for events test
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 9720078f9e299f6b7207060599c322a58fc9b8b8
Component: engine
2014-09-19 21:56:25 +04:00
1390b58ea2
Use prefix naming for docker_cli_run_test.go
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: aa536b27a7897373384ab0335c44f44b0bb83455
Component: engine
2014-09-19 21:56:24 +04:00
93e967ece5
Add support for multiple level CLI commands
...
E.g. "docker groups create" will attempt to call the function
CmdGroupsCreate
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: e1b968f1981f21470a67ed617c36f1c6802bd0a7
Component: engine
2014-09-19 10:43:50 -07:00
bec783657b
Fix detaching from attached container
...
Text was copied from man-pages https://raw.githubusercontent.com/docker/docker/master/docs/man/docker-attach.1.md
Signed-off-by: Jyrki Puttonen <jyrkiput@gmail.com >
Upstream-commit: 1d2a1598c54d9ca8d3d02ec5e7b0231a8cf153d3
Component: engine
2014-09-19 19:34:05 +03:00
