Commit Graph

358 Commits

Author SHA1 Message Date
d851131502 Merge pull request #7994 from erikh/parser_fix_volume_parsing
builder: Fix handling of VOLUME command where multiple volumes are specified in a space delimited list.
Upstream-commit: d369612b416484301e172bfae3fc692e9c176faf
Component: engine
2014-09-25 12:45:48 -04:00
cdd6c2350b builder: Fix handling of VOLUME command where multiple volumes are
specified in a space delimited list.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: a5ca549a18fb5c1006005cc220ab330eec3018de
Component: engine
2014-09-25 09:44:19 -07:00
ad7640867a Merge pull request #8207 from LK4D4/rewrite_more_fixtures_test
Rewrite more fixtures test to not use fixtures.
Upstream-commit: a9368422081a6cbe8b0a77b506bd9684d61c7876
Component: engine
2014-09-24 15:07:03 -07:00
8f469a064b Merge pull request #8173 from crosbymichael/update-mem-limit
Update memory limit for container
Upstream-commit: f2fad5c2901240cb1b9e3e5747b0334a5b383978
Component: engine
2014-09-24 20:55:25 +03:00
32980488fe Rewrite TestContextTar tests to not use fixtures
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: d302d9296125d2c7abf4adf992fd6739a19d5fbd
Component: engine
2014-09-24 17:09:18 +04:00
ba92a9eabd Rewrite TestBuildWithInaccessibleFilesInContext to not use fixtures
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 51a56399f6384decee03a7e1aa56a3f46cb7c63f
Component: engine
2014-09-24 17:09:14 +04:00
beff003be9 Rewrite TestBuildRm to not use fixtures
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 52cf331206b9e50ba9b52f950b5a377179cf7aa5
Component: engine
2014-09-24 13:15:55 +04:00
a1e93ec56c Rewrite TestBuildHistory to not use fixtures
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: ab4738b49fa72b5ac1d5cc441f6e5bb4328a04c6
Component: engine
2014-09-24 12:38:48 +04:00
49a6b8858b Rewrite TestBuildForceRm to not use fixtures
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 1625cbfc4c02843ff0fbbf43bd46c13698609f2a
Component: engine
2014-09-24 12:29:27 +04:00
7f18ab2efd Merge pull request #7973 from LK4D4/persist_execdriver_dir
Persist execdriver dir
Upstream-commit: 827634d355bcbda3e75a05598022edf2262a2585
Component: engine
2014-09-23 16:01:03 -07:00
3c0e9292e2 Merge pull request #8186 from duglin/ErrInCopyCache
Make sure COPY/ADD on dirs doesn't grab too many files
Upstream-commit: 81a643211bbd88545d21550defc9cd7e3f8437bd
Component: engine
2014-09-23 15:16:57 -07:00
c65c43b413 Make sure COPY/ADD on dirs doesn't grab too many files
Add check for / first - per LK4D4's comment.
Add a comment to explain why we're adding a /

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: cd329d062bddaffcfea3ac0cd3245c0be5bf5542
Component: engine
2014-09-23 14:16:00 -07:00
e73a233371 builder: properly communicate onbuild trigger information during
subsequent builds.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 8edacc673a0ecb4320377457f0bf9dbdaa08f843
Component: engine
2014-09-23 13:55:51 -07:00
c9783e2c8a Merge pull request #8179 from erikh/parser_fix_cmd_null
Parser fix cmd null
Upstream-commit: 5ce7ee61efd1926ae601de8bd98544ba25c6d235
Component: engine
2014-09-23 13:42:55 -04:00
733cfbef1c Rewrite TestBuildAddWholeDirToRoot to not use fixtures
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 0c899cefdd2f1826d16bd979651003a9502888e9
Component: engine
2014-09-23 18:58:32 +04:00
02962cb6ce Rewrite TestBuildAddEtcToRoot to not use fixtures
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 570f1153b9b09fc8b23b86a15fd6f37c2f873a67
Component: engine
2014-09-23 18:58:28 +04:00
82b1f11dad Rewrite TestBuildAddDirContentToExistDir to not use fixtures
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: c58391bbd03a6dd71096fb2d7541e10fa9123e27
Component: engine
2014-09-23 15:15:58 +04:00
842da56368 Rewrite TestBuildAddDirContentToRoot to not use fixtures
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 2d802d7f23ad0d9f59abd8144f2bad094e338339
Component: engine
2014-09-23 15:15:58 +04:00
a1258eabee Rewrite TestAddSingleFileToNonExistDir to not use fixtures
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 139b6ed3aa81d5d3c6ceaacc5041afca4d39d75a
Component: engine
2014-09-23 15:15:58 +04:00
6826b77d3f Rewrite TestAddSingleFileToExistDir to not use fixtures
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 6bb44b6d7441d1a2b7136063a73c31c946be625f
Component: engine
2014-09-23 15:15:58 +04:00
1fda8e299f Rewrite TestAddSingleFileToWorkdir to not use fixtures
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 5e2ea69606850cf2da1c50ec4bc32c981999aafd
Component: engine
2014-09-23 15:15:58 +04:00
2e55c2075c Rewrite TestAddSingleFileToRoot to not use fixtures
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 682fbe0134180488c1a7f2b755b6bb9ae09e9448
Component: engine
2014-09-23 15:15:09 +04:00
08a3014c75 Rewrite TestBuildSixtySteps to not use fixtures
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 3824ec62e81d78db4dd36ffd64b17ef4c620b47f
Component: engine
2014-09-23 15:15:09 +04:00
ef9cb160c9 builder: integration-cli test for the previous commit.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: d1613e1d59d0a1e29feafe0537d12675dee24f39
Component: engine
2014-09-22 23:18:46 -07:00
ca46c61b42 Update memory limit for container
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 9b755412ab03816f0b7d6013618c65ae68781bcb
Component: engine
2014-09-22 21:41:14 +00:00
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
3afe5f7408 integcli: add & use dockerCmdWithTimeout & InDir
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: c6965e3e45cc1c46afc885c57e0e6b9a7769722c
Component: engine
2014-09-22 21:02:51 +03:00
cf1e3ce7c5 integcli: add util to fetch container status
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 5d1cb9d0051c5263e23f06ccb431481f8e5b3d57
Component: engine
2014-09-22 20:34:57 +03:00
5314f1d0ea integcli: consolidate cmd exit code processing
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 97b50e0f292847a8e3f166aa9386f3e51b1c5e95
Component: engine
2014-09-22 20:32:50 +03: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
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
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
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
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
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
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
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
55b8ec78cc Add support for copy/add with multiple src files
Part one of solution for issue #6820

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 05b8a1eb363ce03a9dfa3315fbac59c42af2df54
Component: engine
2014-09-18 20:12:13 -07:00
5770448fc1 test for panic on daemon restart
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 42dafe4bd84842532361a2d704493d124f438ab1
Component: engine
2014-09-18 21:54:42 +00:00