p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,618 Commits 2 Branches 295 Tags
c622ad158ed91708ca2bbacbbc7c5c000c191377
Commit Graph

321 Commits

Author SHA1 Message Date
Alexandr Morozov
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
Alexandr Morozov
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
Alexandr Morozov
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
Alexandr Morozov
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
Alexandr Morozov
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
Alexandr Morozov
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
Alexandr Morozov
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
Alexandr Morozov
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
Alexandr Morozov
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
Alexandr Morozov
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
Alexandr Morozov
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
Doug Davis
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
Jessica Frazelle
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
Alexandr Morozov
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
Alexandr Morozov
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
Michael Crosby
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
Alexandr Morozov
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
unclejack
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
unclejack
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
Jessie Frazelle
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
Tim Hockin
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
Alexandr Morozov
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
Alexander Larsson
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
Brian Goff
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
Jessie Frazelle
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
Alexandr Morozov
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
Tibor Vass
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
Phil Estes
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
Doug Davis
a36831cc2a Fix for issue 7902. 
Use utils.RFC3339NanoFixed ("2006-01-02T15:04:05.000000000Z07:00")
instead of time.RFC3339Nano to format our log timestamps - this way
things are aligned, in particular the nano seconds are padded with zeros

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: cd7a5f5c0998f288f71d307076e661ed54f1a5f1
Component: engine
 2014-09-16 10:28:37 -07:00
unclejack
86091bac44 integ-cli: fix TestImportDisplay & add FileServer 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 9e5592d6a10ce02fb77244c7de3fff38958e0b89
Component: engine
 2014-09-16 01:54:21 +03:00
Jessica Frazelle
c472fc422b Update integration-cli tests to allow one-letter tag as valid. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 985fae256f3fcaea5cf67581ae3d83a46bc52d9e
Component: engine
 2014-09-15 15:17:50 -07:00
Alexandr Morozov
3da88c8c53 Merge pull request #8020 from erikh/rewrite_hosts_files 
Links v2: Mutable network files
Upstream-commit: fbae71326ccc24f6be720f64e0ea48c59376452b
Component: engine
 2014-09-15 23:03:30 +04:00
Vishnu Kannan
4922ee637c Adding integration tests for docker exec feature. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: d980589de6e086d1b4c62cc7495bd952c394890b
Component: engine
 2014-09-15 16:59:59 +00:00
unclejack
8ef9f79072 clean up the context when a build fails 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 31c0039022234972c79947a6299c0fa382436487
Component: engine
 2014-09-15 16:01:23 +03:00
unclejack
eb7e1f51d1 Merge pull request #8010 from LK4D4/fix_ps_s_hang_#7999 
Fix ps -s hang
Upstream-commit: c751e1739d56e38aa9a813c369d78c6dbdc37b07
Component: engine
 2014-09-15 13:54:29 +03:00
Erik Hollensbe
d8cb453d89 Allow /etc/hosts and /etc/resolv.conf to be updated both outside and 
inside the container.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 09b700288e4804162ef86c99466e08b6b016e0c4
Component: engine
 2014-09-13 11:27:34 -07:00
Michael Crosby
7af7544c23 Merge pull request #7934 from LK4D4/fix_double_allocation 
Fix error propagation from userland-proxy
Upstream-commit: a96811272a7fbc695a1c3cc9931bb8b9f784978e
Component: engine
 2014-09-12 11:39:10 -07:00
unclejack
35e640c370 integ-cli: better debug output for run & import 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 3ec564bfda57f068aac813f4b985385c1c7e4f23
Component: engine
 2014-09-12 16:51:21 +03:00
Alexandr Morozov
1a0325cec5 Test for docker ps -s 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 41cbce8c005c201169e13902d62112ced9902928
Component: engine
 2014-09-12 11:45:50 +04:00
Alexandr Morozov
06ff531f43 Fix my own comments from #7927 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 41e9e93e27ccd637d9490412622529bdc7d7b8ff
Component: engine
 2014-09-12 10:05:07 +04:00
Tibor Vass
d6bc3658af Add Test for port allocation bug (port already in use by other programs than docker) 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 3109fc9537682a7b9ee566f3674484b1b2296707
Component: engine
 2014-09-12 09:51:14 +04:00
Michael Crosby
2bf1cd4824 Merge pull request #7963 from jfrazelle/7845-remove-image-fail-dont-untag 
Failing to remove an image, will not remove the image name/tag.
Upstream-commit: 32b5d145faac9013f9f78adfe3bb2a171d818863
Component: engine
 2014-09-11 18:06:18 -07:00
Michael Crosby
d6e3f1dab9 Merge pull request #7996 from estesp/7943-validate-tagnames 
Validate tag names similar to repository name validation; add tests
Upstream-commit: 98e409172cb5872e0b081244bf8802e4a422d735
Component: engine
 2014-09-11 15:19:50 -07:00
Phil Estes
31470054b1 Validate tag names similar to repository name validation; add tests 
Addresses #7943

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 46eb4140c915e05a893080b34b42e25b6a75de7b
Component: engine
 2014-09-11 17:52:36 -04:00
Jessica Frazelle
ad8c137992 Removing an image that fails, also removes the image name/tag. 
Fixes #7845 and #7801, and a real pain point I had :)

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: b2efdc538de47d37718b8972cd6703be32fc23c2
Component: engine
 2014-09-11 11:29:25 -07:00
Erik Hollensbe
665c625297 move entrypoint integration-cli test for blank entrypoint to separate function 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 576416c99a0ae8ad27467f217ec21f598e4f4cc8
Component: engine
 2014-09-11 06:00:24 -07:00
Erik Hollensbe
b3a58e1095 evaluator: ensure entrypoint stays blank if set blank while CMD is set. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 78a847a47ac777f4090c06a82e875ee30f9a1cbd
Component: engine
 2014-09-11 06:00:24 -07:00
Erik Hollensbe
76991d395e builder: Fix entrypoint and cmd semantics in evaluator. Test c/o @cnf 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: ac107995ae4a24195f8bb6b70c26393a87d19982
Component: engine
 2014-09-11 06:00:24 -07:00
Alexandr Morozov
73455edf0c Deallocate port before trying to delete iptables chain 
Fixes #7954
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 2e7cf6b0cec3e5cc6f05fa5011cf7b5e49a44ae4
Component: engine
 2014-09-10 00:40:46 +04:00
Tibor Vass
a07f296d31 Merge pull request #7938 from unclejack/make_run_test_verbose 
integ-cli: increase verbosity for mem & cpu test
Upstream-commit: 43eab4034b1a88e8f68ce96be44643475201d94d
Component: engine
 2014-09-08 14:10:58 -04:00