Alexander Morozov
05002c2501
Add support for forwarding Docker client through SOCKS proxy
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-02-16 11:09:28 -08:00
Alexander Morozov
16effc66c0
Vendor new engine-api and go-connections
...
There is SOCKS5 proxy support in new versions.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-02-16 10:05:01 -08:00
Sebastiaan van Stijn
48d4e2d953
Merge pull request #20352 from glensc/x-bit
...
add execute bit to contrib/report-issue.sh
2016-02-16 12:52:30 +01:00
Elan Ruusamäe
5b62b71093
add execute bit to contrib/report-issue.sh
...
Signed-off-by: Elan Ruusamäe <glen@delfi.ee>
2016-02-16 12:55:15 +02:00
Sebastiaan van Stijn
3004c61865
Merge pull request #20341 from MichaelCurrie/patch-1
...
Fix typo
2016-02-16 11:16:29 +01:00
Sebastiaan van Stijn
957bdd9df9
Merge pull request #20343 from HackToday/fixpara
...
Fix the typo
2016-02-16 11:14:57 +01:00
Kai Qiang Wu(Kennan)
c33cdf9ee3
Fix the typo
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-16 07:00:01 +00:00
Michael Currie
765880a46a
Fix typo
...
Signed-off-by: MichaelCurrie <mcurrie@bruceforceresearch.com>
2016-02-16 02:51:40 +00:00
Vincent Demeester
b16536aeb5
Merge pull request #20336 from robert-wallis/docs-run-typo
...
Fixing mismatched network name.
2016-02-15 22:32:31 +01:00
Robert Wallis
8779a4ca62
Fixing mismatched network name.
...
Using `my-net` to be consistent with:
https://docs.docker.com/engine/reference/run/
Signed-off-by: Robert Wallis <smilingrob@gmail.com>
2016-02-15 13:17:05 -08:00
Vincent Demeester
e5a79c5d99
Merge pull request #20330 from thaJeztah/docs-typos
...
Fix documentation typos
2016-02-15 16:58:49 +01:00
Sebastiaan van Stijn
7da5784b10
Fix documentation typos
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-15 15:46:56 +01:00
Vincent Demeester
46a61b7240
Merge pull request #20257 from Microsoft/10662-TestBuildCI6
...
Sixth set of TestBuild CI Enabling for Windows
2016-02-14 10:35:27 +01:00
Darren Stahl
5fc0de2688
Sixth set of TestBuild CI Enabling for Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-02-13 20:54:59 -08:00
Brian Goff
389a38e1e5
Merge pull request #20281 from FrederikNS/master
...
Fish tab completion lists all containers on "docker rm -f"
2016-02-13 15:41:52 -05:00
Vincent Demeester
7d9532552b
Merge pull request #20280 from rhuss/patch-2
...
Add network mode `none` to list of possible values
2016-02-13 14:21:27 +01:00
Roland Huß
c80b36c938
Extended explanation of NetworkMode's value
...
* Add network mode `none` to list of possible values for API version 1.15 - 1.23
* For API version 1.21 - 1.23 add explanation that any other value is taken as a custom network's name
Signed-off-by: Roland Huß <roland@jolokia.org>
2016-02-13 10:00:51 +01:00
Antonio Murdaca
5a9a435d40
Merge pull request #20290 from calavera/fix_stop_signal_merge
...
Inherit StopSignal from Dockerfile.
2016-02-13 09:26:11 +01:00
Jess Frazelle
b384fd6b1b
Merge pull request #20141 from cmehay/power8
...
Build golang 1.6 in power8 Dockerfile
2016-02-12 20:36:57 -05:00
Tianon Gravi
beade8276a
Merge pull request #20293 from jfrazelle/fix-release-script
...
dont clean the db
2016-02-12 16:30:00 -08:00
Jess Frazelle
79edcc5172
Merge pull request #20198 from cpuguy83/check_drivers_b4_vol_create
...
Check drivers before vol create
2016-02-12 18:41:48 -05:00
Jess Frazelle
64a4605892
Merge pull request #20278 from aaronlehmann/build-authconfig
...
Pass authentication credentials through to build
2016-02-12 18:37:49 -05:00
Sebastiaan van Stijn
4fea2be134
Merge pull request #20284 from Microsoft/jjh/testunit-pkgarchivestep1
...
Windows CI: test-unit pkg\archive step 1
2016-02-13 00:37:17 +01:00
David Calavera
bda194491e
Merge pull request #20287 from duglin/DebugVerCheck
...
Lower warning about old client to a debug
2016-02-12 15:34:02 -08:00
David Calavera
a252516ec1
Inherit StopSignal from Dockerfile.
...
Make sure the image configuration is not overriden by the default
value in the `create` flag.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-12 17:56:40 -05:00
Jessica Frazelle
477e1fc989
dont clean the db
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-12 13:13:50 -08:00
David Calavera
b734d0e8cc
Merge pull request #20285 from moxiegirl/fix-user-guide
...
Update the userguide to fix user feedback
2016-02-12 11:07:03 -08:00
Jess Frazelle
94b0a6b2d9
Merge pull request #20277 from tiborvass/pgp-mit-fallback
...
Add pgp.mit.edu fallback in Dockerfile
2016-02-12 13:56:11 -05:00
Doug Davis
059ad5d0a9
Lower warning about old client to a debug
...
Ideally I would love to just remove this check entirely because its
seems pretty useless. An old client talking to a new server isn't
an error condition, nor is it something to even worry about - its a normal
part of life. Flooding my screen (and logs) with a warning that isn't
something I (as an admin) need to be concerned about is silly and a
distraction when I need to look for real issues. If anything this should
be printed on the cli not the daemon since its the cli that needs to be
concerned, not the daemon.
However, since when you debug an issue it might be interesting to know the
client is old I decided to pull back a little and just change it from
a Warning to a Debug logrus call instead.
If others want it removed I still do that though :-)
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-02-12 10:53:40 -08:00
Aaron Lehmann
6fed46aeb9
Pass authentication credentials through to build
...
In Docker 1.10 and earlier, "docker build" can do a build FROM a private
repository that hasn't yet been pulled. This doesn't work on master. I
bisected this to https://github.com/docker/docker/pull/19414 .
AuthConfigs is deserialized from the HTTP request, but not included in
the builder options.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-02-12 10:50:16 -08:00
Frederik Nordahl Jul Sabroe
2541a23c3a
Fish completion lists all containers on "docker rm -f"
...
Signed-off-by: Frederik Nordahl Jul Sabroe <frederikns@gmail.com>
2016-02-12 19:14:35 +01:00
John Howard
1a714e76a2
Windows CI: test-unit pkg\archive step 1
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-12 10:13:44 -08:00
Mary Anthony
bf76b1d686
Update the userguide to fix user feedback
...
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-12 10:08:59 -08:00
David Calavera
3a3c953806
Merge pull request #20266 from npcode/fix-docs-dockernetworks-three-options
...
Fix an erratum; s/two/three/
2016-02-12 09:58:48 -08:00
Tibor Vass
91cdadf37e
Add pgp.mit.edu fallback in Dockerfile
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-02-12 11:54:47 -05:00
Vincent Demeester
c312eab74e
Merge pull request #20265 from rhuss/patch-1
...
Fix some formatting
2016-02-12 17:23:17 +01:00
Morgan Bauer
fffff202fc
Merge pull request #20261 from tophj-ibm/change-test-to-use-variable
...
Change integration test to use declared variable
2016-02-12 07:52:51 -08:00
Yi EungJun
8c93958fcb
Fix an erratum; s/two/three/
...
There are three options because the new one was added at 6f863cf
.
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
2016-02-13 00:14:35 +09:00
Tibor Vass
bd758053b5
Merge pull request #20264 from qunhu/master
...
fix grammar error
2016-02-12 10:07:45 -05:00
Vincent Demeester
e17afedfe0
Merge pull request #20247 from aaronlehmann/distribution-errors
...
Push/pull errors improvement and cleanup
2016-02-12 11:57:25 +01:00
Roland Huß
03b25e024e
Fix some formatting
...
* Codified example container names
* Emphasised 'link' vs 'legacy link' (instead of using code markup)
* Add a missing ``` for a code example
Signed-off-by: Roland Huß <roland@jolokia.org>
2016-02-12 10:34:55 +01:00
huqun
f609fb4d83
fix grammar error
...
it is not very important,but I think the modification makes the coders read more conviently!
Signed-off-by: huqun <huqun@zju.edu.cn>
2016-02-12 16:11:31 +08:00
Vincent Demeester
27ab98e846
Merge pull request #20258 from Microsoft/jjh/testunit-authz
...
Windows CI: test-unit turn off pkg\authorisation
2016-02-12 08:33:20 +01:00
Vincent Demeester
991cb36d76
Merge pull request #20259 from Microsoft/jjh/testunit-pkgfilenotify
...
Windows CI: test-unit for pkg\filenotify
2016-02-12 08:32:43 +01:00
Vincent Demeester
659bf08281
Merge pull request #20249 from Microsoft/jjh/testunit-pkgintegration
...
Windows CI: Fix test-unit for pkg\integration
2016-02-12 08:32:03 +01:00
Arnaud Porterie
9511856e16
Merge pull request #20202 from anusha-ragunathan/arm-dummy-interface
...
Add "dummy" network module for arm images.
2016-02-11 19:02:25 -08:00
Brian Goff
3723013a1f
Merge pull request #20256 from jfrazelle/make-tests-faster
...
make tests faster no apt-key
2016-02-11 22:01:13 -05:00
Christopher Jones
ce1059973a
Change integration test to use variable
...
Followup to #20246 , changes the test to use already declared variable
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-02-11 21:20:00 -05:00
John Howard
28ee6fe7ca
Windows CI: test-unit for pkg\filenotify
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-11 17:47:26 -08:00
John Howard
57faef5c71
Windows CI: test-unit turn off pkg\authorisation
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-11 17:42:12 -08:00