2e9533ccba
Merge pull request #8415 from LK4D4/use_logs_in_builder
...
Use logs instead of attach for builder
Upstream-commit: 3c325f89e544415bafc23006ead0bdc21cab2f61
Component: engine
2014-10-17 13:32:13 -07:00
9bac41ed10
Make daemon.Attach private
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 2db1caee4f23e81107b2647c06b4c677f6ecd7a1
Component: engine
2014-10-17 13:20:02 -07:00
1ccc013586
Use logs instead of attach for builder
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 6f09d064bd438ab4425d6105f40887f02bb9e97e
Component: engine
2014-10-17 13:20:02 -07:00
5e851498dc
Merge pull request #8565 from LK4D4/remove_fixtures_copy_tests
...
Remove fixtures copy tests
Upstream-commit: b357f76e5dfea46079ef8a06d0e23e08f14fd12f
Component: engine
2014-10-17 13:10:30 -07:00
03c4c5fa73
Merge pull request #8561 from albers/bash-completion
...
Fix support for --env-file in bash completion
Upstream-commit: fb5e6526d8b32801ee339dd2b328f6685cd66c0e
Component: engine
2014-10-17 13:26:24 -06:00
1cb2cc041f
Just remove integration-cli/build_tests/TestCopy/MultipleFilesToFile because it wasn't used
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 93d3c8e71d0ca8f33d905c455c0520c423fd7eb9
Component: engine
2014-10-17 11:58:12 -07:00
810883724d
Rewrite TestBuildCopyDisallowRemote to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 98e7608b4cec04463781ccb314259873bbb56a16
Component: engine
2014-10-17 11:58:12 -07:00
50718a9b0f
Rewrite TestBuildCopyEtcToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: c8a5d56fd789b50b78ad58c07a535aaf01af77f7
Component: engine
2014-10-17 11:57:48 -07:00
7e037f1bad
Rewrite TestBuildCopyWholeDirToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 6582ea574cfcd6cc8e3b1abebe7bfcc7aee05ece
Component: engine
2014-10-17 11:57:30 -07:00
5ab35b8993
Rewrite TestBuildCopyDirContentToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 4a029259ff41c37eb72a6f221f9725f66491139f
Component: engine
2014-10-17 11:57:07 -07:00
3100829c7e
Rewrite TestBuildCopyDirContentToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 832618afc6e6a8c489afb40f94340f158f9680c7
Component: engine
2014-10-17 11:56:49 -07:00
ff7999247d
Rewrite TestBuildCopySingleFileToNonExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 24d83afd5203f93a22a3d95a212e9ec295aadc8b
Component: engine
2014-10-17 11:56:28 -07:00
f2d974c957
Rewrite TestBuildCopySingleFileToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 2248109ff8607264ba40d4a4ac24bad66462d105
Component: engine
2014-10-17 11:56:01 -07:00
e5897b7fab
Rewrite TestBuildCopySingleFileToWorkdir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: d41cba6aed1ffdda9c3e3441d720dab9afc3eb66
Component: engine
2014-10-17 11:55:34 -07:00
be8f5dfa14
Rewrite TestBuildCopySingleFileToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 83c5dced10c4e2a40990e927ccc15a1e0428529c
Component: engine
2014-10-17 11:55:04 -07:00
fa31328c73
Rewrite TestBuildCopyAddMultipleFiles to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: e45c92153d0c21308fe5983aa76182cc03ef398e
Component: engine
2014-10-17 11:54:29 -07:00
beee7faafb
Merge pull request #8614 from ryanrdetzel/master
...
exec docs syntax fix
Upstream-commit: 04932e38afa78441e60ba6b86021a61a70e4692c
Component: engine
2014-10-17 14:38:43 -04:00
02f8c7b8a5
Merge pull request #8567 from LK4D4/add_log_done
...
Add logDone for TestBuildAddSingleFileToNonExistDir
Upstream-commit: 5a20dc67b005717a0549fe504a3b0ccf62c913c6
Component: engine
2014-10-17 11:20:12 -07:00
2cbac498ba
Merge pull request #8486 from duglin/Issue5701
...
Add failing testcase for single quotes in CMD
Upstream-commit: 09ceae5c9c268f2b79954b1580c5ec1632f24d0e
Component: engine
2014-10-17 11:11:49 -07:00
8fc55e7794
Merge pull request #8569 from jfrazelle/Cleanup-errorOut-resp
...
Cleanup: integration-cli (get rid of errorOut)
Upstream-commit: 6ac9768eaf0d7f4ebe9dcf8205903f5a4cf1a518
Component: engine
2014-10-17 13:36:00 -04:00
76d0eac075
Merge pull request #8635 from blakery/master
...
Cleanup: Removed unused function layerArchive
Upstream-commit: 83761be409ff830ebcbd122428ff9209a7a17ae9
Component: engine
2014-10-17 10:28:22 -07:00
7e2ab860f7
Merge pull request #8621 from zhgwenming/lxc
...
Fix lxc driver build issue on Mac OS X
Upstream-commit: 9b795108c7c15c531c1ef06889b0e975a822059d
Component: engine
2014-10-17 09:17:25 -07:00
421742174b
Merge pull request #8588 from dqminh/remove-sslv3
...
remove sslv3 from server's TLS supported versions
Upstream-commit: 10f78974ca515e3b7224b8cedd1fb3faa94af641
Component: engine
2014-10-17 12:05:48 -04:00
23d0088241
Removed unused function layerArchive
...
Signed-off-by: Blake Geno <blakegeno@gmail.com >
Upstream-commit: 7cff8db4a381f68d503fe828fb0fb35cf979741c
Component: engine
2014-10-17 10:49:21 -04:00
5f681d731d
Fix lxc driver build issue on Mac OS X
...
Docker-DCO-1.1-Signed-off-by: Albert Zhang <zhgwenming@gmail.com > (github: zhgwenming)
Upstream-commit: 210db1234dfb8d279bc1e5e2c8438dc8db2ee27d
Component: engine
2014-10-17 09:41:23 +08:00
f3d73e7359
Merge pull request #8531 from SvenDowideit/move-registry-search-to-registry-api
...
Move registry search API docs into the registry API document.
Upstream-commit: 6ce4f82ebe822dbc3cf945abba5f8a09ca48ea9f
Component: engine
2014-10-16 18:27:37 -07:00
6be2afe715
Edits and additions to release notes.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Added link for CVEs.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Fixed some URLs.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: d79defb7478973a0b554bc775efb1bf716fbcb1f
Component: engine
2014-10-16 18:16:52 -07:00
3c3b4af606
Edits and additions to release notes.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Added link for CVEs.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: b61ad60675999439bc2d937afbb0c3c82f6f7b06
Component: engine
2014-10-16 18:06:32 -07:00
180b93af0b
Merge pull request #8599 from irachex/commit_docs
...
Fix commit api document
Upstream-commit: 62cb97278d1ff35a13a09cc845c64d6a417f5874
Component: engine
2014-10-16 16:10:49 -07:00
a4666e24dd
Merge pull request #8238 from vbatts/vbatts-daemon_timestamps
...
daemon logging: unifying output and timestamps
Upstream-commit: cb106e74a14a37157b09459965a69c944f9c19f0
Component: engine
2014-10-16 15:55:49 -07:00
31d40db865
Merge pull request #8544 from SvenDowideit/link-to-latest-b2d-installers
...
Link directly to the 'latest' release alias
Upstream-commit: 2e35d7c905756314c12e10a50b36ecc46a70d31a
Component: engine
2014-10-16 15:52:24 -07:00
a2918879a4
Merge pull request #8516 from jamtur01/sshd
...
Minor changes to SSHd example
Upstream-commit: 69e3a55560df06a23cc74ba54badf120e5271bf9
Component: engine
2014-10-16 15:44:10 -07:00
bbf89a9e7f
Cleanup errorOut remove errorOut functions
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 5af7facf18565100d52fa198a695ab98a9669825
Component: engine
2014-10-16 15:06:20 -07:00
99346a8e5f
Cleanup errorOut resp run tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 66ac7420a90c832bacd0cb1832bf934b5420a311
Component: engine
2014-10-16 15:06:20 -07:00
168d6b41a8
Cleanup errorOut resp log tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 842d4b6b0afb0380afeea6d1638edb8913ae70bd
Component: engine
2014-10-16 15:06:20 -07:00
c587404dc5
Cleanup errorOut resp restart tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 9f52d8e6e786e62aa63b06d26782120fd25daf31
Component: engine
2014-10-16 15:06:20 -07:00
a8a998eeed
Cleanup errorOut resp exec tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 6f1c8ff4c4fd1f001917c3af89907731561642a6
Component: engine
2014-10-16 15:06:20 -07:00
2c526d9f92
Cleanup errorOut resp pull tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: eeb009729430f0858f56be37011325f3f9486386
Component: engine
2014-10-16 15:06:20 -07:00
960bb7c8ed
Cleanup errorOut resp in images tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: dd248dee3c889fe376a89adcc9f9d19cafb9bf69
Component: engine
2014-10-16 15:06:20 -07:00
77ef164c1f
Cleanup errorOut resp in version tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 50c3e7537c055a73a71999cb3ae9f2c6aa57efce
Component: engine
2014-10-16 15:06:20 -07:00
029dd9ca6c
Cleanup errorOut resp in push tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: f013506aad8b7c09b3c2d3307dadfa4b2d365d40
Component: engine
2014-10-16 15:06:20 -07:00
7e76a1cfb9
Cleanup errorOut resp in top tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 764030ec92f8cf8b47079c26d7c1393bd963fbf4
Component: engine
2014-10-16 15:06:20 -07:00
a1fc81a541
Cleanup errorOut resp in build tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: b1e3c9e9cd49591f8efcbcd00d45bcd98fbe2831
Component: engine
2014-10-16 15:06:20 -07:00
c9b622420d
Cleanup errorOut resp in save tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 0c87424007aa1220842acca26cbadc7c1a05bef9
Component: engine
2014-10-16 15:06:20 -07:00
d073e74963
Cleanup errorOut resp in rmi tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 0e3744ec8958faf88026338dcb096198399059e8
Component: engine
2014-10-16 15:06:20 -07:00
6c78c54dea
Cleanup errorOut resp in inspect tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: ac24cabd9d05fe8843a382bb55fe5f2dcd4b9da2
Component: engine
2014-10-16 15:06:19 -07:00
e1b85a8d45
Cleanup errorOut resp in ps tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: d33f2bdb114a9fd3c1413dbd4667440153df9431
Component: engine
2014-10-16 15:06:19 -07:00
2a8b0f0a3a
Cleanup errorOut resp in search tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: ef787eb824896471485522d343c62a6edb5c947f
Component: engine
2014-10-16 15:06:19 -07:00
0fb5fb3bb6
Cleanup errorOut resp in docker_utils.go
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 73eadbc6a1af80dfb1e933644a9a2927004e6d0f
Component: engine
2014-10-16 15:06:16 -07:00
198fd58622
Cleanup errorOut resp in diff test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: ac62c5439ac6197c3afca66db4489f96296097b6
Component: engine
2014-10-16 15:05:00 -07:00