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
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
e4806321a3
Add Build prefix to Copy tests
...
Now we can do "-run TestBuild" to test all build-tests and "-run
TestBuildCopy" for test all copy-tests
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 184fe67bbc3759307adb6cb3e5338b5325bb88bb
Component: engine
2014-09-18 09:09:10 +04:00
c6ab84449d
Fix logDone message for TestCopySingleFileToExistDir
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: aa0449c8139afec8e1446bb8650acad886b0a194
Component: engine
2014-09-18 09:02:05 +04:00
a701f25898
Merge pull request #8041 from unclejack/lower_allocations_broadcastwriter
...
lower the number of allocations in broadcastwriter
Upstream-commit: 77d30e71122c7ec328f79836dcab4409f72e04b9
Component: engine
2014-09-17 15:26:44 -07:00
0e86e16728
Merge pull request #8088 from unclejack/integcli-keep_permissions
...
integcli: run inaccessible context test in tmpdir
Upstream-commit: c171cf0cc3ac2a2b0d164fb5ead748e372f73837
Component: engine
2014-09-17 22:06:26 +04:00
699424477b
integcli: run build tests in tmpdir
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: be924087eb5a2ab0ad79c069782e82805dd31d58
Component: engine
2014-09-17 20:05:33 +03:00
cb5f7b942d
add the timeutils package
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 9ae3134dc9f0652ef48ec1fd445f42d8fe26de35
Component: engine
2014-09-17 14:30:08 +03:00
118f175983
Merge pull request #8019 from thockin/add-host
...
Allow extra lines in /etc/hosts
Upstream-commit: f98a1f1f7d9b3ef10c13fc3b6438c978b4d6aa78
Component: engine
2014-09-16 17:19:16 -07:00
604739ede9
Allow extra lines in /etc/hosts
...
This adds a --add-host host:ip flag which appends lines to /etc/hosts. This is needed in places where you want the container to get a different name resolution than it would through DNS. This was submitted before as #5525 , closed, and now I am re-opening. It has come up 2 or 3 times in the last couple days.
Signed-off-by: Tim Hockin <thockin@google.com >
Upstream-commit: 68e48b65a64df10fc797cbaa89d6caa2188eadc9
Component: engine
2014-09-16 23:38:23 +00:00
dc62b54723
Merge pull request #7110 from tiborvass/merge-6907
...
Docker create (rebase of 6907)
Upstream-commit: ca39a3e36b8b76539bc30f0f4e2761222c50919f
Component: engine
2014-09-17 03:23:50 +04:00
b187bcdd06
integration-cli: Add docker create tests
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: b0cb37fd3bd65b27a63954b36507a9782088cfc4
Component: engine
2014-09-16 18:40:24 -04:00
1f9dd77aaf
Fix #7792 - Order mounts
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 0a3211f131b63b0646be4a19c3ea5147bd557844
Component: engine
2014-09-16 14:51:06 -07:00
bcad074599
Merge pull request #7976 from duglin/Issue7902
...
Fix for issue 7902 - add trailing zeros to timestamps so logs align
Upstream-commit: 51b26853ef2f124ea837364c02585cbf96999d6a
Component: engine
2014-09-16 13:55:03 -07:00
d25c9ab27a
Merge pull request #8062 from vishh/run_in_phase2
...
Add support for 'docker exec' - phase 2
Upstream-commit: 00fd008170e463426001ec4c56fc4c39450fd8d0
Component: engine
2014-09-16 23:56:12 +04:00
258946589c
Merge pull request #8054 from estesp/6830-fix-json-strings
...
Proper JSON handling of strings that could be represented as other types
Upstream-commit: f88e2e8b99c4f9a4e58f14f29dc9286931c92f0d
Component: engine
2014-09-16 15:11:25 -04:00
dbf2eb7488
Proper JSON handling of strings that could be represented as other types
...
Addresses #6830
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 1b0b1ec65729a2e018df1334b70b851714995e9e
Component: engine
2014-09-16 13:51:02 -04:00