02086c81fa
Merge pull request #8165 from duglin/Issue7309
...
If the Rename during an image delete fails, just delete the original dir - Issue #7309
Upstream-commit: 437fa0650e6dcd972f153758429395b63109016f
Component: engine
2014-09-23 10:28:48 -07:00
56b0530f73
Merge pull request #8168 from LK4D4/rewrite_fixture_tests
...
Rewrite some tests to not use fixtures
Upstream-commit: 7e461915a610174bbbdd20aab30f6ed30c2909b5
Component: engine
2014-09-23 10:02:59 -07:00
1359602f0a
Merge pull request #8127 from estesp/8107-fix-wait-error-return
...
Fix container wait error message to match server template for returning ...
Upstream-commit: 5c110b63dd1bc6300f16a172cd9f4457913491fb
Component: engine
2014-09-23 12:03:39 -04:00
733cfbef1c
Rewrite TestBuildAddWholeDirToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 0c899cefdd2f1826d16bd979651003a9502888e9
Component: engine
2014-09-23 18:58:32 +04:00
02962cb6ce
Rewrite TestBuildAddEtcToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 570f1153b9b09fc8b23b86a15fd6f37c2f873a67
Component: engine
2014-09-23 18:58:28 +04:00
a875fd8b49
Merge pull request #8172 from vbatts/vbatts-devmapper_fix_devicset_status_devices
...
devmapper: `docker info` devices hard coded
Upstream-commit: 9941b03af1f22bb714c3eee84dffd806e2a66889
Component: engine
2014-09-23 10:28:31 -04:00
82b1f11dad
Rewrite TestBuildAddDirContentToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: c58391bbd03a6dd71096fb2d7541e10fa9123e27
Component: engine
2014-09-23 15:15:58 +04:00
842da56368
Rewrite TestBuildAddDirContentToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 2d802d7f23ad0d9f59abd8144f2bad094e338339
Component: engine
2014-09-23 15:15:58 +04:00
a1258eabee
Rewrite TestAddSingleFileToNonExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 139b6ed3aa81d5d3c6ceaacc5041afca4d39d75a
Component: engine
2014-09-23 15:15:58 +04:00
6826b77d3f
Rewrite TestAddSingleFileToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 6bb44b6d7441d1a2b7136063a73c31c946be625f
Component: engine
2014-09-23 15:15:58 +04:00
1fda8e299f
Rewrite TestAddSingleFileToWorkdir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 5e2ea69606850cf2da1c50ec4bc32c981999aafd
Component: engine
2014-09-23 15:15:58 +04:00
2e55c2075c
Rewrite TestAddSingleFileToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 682fbe0134180488c1a7f2b755b6bb9ae09e9448
Component: engine
2014-09-23 15:15:09 +04:00
08a3014c75
Rewrite TestBuildSixtySteps to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 3824ec62e81d78db4dd36ffd64b17ef4c620b47f
Component: engine
2014-09-23 15:15:09 +04:00
f4fc3cbb97
if the Rename during an image delete fails, just delete the original dir
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 86a3a9a2822e5473816d5ced945b37fcc2131e1e
Component: engine
2014-09-22 18:47:20 -07:00
f783617844
Merge pull request #8094 from smerrill/feature/avoid-docker-start-woes
...
Try to avoid issues when the Docker daemon restarts or stops on RHEL/CentOS 6
Upstream-commit: 3ea5a20776ce6024752cc2c5964b08aeb8ce6c7d
Component: engine
2014-09-22 19:06:51 -06:00
84c8b465f8
Merge pull request #8156 from SvenDowideit/tedyoung-patch-1
...
Misc. fixes and formatting clean-up
Upstream-commit: 513f5a358adc9de5ecbca04b6d2225be84837580
Component: engine
2014-09-23 10:16:05 +10:00
b44c9bd465
Apply @tedyoung's changes to the entire set of API docs.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: ab43ad7d5fa8361736446af323c1fce77f150296
Component: engine
2014-09-23 10:09:49 +10:00
6bc23af935
Misc. fixes and formatting clean-up
...
Cleaned up and corrected some invalid "example responses".
Added some missing double-quotes for examples that resulted in invalid JSON.
Other general cleanup of stray characters and typos.
Docker-DCO-1.1-Signed-off-by: Ted M. Young <tedyoung@gmail.com > (github: SvenDowideit)
Upstream-commit: f304d4b190276939c9aff2090925342d16c7405e
Component: engine
2014-09-23 10:09:49 +10:00
02653b3385
Merge pull request #7564 from unclejack/integcli-add_utils
...
integration cli: add some utility functions and use them
Upstream-commit: 99caa68a46817f13a893542321ffc020bfa4cbf9
Component: engine
2014-09-22 17:00:01 -07:00
a396321542
Merge pull request #8123 from dcro/docs-clarifications
...
Updated the documentation to to clarify random port mapping when using -...
Upstream-commit: 60f6b0299a11212f9562d7df0f126d517fd2d3a6
Component: engine
2014-09-23 09:57:19 +10:00
dd5abc97c6
devmapper: resizepool hardcodes files as well
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 636e8561a86ffba909790e9188ffe282770570f0
Component: engine
2014-09-22 17:03:31 -04:00
b69ca50509
devmapper: docker info devices hard coded
...
If `--storage-opt dm.datadev=/dev/loop0 --storage-opt
dm.metadatadev=/dev/loop1 ` were provided, the information was not
reflected in the information output.
Closes : #7137
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 7e9ba22dc358196ac0d13524aa05677327f19ff9
Component: engine
2014-09-22 16:40:20 -04:00
5f2492cd77
Merge pull request #8125 from somaopensource/8102-fix
...
Check whether net.ParseIP returned nil or not
Upstream-commit: 4778d7d52d97666b3c7d886861f30a39ecc1bb24
Component: engine
2014-09-22 23:00:25 +04:00
4bd7fb4760
Merge pull request #8169 from unclejack/avoid_attach_alloc
...
daemon/attach: avoid mem alloc for interface
Upstream-commit: 06d0853682314c973eb976e011795b0a880cc540
Component: engine
2014-09-22 21:29:50 +03:00
ab7d3fd292
daemon/attach: avoid mem alloc for interface
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 950bfe419390bc0e5777ae70bd01f781ae61701a
Component: engine
2014-09-22 21:17:50 +03:00
680ee7cfce
Merge pull request #5956 from vbatts/vbatts-tarsum_hashes
...
tarsum: allow for generic hashes
Upstream-commit: 350b1cf6ea5681e26ea752e2e54ef6c9a04d91e0
Component: engine
2014-09-22 11:11:25 -07:00
3afe5f7408
integcli: add & use dockerCmdWithTimeout & InDir
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: c6965e3e45cc1c46afc885c57e0e6b9a7769722c
Component: engine
2014-09-22 21:02:51 +03:00
dd63155260
Merge pull request #7942 from estesp/7747-stderr-stdout-bug
...
Fix gh#7747: filter bare newline output and log client pull to stdout
Upstream-commit: 28e308c25ed431da14bf010df8a9beca05b32018
Component: engine
2014-09-22 10:53:34 -07:00
cf1e3ce7c5
integcli: add util to fetch container status
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 5d1cb9d0051c5263e23f06ccb431481f8e5b3d57
Component: engine
2014-09-22 20:34:57 +03:00
5314f1d0ea
integcli: consolidate cmd exit code processing
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 97b50e0f292847a8e3f166aa9386f3e51b1c5e95
Component: engine
2014-09-22 20:32:50 +03:00
e9760e60ca
Merge pull request #8109 from unclejack/avoid_jsonlog_alloc
...
daemon/logs: avoid JSONLog struct alloc in loop
Upstream-commit: ac758359312783c123b5173ceb84a6e703b73485
Component: engine
2014-09-22 12:53:31 -04:00
c6344bfee9
Merge pull request #8166 from unclejack/integcli_pull_scratch
...
integcli: pull scratch for pull test
Upstream-commit: c8f5c686a5498940e42f813b3f1016ef1cc31fe7
Component: engine
2014-09-22 19:16:30 +03:00
901086a5c9
integcli: pull scratch for pull test
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 77d29847e2a59a7b3e56144c774c28a3b7370c91
Component: engine
2014-09-22 19:03:19 +03:00
73f9db0dca
daemon/logs: lower allocations in loop
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: d2c104c3a01217f1a860d23143672af74a32e93a
Component: engine
2014-09-22 18:57:28 +03:00
98789bf31d
pkg/jsonlog: avoid JSONLog allocation in loop
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 473bb5274ce7a520bc73ccb3529f99729a799062
Component: engine
2014-09-22 18:57:28 +03:00
3b7b455265
Merge pull request #8159 from LK4D4/fix_goroutine_leak_in_logs
...
Fix goroutine leak in logs following
Upstream-commit: 9c7d97561499b1fd92bef755ea485b6942e65a66
Component: engine
2014-09-22 11:16:48 -04:00
a6582123ef
Merge pull request #8164 from unclejack/fix_utils_race
...
integcli: fix race in runCommandWithStdoutStderr
Upstream-commit: 1df4255102d1a00df7d646561ce406959e92e4a5
Component: engine
2014-09-22 19:14:40 +04:00
18f1860b4a
integcli: fix race in runCommandWithStdoutStderr
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: c69896d8a013fca05ffee479e08605552715f901
Component: engine
2014-09-22 17:53:12 +03:00
0c49058cda
Merge pull request #8121 from bbinet/cleanup-hello-world-container
...
Automatically clean up hello-world container with --rm
Upstream-commit: 3c03506cc29fe60eb36dba24dd72dcf0c6185f68
Component: engine
2014-09-22 10:52:50 -04:00
eb02e608df
Merge pull request #6101 from LK4D4/ip_range_#4986
...
Implement allocating IPs from CIDR within bridge network
Upstream-commit: 9fb34ae5710faaadc730a7005f785cefc56eed4b
Component: engine
2014-09-22 17:09:16 +03:00
4420332c09
Merge pull request #8137 from jfrazelle/8135-event-log-die-start-fail
...
After container fails to start, log the event die.
Upstream-commit: 5ad82d3ea641a9cc569fc49853759bb98f043fa9
Component: engine
2014-09-22 12:47:04 +04:00
d6c649f11a
Check whether net.ParseIP returned nil or not
...
This is fix of #8102
Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com >
Upstream-commit: c2dc4245f1fb9462d0f22e0bc2aceb02903211ab
Component: engine
2014-09-22 16:52:23 +09:00
f5deb7d0f9
Close logs pipes and catch write errors
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: a7ee201ee85c95afb8556323d79e32cf9e2d8737
Component: engine
2014-09-22 10:55:46 +04:00
750e7b6a57
Change unused WriteCloser to Writer
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: fd3f2e175fa6ddb606d2c681ff86a97faccfebbd
Component: engine
2014-09-22 10:54:58 +04:00
e733686489
Doc update to clarify random port mapping on docker run -P
...
Signed-off-by: Dan Cotora <d@bluevision.ro >
Upstream-commit: a8775d2f9a211b90474b5709ad75b8e1fcb2e189
Component: engine
2014-09-22 08:39:09 +03:00
3ebe7ce35b
Merge pull request #8124 from jyrkiput/patch-1
...
Fix detaching from attached container
Upstream-commit: 27226d47c17588c867f2c533b87977955f2ca66e
Component: engine
2014-09-22 09:28:10 +10:00
d9f35e7ede
Merge pull request #8151 from shazow/sort-exec-docs
...
Cleanup: Fixed cli docs' command header sorting
Upstream-commit: 23fdbbfee4800b7353953adba3891bd3554431c4
Component: engine
2014-09-22 09:21:38 +10:00
c2a971c0cd
Cleanup: Fix cli docs: Sorted command headers.
...
Signed-off-by: Andrey Petrov <andrey.petrov@shazow.net >
Upstream-commit: c5805c8772b2439ce9d8c7022bd8c8208648bc5b
Component: engine
2014-09-20 18:10:11 -07:00
d3a449f426
Merge pull request #7972 from cpuguy83/split_volumes_from_daemon
...
Split volumes out from daemon
Upstream-commit: e7a9662974ad12e1926599e64dca44aaf1a90145
Component: engine
2014-09-20 16:23:20 +04:00
b795807b6a
Merge pull request #8144 from crosbymichael/reduce-logging
...
This reduces the amount of logging in the integration tests
Upstream-commit: f8c998c605ff1a6f11d371a94820e49ce815d769
Component: engine
2014-09-20 11:17:03 +04:00
