toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,728 Commits 3 Branches 295 Tags
c4d568bf1b94436c44fa5cd5bf456ec5e57524cf
Commit Graph
14728 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Yestin Sun c4d568bf1b Improve test accuracy for pkg/chrootarchive (part 2) 
Check test correctness of untar by comparing destination with
source. For part 2, it checkes hashes of source and destination
files or the target files of symbolic links.

This is a supplement to the #11601 fix.

Signed-off-by: Yestin Sun <sunyi0804@gmail.com>
Upstream-commit: 67df8e4257c165bc6abe77bb8f4ab55c10b2fbff
Component: engine
 2015-04-13 21:46:14 -07:00
Arnaud Porterie fc9842cd3d Merge pull request #12353 from sunyuan3/duplicate 
duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunni...
Upstream-commit: 00eddf5e6718bca6fd011014d0acfbf71a84ac2c
Component: engine
 2015-04-13 17:48:53 -07:00
Jessie Frazelle afa485daa3 Merge pull request #12345 from kostickm/12324-add-detection-f2fs-jfs-filesystem 
Add detection for F2Fs and JFS
Upstream-commit: f68ad63496aefb3d4c4c457bfbb113296b14e234
Component: engine
 2015-04-13 17:32:47 -07:00
Yuan Sun bb0567addc duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunningContainer 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: b85ade79d5a2cceb926fcae13997a6dfa28be4bc
Component: engine
 2015-04-14 08:32:25 +08:00
Brian Goff c7a9533eb2 Merge pull request #12351 from jfrazelle/fix-test-daemon-with-wrong-key-messing-up-builds 
cleanup daemon tests
Upstream-commit: b93d3f876814b23b2b7934783b02d40c0b3f6ca1
Component: engine
 2015-04-13 20:31:41 -04:00
Sven Dowideit 5ed1c63736 Merge pull request #11920 from SvenDowideit/flesh-out-docker-hub-automated-builds-docs 
Researching Docker Hub account linking and automated builds details
Upstream-commit: e8a7e762839ae8a70f8bb6f25fded156bedc2277
Component: engine
 2015-04-14 10:31:21 +10:00
Sven Dowideit f0104588db Researching Docker Hub account linking and automated builds details 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: a55f8e1ce734035a77cc13d1e2f42dbef41d418e
Component: engine
 2015-04-14 10:29:55 +10:00
Megan Kostick 81dfdc7b63 Add detection for F2Fs and JFS 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>

Alphabetize FSMagic list to make more human-readable.

Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: 7e2d05b4938c010bf15224bd2857e2dca92ec9b3
Component: engine
 2015-04-13 17:01:43 -07:00
Jessie Frazelle 99af06daa4 Merge pull request #12349 from calavera/patch-1 
Fix JSON format in the remote api configuration examples.
Upstream-commit: 24df333fa555bc3768bf6509f06e306bf11b835f
Component: engine
 2015-04-13 16:59:12 -07:00
Jessica Frazelle ce3584d9d7 cleanup test wrong key.json leading to other failures 
wait for container to be running before trying to kill it in daemon tests

Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 9a87553e4fc6c0abdd298893deefc44050208dda
Component: engine
 2015-04-13 16:58:44 -07:00
David Calavera b524d0385e Fix JSON format in the remote api configuration examples. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d71c929d081c2fb7c33b36ae5db40014163f9b6c
Component: engine
 2015-04-13 16:12:00 -07:00
Michael Crosby e41b731dd5 Merge pull request #12166 from cpuguy83/remove_err_when_volume_exists 
Don't return error when adding existing volume
Upstream-commit: 7ecf4e5d4dfbb0c9adcdea65f51d40fd6d4a1f43
Component: engine
 2015-04-13 14:15:48 -07:00
Michael Crosby 6165959ea5 Merge pull request #12025 from coolljt0725/add_exec_with_user 
Add docker exec run command as a different user and in privileged mode
Upstream-commit: 12f7db18309950785e873119edb03e0a1621e7a3
Component: engine
 2015-04-13 13:50:51 -07:00
Michael Crosby d6a743bd91 Merge pull request #12044 from reteptilian/11721-remove-randomstring-3 
fixes 11721 replace stringutils.GenerateRandomString with stringid.GenerateRandomID
Upstream-commit: b5c3d01e6b5d06ba3e477a71acf92ec564b279e6
Component: engine
 2015-04-13 13:47:50 -07:00
Brian Goff 1b83890462 Don't return error when adding existing volume 
Error wasn't really doing anything except for making a bunch of extra
debug logs.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 579c9ec1d07983edf423d8c7564840d2fcc6f303
Component: engine
 2015-04-13 16:45:35 -04:00
Michael Crosby 8259affad5 Merge pull request #12111 from tianon/builder-deb 
Add "builder-deb" base images for building ".deb" packages properly
Upstream-commit: 8652ca5d5f56590651e7500b097566083bb1a0da
Component: engine
 2015-04-13 13:41:17 -07:00
Michael Crosby 483871b67f Merge pull request #12172 from ZJU-SEL/change_stats 
change memory usage display
Upstream-commit: 6fa2a1e486797c1aa151e242902bed716347850f
Component: engine
 2015-04-13 13:32:45 -07:00
Michael Crosby 58a255f72b Merge pull request #12287 from calavera/check_memory_swap_when_disabled 
Log memory swap capabilities properly.
Upstream-commit: 3d424ead3baa489380faca50d433a80b91df527e
Component: engine
 2015-04-13 13:19:52 -07:00
Evan Hazlett c70c4ed8f3 Merge pull request #12204 from yestin/11601-supplement-tests-part-1 
Improve test accuracy for pkg/chrootarchive (part 1)
Upstream-commit: b6e64981e655d1c0cdd3778d4d9fad0caca6e08a
Component: engine
 2015-04-13 16:14:18 -04:00
Alexander Morozov b2386cf473 Merge pull request #12341 from jfrazelle/add-vet-script 
Add vet script
Upstream-commit: e961f7da6705500502a772bbfbc6c1196556673d
Component: engine
 2015-04-13 13:13:56 -07:00
Michael Crosby 20c653370b Merge pull request #12222 from chenhanxiao/cp-support-colon 
cp: add support for copy filename with ":"
Upstream-commit: 75b911eb3cb12e4c4d86fd42aa12bc71458f77b1
Component: engine
 2015-04-13 13:09:12 -07:00
Evan Hazlett 64a92fd92c Merge pull request #12262 from YanFeng-Adam/daemon 
A wrong key.json would remain if the TestDaemonwithwrongkey case fails. The issue would lead to failure of other cases.
Upstream-commit: 6b40377c189e77bcaf688e2b6a6f628a6dfe6927
Component: engine
 2015-04-13 16:00:20 -04:00
Michael Crosby 31603a5780 Merge pull request #12342 from LK4D4/fix_vet_warn 
Fix vet warning
Upstream-commit: afd973c4971ee2bed4c943cf08d6e7ef19dd8501
Component: engine
 2015-04-13 12:56:47 -07:00
Jessica Frazelle 73aea16588 change tabs to spaces 
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: f3ba0a6a3505f5c5c690b84a4db2255fea9af18f
Component: engine
 2015-04-13 12:48:40 -07:00
bobby abbott ddcc756587 Adds validate-vet script 
resolves #11970

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
Upstream-commit: 3280ce651b13866f93440b60a9182f9a4f9f14b9
Component: engine
 2015-04-13 12:48:05 -07:00
David Calavera 7e81577a52 Log memory swap capabilities properly. 
Check whether the swap limit capabilities are disabled or not only when memory swap is set to greater than 0.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 7523beff41eca212794e902afa1a614b2672e245
Component: engine
 2015-04-13 11:56:59 -07:00
Evan Hazlett 9c2d3bf645 Merge pull request #12340 from crosbymichael/syslog-tags 
move syslog-tag to syslog.New function
Upstream-commit: 82256c2a54ec5b9aa822ab2130439c7f87591c16
Component: engine
 2015-04-13 14:51:00 -04:00
Evan Hazlett e120033d69 Merge pull request #12275 from LK4D4/pid_host_hell 
Get process list after PID 1 dead
Upstream-commit: 05433a4dabeb7204d6925606549ba79022f506d6
Component: engine
 2015-04-13 14:50:23 -04:00
Evan Hazlett 6d9355e11c Merge pull request #12276 from estesp/10246-really-fix-arg-list 
Send archive options via pipe in chrootarchive
Upstream-commit: 9e0a55b48c019d0ca61e3f74d3b41f621f16ab48
Component: engine
 2015-04-13 14:44:47 -04:00
Alexander Morozov 710e6abbd8 Fix vet warning 
pkg/archive/archive_test.go:496: arg changes for printf verb %s of wrong type: []archive.Change

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 213eab995a3e6dcdb69b587301cc5008911e3dfe
Component: engine
 2015-04-13 11:43:30 -07:00
James Turnbull c2b4ff382f Merge pull request #12228 from bboreham/12022-signal-doc 
Add a note about PID 1 not terminating automatically on signal
Upstream-commit: e29dcd91bdd25caf4905c755225a528a83ac7f88
Component: engine
 2015-04-13 14:41:07 -04:00
Evan Hazlett dadf36eca6 Merge pull request #12293 from hqhq/hq_use_hostconfig 
use hostConfig in verifyDaemonSettings
Upstream-commit: a8e095b243355454d7f8269ad267f2d581fd52ac
Component: engine
 2015-04-13 14:34:35 -04:00
Evan Hazlett ff2ef2c440 Merge pull request #12300 from johngossman/master 
Added some error messages and tracing to bridge network initialization
Upstream-commit: 3434f64827dc5e69afa7161a9da24a9117e7990a
Component: engine
 2015-04-13 14:32:56 -04:00
Evan Hazlett 97f1b60257 Merge pull request #12301 from ewindisch/https_links 
Use HTTPS links for URLs in READMEs / comments / docs
Upstream-commit: 3509132a6e28caa18003298521c58746f490b57b
Component: engine
 2015-04-13 14:30:53 -04:00
Deng Guangxing 73f3660a47 move syslog-tag to syslog.New function 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 4f91a333d5c9d66ce109c36e7261dbfd3382ebbf
Component: engine
 2015-04-13 11:24:18 -07:00
Jessie Frazelle aba71456ee Merge pull request #12049 from tianon/bundles-latest 
Add "bundles/latest" symlink
Upstream-commit: 85f1410a5a46988df0ff0c88d418a4ec0de37064
Component: engine
 2015-04-13 11:11:38 -07:00
Michael Crosby efb09d9d6f Merge pull request #12264 from Mashimiao/add-event-log-for-push 
Add event log for push
Upstream-commit: 38761bda79ee9c9c9b9fdb9514b159cda52d7562
Component: engine
 2015-04-13 11:03:09 -07:00
Michael Crosby 6c72e654c8 Merge pull request #12325 from hqhq/hq_fix_build_test 
fix build test by adding --no-cache
Upstream-commit: 0e46cc9be49f741b873cf1016cfd66b258947ffb
Component: engine
 2015-04-13 10:57:19 -07:00
Michael Crosby 6dab9dbe67 Merge pull request #12291 from coolljt0725/add_cfs_bandwidth_to_check_config 
Add CFS_BANDWIDTH to check-config
Upstream-commit: 76eeb5d777ab0e8138229d10ae2e0dfe4fed2cf4
Component: engine
 2015-04-13 10:55:31 -07:00
Michael Crosby e7ca25cd17 Merge pull request #12297 from vdemeester/11603-pkg-archive-test-coverage 
Add test on archive.go (#11603)
Upstream-commit: 5a174e5def446e2ea299aed3ebd41f8b949534ad
Component: engine
 2015-04-13 10:54:21 -07:00
Michael Crosby b0feac3b88 Merge pull request #12338 from LK4D4/fix_compile_integr_cli 
Fix errors due changed sockRequest signature
Upstream-commit: c19bee4fb0a45af7120bb51b345eb42e612b983d
Component: engine
 2015-04-13 10:50:38 -07:00
Alexander Morozov ab385b72f9 Fix errors due changed sockRequest signature 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 27fccdbabb277e29488de88f9af2e7b83af93132
Component: engine
 2015-04-13 10:30:07 -07:00
Michael Crosby 5fcbf06557 Merge pull request #12331 from coolljt0725/fix_panic_release_nil_interface 
Fix daemon panic when release a nil network interface
Upstream-commit: 9a0a4ac02f92f9fb21b88b9aeced103a0e5e3c4d
Component: engine
 2015-04-13 10:13:57 -07:00
Michael Crosby 05674d127e Merge pull request #12320 from runcom/fix-api-resize-exec-resize 
fix api server resize&execResize
Upstream-commit: 6f928be7ef7d8610875e860e72433dc2477b1c5d
Component: engine
 2015-04-13 09:59:11 -07:00
Michael Crosby ccda6c3ec6 Merge pull request #12279 from runcom/remove-job-commit 
Remove job from commit
Upstream-commit: 33e83d05813207247ffcd0be0ccf6a6a7ad25b64
Component: engine
 2015-04-13 09:57:54 -07:00
Tianon Gravi cf01843925 Add "bundles/latest" symlink 
This is a symlink to the latest "bundle" that was assembled.  For example, if `VERSION` is currently `1.5.0-dev`, then `bundles/latest` will be a symlink to `bundles/1.5.0-dev` after an attempted build.

One interesting property of this is that after a successful `binary` build, we can `./bundles/latest/binary/docker -v` and get back something like `Docker version 1.5.0-dev, build 3ff6723-dirty`.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: d42753485b71f5f26b682a187d1963ef138cd0ab
Component: engine
 2015-04-13 10:54:17 -06:00
Bryan Boreham 426bfa8e61 Add a note about PID 1 not terminating on SIGINT/SIGTERM. 
Also re-arranged the description of CTRL-c to make it clearer.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: 5ad15479a0f3ce804a44a6931b716b0fae22ac6d
Component: engine
 2015-04-13 17:39:38 +01:00
Brian Goff b802ea45ca Merge pull request #12312 from runcom/remove-job-container-stats 
Remove job from container stats
Upstream-commit: 12eff0c26f9d7fb5f0b1f1cbb975b8892c2dc306
Component: engine
 2015-04-13 11:58:31 -04:00
Brian Goff 0118377dec Merge pull request #12313 from runcom/remove-job-export 
Remove job from export
Upstream-commit: a4f98d32258b8e209ab2702f0d0a092a7ffe15a2
Component: engine
 2015-04-13 11:57:55 -04:00
Alexander Morozov 416e9ff40b Merge pull request #12304 from runcom/remove-job-logs 
Remove job from logs
Upstream-commit: bfb487dc50e3b88b520678a9118bfb95891140cb
Component: engine
 2015-04-13 08:38:46 -07:00