Commit Graph

13602 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
4d5d362d48 Merge pull request #12314 from runcom/remove-engine-links
Remove engine from links
Upstream-commit: 9c48f6d9a5fd7e321b3fa7b885fdb80d84609520
Component: engine
2015-04-13 11:27:13 -04:00
fb91cdcdf3 Merge pull request #12326 from xiaods/issure-12316
correct pkg/stdcopy NewStdWriter function comments
Upstream-commit: 871f4cdccbb39f59c383c96cd2db49ab1850635f
Component: engine
2015-04-13 09:39:34 -04:00
ebe83bc94c Remove job from export
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 6b737752e342e30dd20417b18c92c9b4e1c4f8da
Component: engine
2015-04-13 15:27:45 +02:00
0d56f45991 Fix typo in testcase
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 1567cf2cdf07bcbafbb1555fd950f5c5ce7a1c66
Component: engine
2015-04-13 23:09:07 +08:00
a75ea8c667 Fix daemon panic when release a nil network interface
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 8b3548129220a8c79342a12717d87667927df4c9
Component: engine
2015-04-13 20:24:10 +08:00
34cad7f622 correct pkg/stdcopy NewStdWriter function comments
pkg/stdcopy NewStdWriter function has wrong doc comment,
utils is not correct, it should be stdcopy

Signed-off-by: Deshi Xiao <xiaods@gmail.com>
Upstream-commit: a715b0e31beabed9ac5702af2ede619b4232cbdb
Component: engine
2015-04-13 17:21:27 +08:00
4ee5160b6e fix build test by adding --no-cache
Testcase TestBuildResourceConstraintsAreUsed run build without
--no-cache, so if you run this test twice, it will fail the
second time.
TESTFLAGS='-v -run ^TestBuildResourceConstraintsAreUsed$' ./hack/make.sh binary test-integration-cli
[PASSED]
TESTFLAGS='-v -run ^TestBuildResourceConstraintsAreUsed$' ./hack/make.sh binary test-integration-cli
[FAIL]
Because we'll use cID to inspect field and will get empty cID
if we have cache.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: c49cc1f2fbd3d0256455750c885eadcaa3d17937
Component: engine
2015-04-13 16:24:49 +08:00
83596c55e6 fix api server resize&execResize
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 3341f3a3554524f0f5e6114dfa0ed988713803ef
Component: engine
2015-04-13 08:42:12 +02:00
b2c60bfa72 Remove jobs from stats
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 65a056345cec1b85bd41ed70ee814894709ee6c0
Component: engine
2015-04-13 08:33:53 +02:00
b3c5a7d38d Remove job from logs
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 91bfed604959c591a076c2e330cb3ded7443f504
Component: engine
2015-04-13 08:25:31 +02:00
0a6b6476fe Add event log for push
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: f5a07f0c884fc6d4fa7882cd8d07319c9bcfba1c
Component: engine
2015-04-13 09:41:15 +08:00
1c3dec21dc More review feedback addressed
Signed-off-by: John Gossman <johngos@microsoft.com>
Upstream-commit: 80e9f6f83856b8e762f030d5e562f9e9f8d17233
Component: engine
2015-04-12 16:26:37 -07:00
91af3b1937 Addressed feedback. Will squash after further review
Signed-off-by: John Gossman <johngos@microsoft.com>
Upstream-commit: 4ce19da739ccdb8337c59f841e790255d21c6f50
Component: engine
2015-04-12 15:49:29 -07:00
b706b2d562 Remove engine from links
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 7560018541192ebdfe16e39515f9a04b44635d84
Component: engine
2015-04-12 16:25:10 +02:00
6b4495dbae Merge pull request #12305 from runcom/remove-job-exec-inspect
Remove job from execInspect
Upstream-commit: a54fd325e6bd0c5a1c298deef48399fe6e59aa33
Component: engine
2015-04-12 08:30:38 -04:00
d05177503f Remove job from stop
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 04cc6c6aa4f8ea656d23268b7bff0136e4fc6c8d
Component: engine
2015-04-12 00:41:16 +02:00
62d48e6c18 Remove job from execInspect
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 621ee1f6a4cbc8ee8758ce77a0cf6215c88f12f7
Component: engine
2015-04-12 00:15:34 +02:00
2f631c4832 Add test on archive.go (#11603)
- Trying to add or complete unit test to each ``func``
- Removing dead code (``escapeName``)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c4fe5dad1deb45ecde460d7627523dbf032dc205
Component: engine
2015-04-11 23:21:37 +02:00
aeebc69e43 Added some error messages and tracing to bridge network initialization
Signed-off-by: John Gossman <johngos@microsoft.com>
Upstream-commit: a9843cb739bd30a9e6eeb8841f645008e1fc905f
Component: engine
2015-04-11 11:15:24 -07:00
46973ec46d HTTPS urls for ./project
Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: 5dc83233bc41fa4d8189aec6ce0327b06038c9b5
Component: engine
2015-04-11 13:58:09 -04:00
589be08227 HTTPS URLs for docs top-level & man pages
This updates all of docs outside of sources.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: ac65c8c3801385c8278e0740ef2738b0aa56689a
Component: engine
2015-04-11 13:43:26 -04:00
edf0b6037a Link to HTTPS urls in contrib comments/maintainers
Updates comments and dockerfile maintainer lines
to use HTTPS urls where applicable.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: df9ee6d6563ace6e382a3bdd4a45b38756a76afb
Component: engine
2015-04-11 13:35:08 -04:00
0551904b7c Link to HTTPS URLs in engine comments
Updates most of the instances of HTTP urls in the engine's
comments. Does not account for any use in the code itself,
documentation, contrib, or project files.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: ca37301d54e1525d4522dea266180072d4fd892b
Component: engine
2015-04-11 13:31:34 -04:00
428585dc12 HTTPS urls for ./hacking
Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: 723d43387a5c04ef8588c7e1557aa163e268581c
Component: engine
2015-04-11 13:22:16 -04:00
edaf94ae65 Use HTTPS for package URL
Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: 67a983fc372e7b5fd1c75d1ceafe9b79b84d7e92
Component: engine
2015-04-11 13:21:16 -04:00
87bd2b1fd6 Link to HTTPS URLs
Link to HTTPS URLs in top-level documentation / project files.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: 787d774af0eb26aed16cbf24896e4ba051ba4538
Component: engine
2015-04-11 13:18:57 -04:00
6fd02194d0 Merge pull request #12289 from sunyuan3/docker_remote_api
update docker_remote_api_v1.19.md
Upstream-commit: e3dd323336904c02aaf57a1ffe3dcc8cb666fc78
Component: engine
2015-04-11 09:27:36 -05:00
933c2653a0 Merge pull request #12288 from sunyuan3/ubuntu
update ubuntulinux.md
Upstream-commit: 6d8102466a2b6af569aaa4e12bb0c66b0ff3594a
Component: engine
2015-04-11 09:25:55 -05:00
dd126faafc update docker_remote_api_v1.*
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 4f492e794ae9c9a51edae4bb5873187eadab828e
Component: engine
2015-04-11 18:11:49 +08:00
884d515118 Merge pull request #12290 from yuchangchun1/typo
Fix a typo in TestVolumesFromGetsProperMode
Upstream-commit: e3c1cc8d77ea4be7d9e2c0041590a9da7d6920f6
Component: engine
2015-04-10 23:45:42 -04:00
0666a926f5 Add CFS_BANDWIDTH to check-config
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: d2d583c53b56a3ce069bf57ede9be9574c58a687
Component: engine
2015-04-11 11:39:47 +08:00
b7982a6499 Fix a typo in comment of parseMaybeJSONToList
Signed-off-by: Yu Changchun <yuchangchun1@huawei.com>
Upstream-commit: 24dd8a4698315a4aafee5071f4fe4d74fa06c377
Component: engine
2015-04-11 10:34:21 +08:00
d555f3e70e 'docker rmi -f IMAGE_ID' untag all names and delete the image
If an image has been tagged to multiple repos and tags, 'docker
rmi -f IMAGE_ID' will just untag one random repo instead of
untagging all and deleting the image. This patch implement
this. This commit is composed of:

        *untag all names and delete the image

        *add test to this feature

        *modify commandline/cli.md to explain this

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: 795a58fb44a2bd18ec37d78c82d75c025f786c50
Component: engine
2015-04-11 09:24:21 +08:00
7bfb104972 update ubuntulinux.md
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: a8fddbdeae6dfb8f6366cc476b37c84ed49f2732
Component: engine
2015-04-11 08:58:23 +08:00
c6dc4ca317 Merge pull request #12274 from brahmaroutu/fix_gccgo_compilation
Unwanted declaration causing compilation issues with gccgo
Upstream-commit: 418195a4fb66d01e7fdf0ee236af3946fbe531b8
Component: engine
2015-04-10 20:22:45 -04:00