0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
39986 commits 14 branches 412 tags 338 MiB
Commit graph

5414 commits

Author SHA1 Message Date
Alexandr Morozov
f312f784e1 Use prefix naming for attach tests 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 21:56:25 +04:00
Alexandr Morozov
3812a6a846 Use prefix naming for inspect tests 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 21:56:25 +04:00
Alexandr Morozov
9720078f9e Use prefix naming for events test 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 21:56:25 +04:00
Alexandr Morozov
aa536b27a7 Use prefix naming for docker_cli_run_test.go 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 21:56:24 +04:00
Doug Davis
05b8a1eb36 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>
 2014-09-18 20:12:13 -07:00
Jessica Frazelle
42dafe4bd8 test for panic on daemon restart 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-09-18 21:54:42 +00:00
Alexandr Morozov
184fe67bbc 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>
 2014-09-18 09:09:10 +04:00
Alexandr Morozov
aa0449c813 Fix logDone message for TestCopySingleFileToExistDir 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-18 09:02:05 +04:00
Michael Crosby
77d30e7112 Merge pull request #8041 from unclejack/lower_allocations_broadcastwriter 
lower the number of allocations in broadcastwriter
 2014-09-17 15:26:44 -07:00
Alexandr Morozov
c171cf0cc3 Merge pull request #8088 from unclejack/integcli-keep_permissions 
integcli: run inaccessible context test in tmpdir
 2014-09-17 22:06:26 +04:00
unclejack
be924087eb integcli: run build tests in tmpdir 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-17 20:05:33 +03:00
unclejack
9ae3134dc9 add the timeutils package 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-17 14:30:08 +03:00
Jessie Frazelle
f98a1f1f7d Merge pull request #8019 from thockin/add-host 
Allow extra lines in /etc/hosts
 2014-09-16 17:19:16 -07:00
Tim Hockin
68e48b65a6 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>
 2014-09-16 23:38:23 +00:00
Alexandr Morozov
ca39a3e36b Merge pull request #7110 from tiborvass/merge-6907 
Docker create (rebase of 6907)
 2014-09-17 03:23:50 +04:00
Alexander Larsson
b0cb37fd3b 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)
 2014-09-16 18:40:24 -04:00
Brian Goff
0a3211f131 Fix #7792 - Order mounts 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-09-16 14:51:06 -07:00
Jessie Frazelle
51b26853ef Merge pull request #7976 from duglin/Issue7902 
Fix for issue 7902 - add trailing zeros to timestamps so logs align
 2014-09-16 13:55:03 -07:00
Alexandr Morozov
00fd008170 Merge pull request #8062 from vishh/run_in_phase2 
Add support for 'docker exec' - phase 2
 2014-09-16 23:56:12 +04:00
Tibor Vass
f88e2e8b99 Merge pull request #8054 from estesp/6830-fix-json-strings 
Proper JSON handling of strings that could be represented as other types
 2014-09-16 15:11:25 -04:00
Phil Estes
1b0b1ec657 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)
 2014-09-16 13:51:02 -04:00
Doug Davis
cd7a5f5c09 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>
 2014-09-16 10:28:37 -07:00
unclejack
9e5592d6a1 integ-cli: fix TestImportDisplay & add FileServer 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-16 01:54:21 +03:00
Jessica Frazelle
985fae256f 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)
 2014-09-15 15:17:50 -07:00
Alexandr Morozov
fbae71326c Merge pull request #8020 from erikh/rewrite_hosts_files 
Links v2: Mutable network files
 2014-09-15 23:03:30 +04:00
Vishnu Kannan
d980589de6 Adding integration tests for docker exec feature. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 16:59:59 +00:00
unclejack
31c0039022 clean up the context when a build fails 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-15 16:01:23 +03:00
unclejack
c751e1739d Merge pull request #8010 from LK4D4/fix_ps_s_hang_#7999 
Fix ps -s hang
 2014-09-15 13:54:29 +03:00
Erik Hollensbe
09b700288e 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)
 2014-09-13 11:27:34 -07:00
Michael Crosby
a96811272a Merge pull request #7934 from LK4D4/fix_double_allocation 
Fix error propagation from userland-proxy
 2014-09-12 11:39:10 -07:00
unclejack
3ec564bfda integ-cli: better debug output for run & import 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-12 16:51:21 +03:00
Alexandr Morozov
41cbce8c00 Test for docker ps -s 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-12 11:45:50 +04:00
Alexandr Morozov
41e9e93e27 Fix my own comments from #7927 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-12 10:05:07 +04:00
Tibor Vass
3109fc9537 Add Test for port allocation bug (port already in use by other programs than docker) 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-09-12 09:51:14 +04:00
Michael Crosby
32b5d145fa Merge pull request #7963 from jfrazelle/7845-remove-image-fail-dont-untag 
Failing to remove an image, will not remove the image name/tag.
 2014-09-11 18:06:18 -07:00
Michael Crosby
98e409172c Merge pull request #7996 from estesp/7943-validate-tagnames 
Validate tag names similar to repository name validation; add tests
 2014-09-11 15:19:50 -07:00
Phil Estes
46eb4140c9 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)
 2014-09-11 17:52:36 -04:00
Jessica Frazelle
b2efdc538d 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)
 2014-09-11 11:29:25 -07:00
Erik Hollensbe
576416c99a 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)
 2014-09-11 06:00:24 -07:00
Erik Hollensbe
78a847a47a 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)
 2014-09-11 06:00:24 -07:00
Erik Hollensbe
ac107995ae 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)
 2014-09-11 06:00:24 -07:00
Alexandr Morozov
2e7cf6b0ce Deallocate port before trying to delete iptables chain 
Fixes #7954
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-10 00:40:46 +04:00
Tibor Vass
43eab4034b Merge pull request #7938 from unclejack/make_run_test_verbose 
integ-cli: increase verbosity for mem & cpu test
 2014-09-08 14:10:58 -04:00
Michael Crosby
11700512b9 Merge pull request #7920 from unclejack/fix_layer_permissions 
ensure correct permissions are set for directories
 2014-09-08 10:51:50 -07:00
unclejack
05a76477e6 integ-cli: increase verbosity for mem & cpu test 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-08 20:46:45 +03:00
unclejack
cc5fb986b0 integ-cli: test correct directory permissions 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-08 20:02:40 +03:00
Jessica Frazelle
d2f75a3040 Fix line delimited JSON response 
For GET /events, line delimit JSON.
Fixes #7047

Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com>

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com> (github: )
 2014-09-08 09:41:26 -07:00
Jessica Frazelle
f49c3f287b fixes #7802, when api version 1.11 is json.Marshaling the container struct 
Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com>

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com> (github: )
 2014-09-08 09:30:33 -07:00
Tibor Vass
1a2a4f61ab Merge pull request #7878 from LK4D4/fix_net_for_none 
Don't initialize network for 'none' mode
 2014-09-04 15:30:03 -07:00
Alexandr Morozov
ba24820284 Don't initialize network for 'none' mode 
Fixes #7837

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-04 09:50:58 +04:00