5ad82d3ea6
Merge pull request #8137 from jfrazelle/8135-event-log-die-start-fail
...
After container fails to start, log the event die.
2014-09-22 12:47:04 +04:00
d64d55eca8
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)
2014-09-19 16:06:49 -07:00
45407cf00a
Split volumes out from daemon
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-09-19 17:47:47 -05:00
63c8b8bf30
Merge pull request #8131 from unclejack/fix_perm_detection
...
integcli: fix permission detection for aufs
2014-09-19 11:55:56 -07:00
2e2422b0eb
Use prefix naming for rmi tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:54 +04:00
cc54b77fce
Use prefix naming for rm tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:54 +04:00
1ddd013b19
Use prefix naming for restart tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:54 +04:00
00b82fcab6
Use prefix naming for ps tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:54 +04:00
6e8c9e7bee
Use prefix naming for port tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:54 +04:00
b6325907e9
Use prefix naming for links tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:54 +04:00
27a27b7388
Use prefix naming for create tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:54 +04:00
66cd3640f1
Use prefix naming for build tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:50 +04:00
1a0347ff1d
integcli: fix permission detection for aufs
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-19 21:08:57 +03:00
f312f784e1
Use prefix naming for attach tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 21:56:25 +04:00
3812a6a846
Use prefix naming for inspect tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 21:56:25 +04:00
9720078f9e
Use prefix naming for events test
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 21:56:25 +04:00
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
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
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
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
aa0449c813
Fix logDone message for TestCopySingleFileToExistDir
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-18 09:02:05 +04:00
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
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
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
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
f98a1f1f7d
Merge pull request #8019 from thockin/add-host
...
Allow extra lines in /etc/hosts
2014-09-16 17:19:16 -07:00
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
ca39a3e36b
Merge pull request #7110 from tiborvass/merge-6907
...
Docker create (rebase of 6907)
2014-09-17 03:23:50 +04:00
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
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
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
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
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
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
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
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
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
fbae71326c
Merge pull request #8020 from erikh/rewrite_hosts_files
...
Links v2: Mutable network files
2014-09-15 23:03:30 +04:00
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
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
c751e1739d
Merge pull request #8010 from LK4D4/fix_ps_s_hang_#7999
...
Fix ps -s hang
2014-09-15 13:54:29 +03:00
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
a96811272a
Merge pull request #7934 from LK4D4/fix_double_allocation
...
Fix error propagation from userland-proxy
2014-09-12 11:39:10 -07:00
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
41cbce8c00
Test for docker ps -s
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-12 11:45:50 +04:00
41e9e93e27
Fix my own comments from #7927
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-12 10:05:07 +04:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
f49c3f287b
fixes #7802 , when api version 1.11 is `json.Marshal`ing 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
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
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
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
defe01daf8
fix race in daemon test framework
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-09-03 17:14:19 -07:00
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
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
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
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
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
72652c5973
Make nat test less racy and accurate
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-09-01 16:54:32 -07:00
efc6c9ba2f
Merge pull request #7825 from LK4D4/move_integration_to_cli
...
Move integration to cli
2014-09-01 11:38:57 -07:00
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
195cee9983
Move TestRunCidFileCheckIDLength to integration-cli
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-01 20:15:20 +04:00
8892320835
Move TestRunCidFileCleanupIfEmpty to integration-cli
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-01 19:55:39 +04:00
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
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
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
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
4e340cedec
List all ports when calling `docker port container`
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-08-29 18:31:51 +10:00
79501dcd4f
save many: adding an integration-cli test
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-08-28 21:33:13 -04:00
22b585e0fc
Merge pull request #7294 from erikh/fix_multiple_attach_test
...
Fix multiple attach test.
2014-08-28 13:38:28 +03:00
d9f8d3ea9f
Merge pull request #7461 from erikh/rewrite_dockerfile_parser
...
Cleanup: Refactor Dockerfile parser
2014-08-27 23:22:47 -07:00
3c984a6d15
Add logDone logs where it's missing
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-28 09:25:57 +04:00
2a5e29adc6
Merge pull request #7677 from erikh/update_hosts_linked_containers
...
Update /etc/hosts when linked container is restarted
2014-08-27 19:54:09 -07:00
77eefbc688
Merge pull request #7672 from cpuguy83/cleanup_volumes_from
...
Cleanup: applyVolumesFrom
2014-08-27 19:43:16 -07:00
cb51681a6d
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)
2014-08-27 18:52:30 -07:00
450740c891
Update /etc/hosts when linked container is restarted
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-08-27 18:23:41 -07:00
5b27fbc0e2
move TestEntrypoint & TestBindMounts
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-08-28 00:25:10 +00:00
eb9379c5d0
move TestKillDifferentUser
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-08-27 23:34:37 +00:00
7495fbc0e3
Cleanup: applyVolumesFrom
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-08-26 20:52:58 -04:00
89f64712fa
Merge pull request #7702 from LK4D4/fix_panic_on_bad_device_#7701
...
Handle error from GetDevice early
2014-08-26 10:53:40 -07:00
228eda4fd5
Merge pull request #7629 from LK4D4/fix_follow_hang_on_stop
...
Fix logs -f hanging on stopped containers
2014-08-25 15:24:20 -07:00
7e72ed70f9
add docker import test with a tag. Fixes #7714
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2014-08-26 15:51:22 +08:00
17b95ecb08
Handle error from GetDevice early
...
Also more verbose error.
Fixes panic from #7701
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-24 14:09:30 +04:00
01094c1568
Fix multiple attach test.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-08-22 03:58:05 -07:00
f04ef96e07
Test for following logs for stopped container
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-20 20:02:56 +04:00
94fbcea7a3
Merge pull request #5129 from vieux/host_resolv
...
allow /etc/hosts /etc/resolv.conf and /etc/hostname to be changed
2014-08-20 11:02:36 -05:00
d4c2d0c57f
Merge pull request #7608 from LK4D4/remove_internet_dep
...
Remove internet dependency from TestBuildCacheADD
2014-08-19 14:13:52 -05:00
fc39f9c78d
add tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-08-19 17:06:17 +00:00
Alexandr Morozov
Jessica Frazelle
Brian Goff
Michael Crosby
Alexandr Morozov
unclejack
Doug Davis
Jessie Frazelle
Tim Hockin
Alexander Larsson
Tibor Vass
Phil Estes
Vishnu Kannan
unclejack
Erik Hollensbe
Phil Estes
Michael Crosby
Frank Rosquin
Frank Rosquin
SvenDowideit
Vincent Batts
Victor Vieux
Victor Vieux
Lei Jitang