toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,707 Commits 3 Branches 295 Tags
2f63354a90786403347f4d93da1a1e91ed582997
Commit Graph
15707 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhu Venugopal 2f63354a90 Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201 
This version brings in upto-date important bug-fixes from libnetwork

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: a3d22c764cfc3e175cdfb992f3b2314f23540236
Component: engine
 2015-05-23 18:42:34 -07:00
Jessie Frazelle e579879a51 Merge pull request #13414 from tiborvass/no-distrib-in-dockerfile 
Remove distribution source code from /go/src
Upstream-commit: 4bcfa47362c4c168d12745676df50b5160b05f1a
Component: engine
 2015-05-22 15:11:36 -07:00
Tibor Vass 8db570e797 Remove distribution source code from /go/src 
We already vendor distribution under ./vendor, but
because the GOPATH is /go:/go/src/github.com/.../vendor
Go will always compile the source code at /go not in ./vendor.

Apart from the fact that it is very inconvenient during
development, it was also a time-bomb: someone vendors a fix
from upstream distribution, but forgets to update
REGISTRY_COMMIT in the Dockerfile, and the binary doesn't get
the fix.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 2b0b0c4b97596314b4b1d3960158cc4bcad4067b
Component: engine
 2015-05-22 16:50:56 -04:00
Jessie Frazelle 612ba0246f Merge pull request #13408 from jfrazelle/13407-fix-experimental-build 
lol 108 chars ETOOMANY
Upstream-commit: f2c0b5431576fb2c35b73ca855334bf2196061d0
Component: engine
 2015-05-22 10:42:57 -07:00
Michael Crosby ee469d3fb9 Merge pull request #13391 from jfrazelle/add-security-maintainers 
Add diogo and nathan as security maintainers.
Upstream-commit: ed9ad0be6d511c70686b7793cb5e6f6eefcf3969
Component: engine
 2015-05-22 10:12:04 -07:00
Jessica Frazelle d2b122f94a lol 108 chars ETOOMANY 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: a1ea562b20b36345be2048ea24130b48cf4ec734
Component: engine
 2015-05-22 10:10:17 -07:00
Alexander Morozov 79dd7c9a98 Merge pull request #13372 from calavera/move_socket_creation_to_package 
Extract sockets initialization to a package.
Upstream-commit: d71ba0cc832d3e94aab21e50e3ef7a710874ab79
Component: engine
 2015-05-22 08:46:31 -07:00
moxiegirl 3f5d7444b3 Merge pull request #13303 from moxiegirl/experimental-work 
Experimental features placeholder
Upstream-commit: 8e76c0d1d8b77b86d1131ca82a7034b985a26526
Component: engine
 2015-05-22 08:42:57 -07:00
Brian Goff 699a45f6f2 Merge pull request #13401 from WeiZhang555/cleanup 
Delete "defer deleteAllContainers()" from integration-cli
Upstream-commit: 0775456b469323a36db0fb96421ef3092bf7eba1
Component: engine
 2015-05-22 09:17:23 -04:00
Zhang Wei 5f3b2bdd4c Delete "defer deleteAllContainers()" from integration-cli 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 6809fa68614c6a22f61fc61ad63d80d573b07df6
Component: engine
 2015-05-22 17:01:52 +08:00
Brian Goff 0b16a9b9c3 Merge pull request #13399 from hqhq/hq_fix_run_test 
Fix test failure when --net none build
Upstream-commit: 23e8dff9e7d06de09a17dd3174f8cf26d2067eb4
Component: engine
 2015-05-21 21:50:44 -04:00
Brian Goff ab1e39f7d4 Merge pull request #12766 from Microsoft/10662-graphdriverrefactor 
Windows: graphdriver refactor
Upstream-commit: 88275e94d62896383b54209b5a8691ed3cffe122
Component: engine
 2015-05-21 21:28:24 -04:00
Jessica Frazelle adfc87193d Add diogo and nathan as security maintainers. 
Updated my email.

Also retabbed the whole file... I am OCD.

Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 7c6cab6345a7398ebc95048418f379d43e9a00fd
Component: engine
 2015-05-21 17:59:38 -07:00
Jessie Frazelle 3c9aadce7f Merge pull request #13386 from icecrime/experimental_suffix_version 
Suffix experimental version / fix warning output
Upstream-commit: 2b8271399e0871efd769a79b7ae43b2f51358a3a
Component: engine
 2015-05-21 17:42:23 -07:00
Qiang Huang f7e26caad3 Fix test failure when --net none build 
Closes: #13369

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: c0dd8538db070a055150a0da76d093d5d196ab42
Component: engine
 2015-05-22 08:21:09 +08:00
Arnaud Porterie b53e996e55 Add suffix to experimental builds version 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 78578125ce6c534253d8d60c242d6993c569449e
Component: engine
 2015-05-21 16:27:42 -07:00
Sven Dowideit 329dcd34ed Merge pull request #13395 from SvenDowideit/cs-docker-1.6.2cs5-release-notes 
Publish release notes for latest cs Docker engine
Upstream-commit: ddf783ed2fc4f6750daf5b2298b7684038b4d632
Component: engine
 2015-05-22 09:16:12 +10:00
Sven Dowideit d5d48e47c8 Publish release notes for latest cs Docker engine 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 740b1b5a2d89ef8d2c4c606636e5b42234298734
Component: engine
 2015-05-22 09:14:06 +10:00
Sebastiaan van Stijn d60fe719f4 Merge pull request #13336 from calavera/document_missing_build_flags 
Document missing build flags.
Upstream-commit: b639f00280d974f4c8c3e1ced18afd5173a1f4e3
Component: engine
 2015-05-22 01:03:37 +02:00
Jessie Frazelle 21792a8e30 Merge pull request #13393 from tiborvass/fix-token-bug 
registry: Fix auth bug
Upstream-commit: 6c5a140f8a4470c45f3a9302c00c398b75c23549
Component: engine
 2015-05-21 15:58:17 -07:00
David Calavera a0524deeed Merge pull request #12964 from Microsoft/10662-emptywindowsexecdriver 
Windows: Empty Windows Exec Driver
Upstream-commit: 2be757f8696a2df6b02b153db15ea4f6d756c02a
Component: engine
 2015-05-21 15:30:21 -07:00
David Calavera 50f6b1411a Document missing build flags. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: a85b09d8a40456fb5f3b72b7b1999cd9df08c082
Component: engine
 2015-05-21 15:02:00 -07:00
Tibor Vass ebafe2bed3 registry: fix auth bug 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: fc29f7f70b34ae11e1084a66cf401ff11b4573e7
Component: engine
 2015-05-21 16:53:22 -04:00
Alexander Morozov 522037006a Merge pull request #13387 from cpuguy83/fix_ngroutine_test 
Better checking for LogsFollowGoroutinesWithStdout
Upstream-commit: 7fffcfff32ce6c4379f3b90a1570847b06d75a8c
Component: engine
 2015-05-21 12:31:57 -07:00
Brian Goff 97013d9e36 Better checking for LogsFollowGoroutinesWithStdout 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2805ff1ecee7cd850a08a00ee9448b54beb4032b
Component: engine
 2015-05-21 14:13:01 -04:00
Michael Crosby 8e905a0abb Merge pull request #13371 from theadactyl/patch-2 
Add theadactyl as community manager
Upstream-commit: 523d2f6a04d59883d0a45c177209e04729a4daa6
Component: engine
 2015-05-21 11:06:38 -07:00
David Calavera 832c917cec Merge pull request #13380 from coolljt0725/add_missing_check_return_err_function 
Add missing return error check for container.WriteHostConfig() in container_linux.go
Upstream-commit: 00e78a18ba56970cdb213f41f98fba04c4c7b84b
Component: engine
 2015-05-21 09:32:52 -07:00
David Calavera 397e4d3e91 Merge pull request #13383 from duglin/CreateRMTest 
Add a 'docker create' + 'docker rm' testcase
Upstream-commit: 0ac5e8a1709b09f311f9032c7e139b66ce0bccb5
Component: engine
 2015-05-21 09:32:32 -07:00
Doug Davis aa89cbdb44 Add a 'docker create' + 'docker rm' testcase 
Per @thaJeztah's comment here: https://github.com/docker/docker/pull/13367#issuecomment-104286651
I couldn't find an existing test that covered this.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 012e588a744ce3000d58a7562a1a8291a7fe10ae
Component: engine
 2015-05-21 07:30:51 -07:00
Lei Jitang aee8d65658 Add missing return error check 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: a9bc05a2f8e0978f47473b07b43d79692cf498bc
Component: engine
 2015-05-21 17:03:43 +08:00
Jessie Frazelle a90378a2ea Merge pull request #13310 from coolljt0725/make_ps_size_show_virtual_size_work 
Make docker ps --size show virtual size really work
Upstream-commit: ef0a14559332f443a0f111dd22a43b13de3aa967
Component: engine
 2015-05-20 18:32:11 -07:00
Mary Anthony 19664cd1d4 Experimental features placeholder 
Signed-off-by: Mary Anthony <mary@docker.com>

Adding experimental features into the mix

Signed-off-by: Mary Anthony <mary@docker.com>

renaming file

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7231692a02ee6346b051a00fde153675e0a9a771
Component: engine
 2015-05-20 18:10:07 -07:00
Lei Jitang 986a53d09e Make docker ps --size show virtual size really work 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: d0de2b1e2f0939b25c83183f450c71b8309d1d32
Component: engine
 2015-05-21 08:57:11 +08:00
Jessie Frazelle 3ad2c8df4b Merge pull request #13326 from tianon/squeeze-lts 
Fix "squeeze" detection in contrib/mkimage/debootstrap
Upstream-commit: 366fe46c6a6e604329711a9edbe21f0c6fe31fc9
Component: engine
 2015-05-20 17:41:27 -07:00
Tianon Gravi 6ccd65f901 Merge pull request #13195 from albers/completion-custom-host 
respect -H in bash completion
Upstream-commit: f74d9b8672df985e18f5a1d0b54c6d38618e9b11
Component: engine
 2015-05-20 17:31:16 -07:00
Jessie Frazelle f1ceb1ec3a Merge pull request #13270 from samsabed/gpg-dockerfile 
Trivial use port 80 for dev Dockerfile gpg
Upstream-commit: c68915ff7072a03b59deb4cf0f4af20d0bb382be
Component: engine
 2015-05-20 17:30:01 -07:00
Tianon Gravi 1c051ef581 Merge pull request #13241 from hqhq/hq_enhance_checkconfig 
Enhance check-config.sh
Upstream-commit: 28465588d07fe9c37573dec52939d44b115db6ee
Component: engine
 2015-05-20 17:25:30 -07:00
David Calavera 7811ce8b6f Extract sockets initialization to a package. 
Because I just used it somewhere else and it would be nice if I didn't have to copy and paste the code.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0bfbc6e78823fc2f455b01a02721f17bcbcaecff
Component: engine
 2015-05-20 16:48:39 -07:00
theadactyl 60c6ee21a9 Add theadactyl as community manager 
Added Community Manager role to Org.Operators and added theadactyl as community manager

Signed-off-by: Thea Lamkin <thea@docker.com>
Upstream-commit: f86d39c6b6f4945afd80dbfcdd0c623b9c71cfb8
Component: engine
 2015-05-20 16:21:36 -07:00
moxiegirl 7e35f8d0a4 Merge pull request #13366 from moxiegirl/162-release-notes 
Updating with 1.6.2-cs5 notes
Upstream-commit: 2bf409d4eff3836dd4cc82bc8cb656af2a2dd63d
Component: engine
 2015-05-20 15:03:27 -07:00
Mary Anthony 4a24c72f56 Updating with 1.6.2-cs5 notes 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7554949da654fb55dd1bccc3308ef12c013a16d5
Component: engine
 2015-05-20 14:39:00 -07:00
Antonio Murdaca 850c8c5ac2 Merge pull request #13263 from rajdeepd/dry-run-test-2 
TestCase for CpuShares and Cpuset
Upstream-commit: 0fddb6ad7e2505a8c1a2c8273ddc97573256e372
Component: engine
 2015-05-20 23:33:42 +02:00
Jessie Frazelle 0a8a3b1dc5 Merge pull request #13338 from icecrime/13023_experimental_env_var 
Add DOCKER_EXPERIMENTAL environment variable
Upstream-commit: 19790c46dc7fbd489bbd4ccd6f138663312e7579
Component: engine
 2015-05-20 13:04:28 -07:00
Arnaud Porterie 90e040bb15 Merge pull request #13078 from Microsoft/10662-pkgarchive 
Windows: Archive package changes for Windows daemon
Upstream-commit: 79532e6d5897516b955fd258060fc34a6dfa86f9
Component: engine
 2015-05-20 12:39:26 -07:00
Arnaud Porterie 045dd55a7d Add DOCKER_EXPERIMENTAL environment variable 
The DOCKER_EXPERIMENTAL environment variable drives the activation of
the 'experimental' build tag.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: ca6722f1c5e4e2017a71e33579d91ac0d9ea2a25
Component: engine
 2015-05-20 12:21:17 -07:00
Alexander Morozov 673769117b Merge pull request #13346 from mrjana/cnm_integ 
Fix network connectivity problem for non-root users
Upstream-commit: dec13cef2a6600f01158668a9a31ba0d976b5f5f
Component: engine
 2015-05-20 12:02:07 -07:00
Jessie Frazelle a4089aa4e2 Merge pull request #13359 from davidxia/increase-docker-kill-timeout 
Increase upstart kill timeout to 20 seconds
Upstream-commit: 76a5fb3e1e329bf38ee6aca29bbe6f3b1b8188c6
Component: engine
 2015-05-20 11:54:07 -07:00
Rajdeep Dua 56af424158 TestCase for CpuShares and Cpuset 
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
Upstream-commit: ebe344d34b9d708b3634c2e17929cae1abb61ae8
Component: engine
 2015-05-20 11:32:48 -07:00
David Xia f3325976cc Increase upstart kill timeout to 20 seconds 
Give Docker more time to kill containers before upstart kills Docker.
The default kill timeout is 5 seconds.
This will help decrease the chance of but not eliminate the chance of
orphaned container processes.

Signed-off-by: David Xia <dxia@spotify.com>
Upstream-commit: 2f9e7a067a7273a0f344c1c9a6397e4bb61d7554
Component: engine
 2015-05-20 14:20:46 -04:00
Alexander Morozov baf6ea6d24 Merge pull request #13324 from duglin/BadRCOnVersion 
Make version check return 400 instead of 404
Upstream-commit: 53a795378ddb092fc6da8c05ff442f5ed52b7bdb
Component: engine
 2015-05-20 11:13:56 -07:00