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

5698 commits

Author SHA1 Message Date
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
Tibor Vass
39310448da handle empty envvars for DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in daemon test framework 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-09-03 17:14:19 -07:00
Tibor Vass
defe01daf8 fix race in daemon test framework 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-09-03 17:14:19 -07:00
unclejack
6db078dea7 Merge pull request #7191 from tiborvass/test-daemon 
Add Daemon restart test along with Daemon utils
 2014-09-02 22:40:23 +03:00
Tibor Vass
a9971a89cc Add TestDaemonRestartWithRunningContainersPorts 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-09-02 12:13:21 -07:00
Tibor Vass
054b921a2c Add Daemon test utils 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-09-02 10:58:36 -07:00
unclejack
1858746978 clean up context on build completion & add test 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-02 17:35:25 +03:00
Michael Crosby
c0a5ec75c5 Add more error info to TestDockerRunEchoStdoutWithMemoryLimit 
This test fails on my CI server often so we need more info when it does
happen with this test.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-09-01 17:09:52 -07:00
Michael Crosby
72652c5973 Make nat test less racy and accurate 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-09-01 16:54:32 -07:00
Michael Crosby
efc6c9ba2f Merge pull request #7825 from LK4D4/move_integration_to_cli 
Move integration to cli
 2014-09-01 11:38:57 -07:00
Michael Crosby
388ed88042 Merge pull request #7812 from erikh/fix_top 
docker top: fix command when multiple arguments are supplied
 2014-09-01 11:31:38 -07:00
Alexandr Morozov
195cee9983
Move TestRunCidFileCheckIDLength to integration-cli 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-01 20:15:20 +04:00
Alexandr Morozov
8892320835
Move TestRunCidFileCleanupIfEmpty to integration-cli 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-01 19:55:39 +04:00
Alexandr Morozov
c8999dc326 Merge pull request #7817 from cnf/fix_cli_top_test_priv 
Fixed error check using the wrong error value
 2014-08-31 19:24:33 +04:00
Frank Rosquin
d93c95a332 Fixed error check using the wrong error value 
errorOut was using the err from the previous test.
same as #7816 but on TestTopPrivileged, which I missed last time

Signed-off-by: Frank Rosquin <frank.rosquin@gmail.com>
 2014-08-31 16:35:38 +02:00
Frank Rosquin
82c536aacd fixed error check using the wrong error value 
errorOut was using the err from the previous test.

Signed-off-by: Frank Rosquin <frank.rosquin@gmail.com>
 2014-08-31 16:21:53 +02:00
Erik Hollensbe
d7dd35bbd6 Add a test for the multiple arguments passed to docker top 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-31 05:53:05 -07:00