toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,258 Commits 3 Branches 295 Tags
1edac85ccaffb2c77cabad0b7a16ac9de0bce8b2
Commit Graph
22258 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Wallis 1edac85cca 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>
Upstream-commit: 8779a4ca62db8b64c5016be20456d5b2e5a407e9
Component: engine
 2016-02-15 13:17:05 -08:00
Vincent Demeester 77c02ce91f Merge pull request #20330 from thaJeztah/docs-typos 
Fix documentation typos
Upstream-commit: e5a79c5d996f3b5f55ef3b52cdce0fb80463cae8
Component: engine
 2016-02-15 16:58:49 +01:00
Sebastiaan van Stijn e1a8ad7624 Fix documentation typos 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7da5784b10a9f085af98984e6e69e733e55ddbf5
Component: engine
 2016-02-15 15:46:56 +01:00
Vincent Demeester 58fe6cdb8d Merge pull request #20257 from Microsoft/10662-TestBuildCI6 
Sixth set of TestBuild CI Enabling for Windows
Upstream-commit: 46a61b72402e0c8766efce1b66036af15cbb6f99
Component: engine
 2016-02-14 10:35:27 +01:00
Darren Stahl 6be195136a Sixth set of TestBuild CI Enabling for Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 5fc0de2688da4fbe010980a832d8f73bff4be444
Component: engine
 2016-02-13 20:54:59 -08:00
Brian Goff a6e2ab5344 Merge pull request #20281 from FrederikNS/master 
Fish tab completion lists all containers on "docker rm -f"
Upstream-commit: 389a38e1e5145e89dd0f36cc232d5d7c269aed3b
Component: engine
 2016-02-13 15:41:52 -05:00
Vincent Demeester e92dd3c4a5 Merge pull request #20280 from rhuss/patch-2 
Add network mode `none` to list of possible values
Upstream-commit: 7d9532552b433581253898052849524500a21ff5
Component: engine
 2016-02-13 14:21:27 +01:00
Roland Huß d4a856da9f 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>
Upstream-commit: c80b36c938306ef9cc9ad6865cfc251a694f59aa
Component: engine
 2016-02-13 10:00:51 +01:00
Antonio Murdaca 05e211a98f Merge pull request #20290 from calavera/fix_stop_signal_merge 
Inherit StopSignal from Dockerfile.
Upstream-commit: 5a9a435d40fb238b627c9e31858b6e31ae38ec53
Component: engine
 2016-02-13 09:26:11 +01:00
Jess Frazelle 9f086a0d57 Merge pull request #20141 from cmehay/power8 
Build golang 1.6 in power8 Dockerfile
Upstream-commit: b384fd6b1b2a379d857b4dc9971e441fe8aa5f37
Component: engine
 2016-02-12 20:36:57 -05:00
Tianon Gravi e71cfe1ecb Merge pull request #20293 from jfrazelle/fix-release-script 
dont clean the db
Upstream-commit: beade8276a661f64775dca9aaeee061d1702edfb
Component: engine
 2016-02-12 16:30:00 -08:00
Jess Frazelle 98ffe8be11 Merge pull request #20198 from cpuguy83/check_drivers_b4_vol_create 
Check drivers before vol create
Upstream-commit: 79edcc517231e46d1fa9e03081488527143eefae
Component: engine
 2016-02-12 18:41:48 -05:00
Jess Frazelle 1f2b78374a Merge pull request #20278 from aaronlehmann/build-authconfig 
Pass authentication credentials through to build
Upstream-commit: 64a4605892d8bcc43c73948349bcfede14eb8c3a
Component: engine
 2016-02-12 18:37:49 -05:00
Sebastiaan van Stijn c1f0dad274 Merge pull request #20284 from Microsoft/jjh/testunit-pkgarchivestep1 
Windows CI: test-unit pkg\archive step 1
Upstream-commit: 4fea2be134a3785d79c4efd5c09b2a4afe4c6ecf
Component: engine
 2016-02-13 00:37:17 +01:00
David Calavera f9e2ca50ee Merge pull request #20287 from duglin/DebugVerCheck 
Lower warning about old client to a debug
Upstream-commit: bda194491e825013abc38f18a024108e25a7551c
Component: engine
 2016-02-12 15:34:02 -08:00
David Calavera 663efc4f39 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>
Upstream-commit: a252516ec19c9c83055a882da894712f2e812ecc
Component: engine
 2016-02-12 17:56:40 -05:00
Jessica Frazelle 4fe2cef6bb dont clean the db 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 477e1fc989dd9a58d7bee78d6bf13e5a24ebd4d6
Component: engine
 2016-02-12 13:13:50 -08:00
David Calavera 949eabdb95 Merge pull request #20285 from moxiegirl/fix-user-guide 
Update the userguide to fix user feedback
Upstream-commit: b734d0e8cc69eadaff86884c200d1ce21b37cdb3
Component: engine
 2016-02-12 11:07:03 -08:00
Jess Frazelle 2eb62126dc Merge pull request #20277 from tiborvass/pgp-mit-fallback 
Add pgp.mit.edu fallback in Dockerfile
Upstream-commit: 94b0a6b2d99bcd277cba4d54ad0893393065ea81
Component: engine
 2016-02-12 13:56:11 -05:00
Doug Davis 2298d51345 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>
Upstream-commit: 059ad5d0a975ab4970fe0be45a79ffa0ef35e366
Component: engine
 2016-02-12 10:53:40 -08:00
Aaron Lehmann 5d5044b24f 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>
Upstream-commit: 6fed46aeb97943315aed12f2dc62565f7bcc53dc
Component: engine
 2016-02-12 10:50:16 -08:00
Frederik Nordahl Jul Sabroe e88a530ff0 Fish completion lists all containers on "docker rm -f" 
Signed-off-by: Frederik Nordahl Jul Sabroe <frederikns@gmail.com>
Upstream-commit: 2541a23c3aa44fed115a22b36ca7f1770255bbc2
Component: engine
 2016-02-12 19:14:35 +01:00
John Howard 9115c5f1b0 Windows CI: test-unit pkg\archive step 1 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 1a714e76a2cb9008cd19609059e9988ff1660b78
Component: engine
 2016-02-12 10:13:44 -08:00
Mary Anthony 5ceee3f64c Update the userguide to fix user feedback 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: bf76b1d686018cebd043aa99152d68fbbe6bb977
Component: engine
 2016-02-12 10:08:59 -08:00
David Calavera ee0d6d6dac Merge pull request #20266 from npcode/fix-docs-dockernetworks-three-options 
Fix an erratum; s/two/three/
Upstream-commit: 3a3c9538060ebe300cc2272ad28178450b5fdd53
Component: engine
 2016-02-12 09:58:48 -08:00
Tibor Vass 7a2ded36af Add pgp.mit.edu fallback in Dockerfile 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 91cdadf37eb99610378a5808b8438f0c4be463c8
Component: engine
 2016-02-12 11:54:47 -05:00
Vincent Demeester 1815d82142 Merge pull request #20265 from rhuss/patch-1 
Fix some formatting
Upstream-commit: c312eab74e2200d443dd5422d1aa5e240b8db473
Component: engine
 2016-02-12 17:23:17 +01:00
Morgan Bauer cacd57e1c5 Merge pull request #20261 from tophj-ibm/change-test-to-use-variable 
Change integration test to use declared variable
Upstream-commit: fffff202fcc3dc63f72ce883d728eb5149e9f1ce
Component: engine
 2016-02-12 07:52:51 -08:00
Yi EungJun 0f9dad85b1 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>
Upstream-commit: 8c93958fcb1b1fc838c76b08cc4dde4ce37691bb
Component: engine
 2016-02-13 00:14:35 +09:00
Tibor Vass c4ea3c2e93 Merge pull request #20264 from qunhu/master 
fix grammar error
Upstream-commit: bd758053b573977ee8693d62c95dbc8ca664149f
Component: engine
 2016-02-12 10:07:45 -05:00
Vincent Demeester 043a0cfc7b Merge pull request #20247 from aaronlehmann/distribution-errors 
Push/pull errors improvement and cleanup
Upstream-commit: e17afedfe061ce2f02451c213b7c8b7aae01ba2f
Component: engine
 2016-02-12 11:57:25 +01:00
Roland Huß c48f1ccfa7 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>
Upstream-commit: 03b25e024e46a3254012268cda8919a8702b4cbc
Component: engine
 2016-02-12 10:34:55 +01:00
huqun bb7b3b7a26 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>
Upstream-commit: f609fb4d83566ebf1bac442622bbdb62ca2269d2
Component: engine
 2016-02-12 16:11:31 +08:00
Vincent Demeester 586ffb04ce Merge pull request #20258 from Microsoft/jjh/testunit-authz 
Windows CI: test-unit turn off pkg\authorisation
Upstream-commit: 27ab98e846b7737598686a6f80f01e29677bdb81
Component: engine
 2016-02-12 08:33:20 +01:00
Vincent Demeester eda871fb37 Merge pull request #20259 from Microsoft/jjh/testunit-pkgfilenotify 
Windows CI: test-unit for pkg\filenotify
Upstream-commit: 991cb36d76b96b6f705e82e59953048704152498
Component: engine
 2016-02-12 08:32:43 +01:00
Vincent Demeester 5d4d6cb4a4 Merge pull request #20249 from Microsoft/jjh/testunit-pkgintegration 
Windows CI: Fix test-unit for pkg\integration
Upstream-commit: 659bf082811e6803a8be450cbfbe3b4801afe305
Component: engine
 2016-02-12 08:32:03 +01:00
Arnaud Porterie 573ee925d1 Merge pull request #20202 from anusha-ragunathan/arm-dummy-interface 
Add "dummy" network module for arm images.
Upstream-commit: 9511856e16a621211f95ece6a8925aad840045ec
Component: engine
 2016-02-11 19:02:25 -08:00
Brian Goff cf164a7258 Merge pull request #20256 from jfrazelle/make-tests-faster 
make tests faster no apt-key
Upstream-commit: 3723013a1fd5b747b4a059b86fa9e006d35af007
Component: engine
 2016-02-11 22:01:13 -05:00
Christopher Jones f115ec243c 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>
Upstream-commit: ce1059973a4a46acc272a8c0fea521c96e628ba7
Component: engine
 2016-02-11 21:20:00 -05:00
John Howard 81b3251921 Windows CI: test-unit for pkg\filenotify 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 28ee6fe7ca57e8e85ca7e0b6d2cb05c563d95e82
Component: engine
 2016-02-11 17:47:26 -08:00
John Howard 928ef805a9 Windows CI: test-unit turn off pkg\authorisation 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 57faef5c71b90874f66f1e6b5d2e23591b205e28
Component: engine
 2016-02-11 17:42:12 -08:00
David Calavera 992182031d Merge pull request #20250 from vieux/fix_misspell 
fix common misspells
Upstream-commit: 5ca6d3bafd0dd53dd26f8251218c68a8016e5ce7
Component: engine
 2016-02-11 17:22:06 -08:00
Aaron Lehmann fbf0db8827 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>
Upstream-commit: 8f26fe4f59ce515c68440da1443ace4c96e89d4a
Component: engine
 2016-02-11 16:28:56 -08:00
Jessica Frazelle 748967285d make tests faster no apt-key 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0d02f2a0118f7647876e1ce5c19874ea0dd06bd8
Component: engine
 2016-02-11 16:28:00 -08:00
David Calavera 100b7c7c54 Merge pull request #20241 from aaronlehmann/fallback-on-no-auth-credentials 
Fall back to V1 when there are no basic auth credentials
Upstream-commit: 2a16099f5792d360be5e08d05c5742190eec03e3
Component: engine
 2016-02-11 16:18:26 -08:00
David Calavera 5cfbe3cee6 Merge pull request #20246 from tophj-ibm/19368-fix-flaky-network-test 
Fix flaky test, TestDockerNetworkHostModeUngracefulDaemonRestart
Upstream-commit: 46ec01bd125319635b9700c67032ec097e9a25b8
Component: engine
 2016-02-11 15:50:40 -08:00
Victor Vieux 697a990701 fix common misspell 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 99a396902f0ea9d81ef87a683489b2435408f415
Component: engine
 2016-02-11 15:49:36 -08:00
John Howard 1066ac0f5a Windows CI: Fix test-unit for pkg\integration 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 41d3bb43f463a92b3611b0939e9ce51d523c62bb
Component: engine
 2016-02-11 15:06:22 -08:00
Jess Frazelle e18dc87631 Merge pull request #20114 from jfrazelle/fix-release-script 
get os arch for release script
Upstream-commit: 2a64d400b34e53f38b210a4ca23ea202c9246a7f
Component: engine
 2016-02-11 17:28:23 -05:00
Sebastiaan van Stijn f66f8bcefe Merge pull request #20245 from jfrazelle/20082-cap-add-docs-updates 
update cap-add docs for seccomp
Upstream-commit: 73ee139d7ae5bb1099744d3ac23eb70b418a4e6f
Component: engine
 2016-02-11 22:52:26 +01:00