toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,834 Commits 3 Branches 295 Tags
8d306cf8a5a183f8a20fb7b18c0841b453cdf256
Commit Graph
15834 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Arnaud Porterie f077c776e0 Merge pull request #13265 from tiborvass/refactor-v1-auth 
registry: Refactor requestfactory to use http.RoundTrippers
Upstream-commit: a16b2ab274e076b019e8af4dfb50491d69917e77
Component: engine
 2015-05-19 09:57:34 -07:00
Tianon Gravi 99a0162895 Fix "squeeze" detection in contrib/mkimage/debootstrap 
This stops us from erroneously adding "squeeze-lts" to "oldstable" which is now "wheezy", not "squeeze" (but "oldoldstable" _is_ squeeze, hence the new check on `/etc/debian_version` being `6.*` instead, and done as a `case` for the eventual addition of `wheezy-lts`, etc).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: c64466fb68c1ef204b8dc0759da62398a3372732
Component: engine
 2015-05-19 09:38:27 -07:00
Alexander Morozov 7ad625cdc4 Merge pull request #13258 from unclejack/fix_build_network 
builder/internals: set up network as bridge
Upstream-commit: ea4f43c2fa7a935e041a0b66dc9151d2474c6f18
Component: engine
 2015-05-19 09:36:03 -07:00
Alexander Morozov 8911352f54 Fix Put without Get in overlay 
It is called for example on daemon start after crash

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3916561619d45a3d8ca17dfa467149824111023a
Component: engine
 2015-05-19 09:32:23 -07:00
moxiegirl 881a75dcdf Merge pull request #13238 from hqhq/hq_fix_usingdocker_md 
Remove wrong usage in usingdocker.md
Upstream-commit: 6f4b808f415bd762a1090215cc73f66f49e52845
Component: engine
 2015-05-19 09:24:31 -07:00
Alexander Morozov 97eed14aa5 Merge pull request #13311 from WeiZhang555/cleanup 
clean some redundant else clauses
Upstream-commit: 29595fd944012018706a22869f20adb233735baa
Component: engine
 2015-05-19 07:57:52 -07:00
Qiang Huang 82047fce6d Remove wrong usage in usingdocker.md 
Fixes: https://github.com/docker/docker/issues/13235

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: f46cf7329507351e107e3a84132f14ed02dc163b
Component: engine
 2015-05-19 13:07:41 +08:00
Tibor Vass 04b3252768 Add transport package to support CancelRequest 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 73823e5e56446b23ce01bb8e44a9670ab2552b0a
Component: engine
 2015-05-18 23:31:42 -04:00
Zhang Wei 6da53b0de7 clean some redundant else clauses 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: d91ae65280c789307ec67fff7e2d268afe3aeba7
Component: engine
 2015-05-19 10:54:04 +08:00
Mingzhen Feng 2d7bfa2f2c Removal of the regex to replace ips 
Signed-off-by: Mingzhen Feng <fmzhen@zju.edu.cn>
Upstream-commit: 3ab7ceb5d7aaa5fc04af98aae4115201ebae13ee
Component: engine
 2015-05-19 10:15:18 +08:00
Jason Shepherd 843afe9ea1 adding nicer help when missing arguments (#11858) 
Signed-off-by: Jason Shepherd <jason@jasonshepherd.net>
Upstream-commit: 48231d623fb08eff9da589d6690b10a464df4ec5
Component: engine
 2015-05-19 12:02:13 +10:00
Tibor Vass a10bf833ac requestdecorator: repurpose the package and rename to useragent 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: cf8c0d0f56021fbea7bc89e378bb937b53aeca3b
Component: engine
 2015-05-18 21:51:54 -04:00
Tibor Vass 14d2347fac registry: Refactor requestfactory to use http.RoundTrippers 
This patch removes the need for requestFactories and decorators
by implementing http.RoundTripper transports instead.

It refactors some challenging-to-read code.

NewSession now takes an *http.Client that can already have a
custom Transport, it will add its own auth transport by wrapping
it.

The idea is that callers of http.Client should not bother
setting custom headers for every handler but instead it should
be transparent to the callers of a same context.

This patch is needed for future refactorings of registry,
namely refactoring of the v1 client code.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: a01cc3ca7729c3ce635fef7c1db837b5c6ae1028
Component: engine
 2015-05-18 21:51:53 -04:00
Doug Davis 038196ed40 Merge pull request #13219 from brahmaroutu/gccgo_compile_issue 
fix to gccgo compilation error
Upstream-commit: 472538bee00d0c665ed43ff1a3db7531a8e28d65
Component: engine
 2015-05-18 20:43:47 -04:00
moxiegirl a7fe46a565 Merge pull request #13189 from alvinr/mongodb-fixup 
Fixup MongoDB changes to line up with MongoDB 3.0 release
Upstream-commit: 6a18412d5b9c9fae7d7f3ab13eab44e0e4906124
Component: engine
 2015-05-18 15:22:41 -07:00
Doug Davis 96e731b1e3 Merge pull request #13308 from lightsofapollo/issue-13307 
Increase default connection timeout to 30s
Upstream-commit: dfc329d76a8751b8df1130f030e7ff11c8cee071
Component: engine
 2015-05-18 18:01:00 -04:00
James Lal 7f04f5c4bf Increase default connection timeout to 30s 
Closes #13307
Signed-off-by: James Lal <jlal@mozilla.com>
Upstream-commit: f5e6f50a1ef193c1f3f5736829a0284c8f96a661
Component: engine
 2015-05-18 13:26:33 -07:00
Alvin Richards e1c50ccb66 Bring MongoDB examples up to date with 3.0 release 
Signed-off-by: Alvin Richards <alvin.richards@docker.com>
Upstream-commit: 3f37afe0b98919b91bffb0f90abe2d25a5ead989
Component: engine
 2015-05-18 13:08:31 -07:00
Michael Crosby 2b5ebf7133 Merge pull request #13282 from duglin/RemoveBash 
Remove use of 'bash' from our tests
Upstream-commit: aac645ae047601fed1550c9d59d7c8ea978203b0
Component: engine
 2015-05-18 13:06:21 -07:00
Brian Goff 1ea64dbe6e Merge pull request #13279 from hqhq/hq_use_inspectfield 
Use inspectField to simplify code
Upstream-commit: ccf02a9f77be7732f65fe435281cea192e6abcad
Component: engine
 2015-05-18 14:53:37 -04:00
Michael Crosby 073f78693b Merge pull request #13204 from chenhanxiao/gitignore 
gitignore: add *.rej
Upstream-commit: 785ba790fbd6082052cec1704fe8e7e09ba89a4d
Component: engine
 2015-05-18 11:51:06 -07:00
Tianon Gravi 984dd795a4 Merge pull request #13244 from hqhq/hq_update_vendor_pty 
kr/pty: vendor upstream 5cf931ef8f
Upstream-commit: 0c375a779ab076c8f6a4f76071e5feab60e15714
Component: engine
 2015-05-18 11:46:43 -07:00
Brian Goff 7113b757dc Merge pull request #13277 from runcom/restartpolicy-methods 
RestartPolicy methods instead of strings checking
Upstream-commit: 3b69ca5b97a937c904b8af91210af86de58f6893
Component: engine
 2015-05-18 14:36:54 -04:00
Michael Crosby edeb4ed190 Merge pull request #13249 from coolljt0725/fix_incorrect_document_of_storage_opt 
Fix incorrect document storage-opt
Upstream-commit: 70e9e4bf9f7901137483fb4c9635d8d3cf686328
Component: engine
 2015-05-18 11:35:01 -07:00
Doug Davis 7232d6b354 Remove use of 'bash' from our tests 
Not 100% sure why our Windows test don't complain about some of these,
I'm guessing it because we have bash as part of some git package, but
either way we really shouldn't require bash to run our tests unless we
really need to - which in these cases we don't

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3b1f73fbcd2ed938c499893f318467f14b63085a
Component: engine
 2015-05-18 11:29:08 -07:00
Michael Crosby 4ec571c859 Merge pull request #13295 from aimxhaisse/13294-mflag-panic 
Fix panic when using default-initialized FlagSet
Upstream-commit: fc4f3e5650493faed1e89bcf9a2a1a61c13dcd34
Component: engine
 2015-05-18 11:27:12 -07:00
Sebastiaan van Stijn 30a0089656 Merge pull request #13206 from draghuram/info_api_doc 
Bring /info API doc in line with the actual response.
Upstream-commit: 93825056d8de651e5cbfff9122144e892e988144
Component: engine
 2015-05-18 20:20:57 +02:00
James Turnbull ed62b6ffc8 Merge pull request #12804 from ankushagarwal/configuring-docker 
Add CentOS/RHEL configuration to the config article
Upstream-commit: 8f8ee7d5c3277a3d16556ddcbae40e12f36a154a
Component: engine
 2015-05-18 14:18:32 -04:00
Michael Crosby b1c2bb01ee Merge pull request #13280 from runcom/test-clean-from-inspect 
Clean tests from not needed inspect call
Upstream-commit: aca4ae8c90dc4ae87dec720ed58a69bec6dabab6
Component: engine
 2015-05-18 11:06:18 -07:00
Michael Crosby ce9a1d34cc Merge pull request #13306 from ahmetalpbalkan/logopts-context 
Pass --log-opts map to logdrivers
Upstream-commit: cbc122e8a77493c521f23e1d9c1ba49d9108467e
Component: engine
 2015-05-18 10:58:17 -07:00
Raghuram Devarakonda 61e72a4efb Bring /info API doc in line with the actual response. 
The fix handles versions 1.18 and 1.19.

Closes #13139.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
Upstream-commit: 9c0608565c93a31d6885842376e82a19db5a7af4
Component: engine
 2015-05-18 13:55:42 -04:00
Ahmet Alp Balkan bcf5956dfc Pass -log-opts map to logdrivers 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 8b11592d699df669b529e34658ef2d870c8a75f8
Component: engine
 2015-05-18 16:50:14 +00:00
Brian Goff ce99abf239 Merge pull request #13283 from Microsoft/10662-fixbaselinenewdriver 
Windows: NewDriver() re-baseline parms
Upstream-commit: 19ae59f9109d08452e37bdd6252fe8a053dd2839
Component: engine
 2015-05-18 10:56:06 -04:00
s. rannou 34e0bf8384 Fix panic when using default-initialized FlagSet 
Closes #13294

Signed-off-by: Sebastien Rannou <mxs@sbrk.org>
Upstream-commit: e94bab8278ed5672d75a4c1121ef4a6c3febc5b9
Component: engine
 2015-05-18 11:55:38 +02:00
Nuutti Kotivuori acd82df11a Prevent fallback to v1 registry for digest pulls 
The intention of the user is to download a verified image if explicitly
pulling with a digest and falling back to v1 registry circumvents that
protection.

Signed-off-by: Nuutti Kotivuori <naked@iki.fi>
Upstream-commit: 642e6a377324c7873f278c6bd7fd5e60201139e2
Component: engine
 2015-05-18 08:26:26 +03:00
Qiang Huang 9e12a52ca0 Use inspectField to simplify code 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 74f8a4eca4d504867aaea63a35ef1e491d332f74
Component: engine
 2015-05-18 10:06:13 +08:00
Lei Jitang 8402721eb4 Fix automatically publish ports without --publish-all 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 9a09664b51ad5297f4da3624c70940e7bc3012ba
Component: engine
 2015-05-18 02:57:17 +08:00
Alexander Morozov d20fd1e820 Merge pull request #13284 from Microsoft/10662-compileconfigwindows 
Windows: Simple import error on config_windows.go
Upstream-commit: 9c5635a2a08029d440aca6179fb5cd1ffcda6f0e
Component: engine
 2015-05-17 08:59:00 -07:00
Sam Abed 07d60783cb Use port 80 for Dockerfile gpg 
Signed-off-by: Sam Abed <sam.abed@gmail.com>
Upstream-commit: 79f704490c64c74746eefbddb642b2071203fcbc
Component: engine
 2015-05-17 13:22:21 +10:00
Brian Goff 3c170ee3af Merge pull request #13271 from Microsoft/10662-nounixsocket 
Windows: No unix_socket.go
Upstream-commit: 692b7b911ede20eda92bf8b0b9cdd81b901de1fd
Component: engine
 2015-05-16 21:34:15 -04:00
Jessie Frazelle d2a1754a85 Merge pull request #13239 from Microsoft/10662-hack 
Make which cross binary fails clearer
Upstream-commit: 48b4229cb4fae7665cb0194cad094e7801df4362
Component: engine
 2015-05-17 01:09:36 +03:00
John Howard c4f071bd48 Windows: Refactor container 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b9e4b95788e0d8eae5363b82f301dafb9ea687f7
Component: engine
 2015-05-16 12:38:20 -07:00
John Howard 5e6717ae3b Windows: Simple import error on config_windows.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: dfddfa6bb8560e8a75aa67abd3b34cf82e98311c
Component: engine
 2015-05-16 12:18:55 -07:00
John Howard 4e71899e7f Windows: NewDriver() re-baseline parms 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 50b4079b5fdb9d966f49946c8db36c81648c1dee
Component: engine
 2015-05-16 11:38:19 -07:00
Sebastiaan van Stijn 525d9c3ed7 Merge pull request #13281 from mavenugo/plugin_typo 
Fixing a Typo in plugins mime-type
Upstream-commit: a9172f572e13086859c652e2d581950e910d63d4
Component: engine
 2015-05-16 19:52:57 +02:00
Antonio Murdaca 2a80100987 Clean tests from not needed inspect call 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: a268e36719e38b91a4ece84e3fdb742ed36feac3
Component: engine
 2015-05-16 18:12:54 +02:00
Alexander Morozov c8d066f882 Merge pull request #13237 from ahmetalpbalkan/tag/event 
Introduce daemon event 'tag' upon image tagging
Upstream-commit: b5e932a3bf1e9ba2682f0c3df2cc8fdf51f60229
Component: engine
 2015-05-16 09:05:03 -07:00
Madhu Venugopal c1aed4887a Fixing a Typo in plugins mime-type 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 215a5ebdb6c36f63ff4d6294f2d1b29f87b6af40
Component: engine
 2015-05-16 08:49:23 -07:00
Antonio Murdaca 0dbe0e42c5 Add RestartPolicy methods instead of using strings checking 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 624bf81fdb980638c422d746bfb82623e9d8bbd1
Component: engine
 2015-05-16 14:15:28 +02:00
Antonio Murdaca 9536d9d96e Merge pull request #13273 from HuKeping/remove-deadcode 
Cleanup dead code of integration-cli/utils.go
Upstream-commit: 42cfc95549728014811cc9aa2c5b07bdf5553a54
Component: engine
 2015-05-16 14:03:42 +02:00