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
Michael Crosby
e6516d4319
Merge pull request #7920 from unclejack/fix_layer_permissions
...
ensure correct permissions are set for directories
Upstream-commit: 11700512b90e093824647bcbbbdfa26ddafea7cc
Component: engine
2014-09-08 10:51:50 -07:00
unclejack
ff6065975e
integ-cli: increase verbosity for mem & cpu test
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 05a76477e6a70975b1c60637c3f8e2d7a507c490
Component: engine
2014-09-08 20:46:45 +03:00
unclejack
71e8f9134d
integ-cli: test correct directory permissions
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: cc5fb986b03ce28075a9f3aee248d401f3be0c96
Component: engine
2014-09-08 20:02:40 +03:00
Jessica Frazelle
0db8f36c75
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: )
Upstream-commit: d2f75a3040e72562ffa825d5c3efa7004af2640a
Component: engine
2014-09-08 09:41:26 -07:00
Jessica Frazelle
2ff1cc83fb
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: )
Upstream-commit: f49c3f287b0d26dc705940effa0ec03e1de7bb99
Component: engine
2014-09-08 09:30:33 -07:00
Tibor Vass
0f1377200f
Merge pull request #7878 from LK4D4/fix_net_for_none
...
Don't initialize network for 'none' mode
Upstream-commit: 1a2a4f61abb3a5b40de70b10f39c90d7593679a5
Component: engine
2014-09-04 15:30:03 -07:00
Alexandr Morozov
dc74831ee4
Don't initialize network for 'none' mode
...
Fixes #7837
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: ba24820284a7a87642f2b668987c1627d6977ea2
Component: engine
2014-09-04 09:50:58 +04:00
Tibor Vass
7f4f710d0d
handle empty envvars for DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in daemon test framework
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 39310448da1ed05d39f4400a56dd43e71591ae5b
Component: engine
2014-09-03 17:14:19 -07:00
Tibor Vass
7dcf943afc
fix race in daemon test framework
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: defe01daf87237e42a9275a0b286b0f71c60de25
Component: engine
2014-09-03 17:14:19 -07:00
unclejack
c953d01896
Merge pull request #7191 from tiborvass/test-daemon
...
Add Daemon restart test along with Daemon utils
Upstream-commit: 6db078dea79633973b77ca5afad924e10340b39f
Component: engine
2014-09-02 22:40:23 +03:00
Tibor Vass
e9f9032556
Add TestDaemonRestartWithRunningContainersPorts
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: a9971a89ccb0bd8688e7a8ab8058dcbb66d61687
Component: engine
2014-09-02 12:13:21 -07:00
Tibor Vass
c02ebae1f7
Add Daemon test utils
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 054b921a2c140f9b8250f6c7e12dec9fba23ce0f
Component: engine
2014-09-02 10:58:36 -07:00
unclejack
9046d6de2c
clean up context on build completion & add test
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 18587469789594f7ca26fc942c6d23b971a14dd3
Component: engine
2014-09-02 17:35:25 +03:00
Michael Crosby
ef9df7ad17
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 >
Upstream-commit: c0a5ec75c5a8f2d3ccb2f0c1a90f30bb20cdd60b
Component: engine
2014-09-01 17:09:52 -07:00
Michael Crosby
5f3cf0d988
Make nat test less racy and accurate
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 72652c597385980c1bf6adebe4cded760dbf2663
Component: engine
2014-09-01 16:54:32 -07:00
Michael Crosby
06de394335
Merge pull request #7825 from LK4D4/move_integration_to_cli
...
Move integration to cli
Upstream-commit: efc6c9ba2f51a6103a9c982ab15e508e28e64831
Component: engine
2014-09-01 11:38:57 -07:00
Michael Crosby
94c61e97d5
Merge pull request #7812 from erikh/fix_top
...
docker top: fix command when multiple arguments are supplied
Upstream-commit: 388ed88042b54b3e0fff7096c1749f2bfc2c7e40
Component: engine
2014-09-01 11:31:38 -07:00
Alexandr Morozov
4f814a8405
Move TestRunCidFileCheckIDLength to integration-cli
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 195cee99839a77afec7aaf7fe43cb5a9ceae4f57
Component: engine
2014-09-01 20:15:20 +04:00
Alexandr Morozov
797834a228
Move TestRunCidFileCleanupIfEmpty to integration-cli
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 8892320835ad2b21b0efd4848d2af0d8a791a8e9
Component: engine
2014-09-01 19:55:39 +04:00
Alexandr Morozov
80ace0ef1f
Merge pull request #7817 from cnf/fix_cli_top_test_priv
...
Fixed error check using the wrong error value
Upstream-commit: c8999dc326c9d722386c88ba6cca219b8029452e
Component: engine
2014-08-31 19:24:33 +04:00
Frank Rosquin
f0aedfc820
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 >
Upstream-commit: d93c95a332b65948cf37a87a84900323657571f0
Component: engine
2014-08-31 16:35:38 +02:00
Frank Rosquin
3a37023687
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 >
Upstream-commit: 82c536aacd30baf110c074de1f83ae3ab2f9588c
Component: engine
2014-08-31 16:21:53 +02:00
Erik Hollensbe
e16ec47eeb
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)
Upstream-commit: d7dd35bbd6250fcf42f8fe6521a55813e670f805
Component: engine
2014-08-31 05:53:05 -07:00
SvenDowideit
6c5eee34ef
List all ports when calling docker port container
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 4e340cedeccabcae8875dd35f8c984246d6c3bc1
Component: engine
2014-08-29 18:31:51 +10:00
Vincent Batts
5583bba50b
save many: adding an integration-cli test
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 79501dcd4f7a207067c234766ae4788007a1d91b
Component: engine
2014-08-28 21:33:13 -04:00
unclejack
c1357a0a27
Merge pull request #7294 from erikh/fix_multiple_attach_test
...
Fix multiple attach test.
Upstream-commit: 22b585e0fcd5e844b1c35e9b5d98757920afc1dd
Component: engine
2014-08-28 13:38:28 +03:00
Victor Vieux
e1ce13e0e5
Merge pull request #7461 from erikh/rewrite_dockerfile_parser
...
Cleanup: Refactor Dockerfile parser
Upstream-commit: d9f8d3ea9f5b700e8e2f8eb37bcc0ca6f8b8360c
Component: engine
2014-08-27 23:22:47 -07:00
Alexandr Morozov
def10d2ed4
Add logDone logs where it's missing
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 3c984a6d1578947c5adfe13993cb28d88a674bbf
Component: engine
2014-08-28 09:25:57 +04:00
Michael Crosby
364fb8763b
Merge pull request #7677 from erikh/update_hosts_linked_containers
...
Update /etc/hosts when linked container is restarted
Upstream-commit: 2a5e29adc62b0a45e7548c51e5cebc4855d54b48
Component: engine
2014-08-27 19:54:09 -07:00
Michael Crosby
a040de5fce
Merge pull request #7672 from cpuguy83/cleanup_volumes_from
...
Cleanup: applyVolumesFrom
Upstream-commit: 77eefbc68894c77862608632822619abfc0c58d6
Component: engine
2014-08-27 19:43:16 -07:00
Erik Hollensbe
e5b50b40c8
builder: Fix handling of ENV references that reference themselves, plus tests.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: cb51681a6db4b7c62d91998ba3b1d3b98c09c61c
Component: engine
2014-08-27 18:52:30 -07:00
Victor Vieux
ac32065d5c
Update /etc/hosts when linked container is restarted
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 450740c891c60dda15b7abe29f35b8e142c2c40e
Component: engine
2014-08-27 18:23:41 -07:00
Victor Vieux
c2d0e99a2a
move TestEntrypoint & TestBindMounts
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 5b27fbc0e27358b794946fe9e84a83a6c4497be4
Component: engine
2014-08-28 00:25:10 +00:00
Victor Vieux
e59ed0e9b1
move TestKillDifferentUser
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: eb9379c5d05848c525f7c3d75b66a4b356227d57
Component: engine
2014-08-27 23:34:37 +00:00
Brian Goff
054561d764
Cleanup: applyVolumesFrom
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 7495fbc0e3f23c932562cb02ea6e7df204d29dfa
Component: engine
2014-08-26 20:52:58 -04:00
Michael Crosby
ff69012bd1
Merge pull request #7702 from LK4D4/fix_panic_on_bad_device_#7701
...
Handle error from GetDevice early
Upstream-commit: 89f64712faecddbfd92c7bfe6612dd5890c966dd
Component: engine
2014-08-26 10:53:40 -07:00
Michael Crosby
601611b982
Merge pull request #7629 from LK4D4/fix_follow_hang_on_stop
...
Fix logs -f hanging on stopped containers
Upstream-commit: 228eda4fd5a79dfe5eab1194f4133a71472fef0e
Component: engine
2014-08-25 15:24:20 -07:00
Lei Jitang
a85c5401f4
add docker import test with a tag. Fixes #7714
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 7e72ed70f9cac871b845bebef0f96178c0f1a25c
Component: engine
2014-08-26 15:51:22 +08:00
Alexandr Morozov
81067d8cbd
Handle error from GetDevice early
...
Also more verbose error.
Fixes panic from #7701
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 17b95ecb08f1705bd74d6c94c8bcfd4c87ccfca6
Component: engine
2014-08-24 14:09:30 +04:00
Erik Hollensbe
0ebd331b6f
Fix multiple attach test.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 01094c15680c0a33367e1dcc69ec9f4018efd2ac
Component: engine
2014-08-22 03:58:05 -07:00