0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
22245 commits 14 branches 412 tags 338 MiB
Commit graph

22245 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
David Calavera
5ca6d3bafd Merge pull request #20250 from vieux/fix_misspell 
fix common misspells
 2016-02-11 17:22:06 -08:00
Aaron Lehmann
8f26fe4f59 Push/pull errors improvement and cleanup 
Several improvements to error handling:

- Introduce ImageConfigPullError type, wrapping errors related to
  downloading the image configuration blob in schema2. This allows for a
  more descriptive error message to be seen by the end user.

- Change some logrus.Debugf calls that display errors to logrus.Errorf.
  Add log lines in the push/pull fallback cases to make sure the errors
  leading to the fallback are shown.

- Move error-related types and functions which are only used by the
  distribution package out of the registry package.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-02-11 16:28:56 -08:00
Jessica Frazelle
0d02f2a011
make tests faster no apt-key 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-02-11 16:28:00 -08:00
David Calavera
2a16099f57 Merge pull request #20241 from aaronlehmann/fallback-on-no-auth-credentials 
Fall back to V1 when there are no basic auth credentials
 2016-02-11 16:18:26 -08:00
David Calavera
46ec01bd12 Merge pull request #20246 from tophj-ibm/19368-fix-flaky-network-test 
Fix flaky test, TestDockerNetworkHostModeUngracefulDaemonRestart
 2016-02-11 15:50:40 -08:00
Victor Vieux
99a396902f fix common misspell 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-02-11 15:49:36 -08:00
John Howard
41d3bb43f4 Windows CI: Fix test-unit for pkg\integration 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-02-11 15:06:22 -08:00
Jess Frazelle
2a64d400b3 Merge pull request #20114 from jfrazelle/fix-release-script 
get os arch for release script
 2016-02-11 17:28:23 -05:00
Sebastiaan van Stijn
73ee139d7a Merge pull request #20245 from jfrazelle/20082-cap-add-docs-updates 
update cap-add docs for seccomp
 2016-02-11 22:52:26 +01:00
Vincent Demeester
4cdd0403cd Merge pull request #20218 from icecrime/fix_remote_integration-cli 
Improve remote integration-cli tests
 2016-02-11 22:51:20 +01:00
Alexander Morozov
02a37a281c Merge pull request #20239 from calavera/remove_server_port_allocation 
Move listeners and port allocation outside the server.
 2016-02-11 13:50:48 -08:00
Christopher Jones
045aee2002 Fix flaky test, TestDockerNetworkHostModeUngracefulDaemonRestart 
Fixes #19368 by waiting until all container statuses are running
before killing the daemon

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-02-11 16:47:40 -05:00
Jessica Frazelle
1e92e5fdaa
update cap-add docs for seccomp 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-02-11 13:47:08 -08:00
David Calavera
931e78df1b Merge pull request #20231 from vdemeester/move-getcontext-away 
Move getContext… function to builder package
 2016-02-11 13:38:57 -08:00
Vincent Demeester
312f5e435b Move getContext… function to builder package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-02-11 20:59:59 +01:00
David Calavera
34c29277c2 Move listeners and port allocation outside the server. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-02-11 14:42:49 -05:00
Anusha Ragunathan
f3b2233d12 Add "dummy" network module for arm images. 
A few libnetwork integration tests require that the kernel be configured
with the "dummy" network interface and has the module loaded. However,
the dummy module is not available by default on arm images. This ensures
that it is built and loaded.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-02-11 10:53:51 -08:00
Aaron Lehmann
7b81bc147c Fall back to V1 when there are no basic auth credentials 
This makes the behavior consistent with having incorrect credentials.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-02-11 10:48:11 -08:00
Aaron Lehmann
4436f07ef4 Update vendored docker/distribution 
The registry/client/auth package now provides ErrNoBasicAuthCredentials.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-02-11 10:28:18 -08:00
Brian Goff
944e4cab2e Merge pull request #20124 from calavera/fix_vendor_codec_cleanup 
Do not purge github.com/ugorji/go/codec from vendor.
 2016-02-11 12:51:35 -05:00
Sebastiaan van Stijn
d4d0b8a42b Merge pull request #20234 from kiawin/20232-improve-overriding-user-command-details 
Improve usage details on overriding USER command in Docker run refere…
 2016-02-11 18:18:26 +01:00