toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,235 Commits 3 Branches 295 Tags
47313c7b66d30a236f172ff2c193b1cf5031fd0c
Commit Graph
22235 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibor Vass 47313c7b66 Switch Dockerfile to debian:jessie 
Fixes broken-pipe issue when piping s3cmd to grep -q, by removing the -q
flag and redirecting to /dev/null instead.

Add net-tools for ifconfig, because some tests rely on ifconfig.

Harmonize all Dockerfiles in this direction.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: f27b5dda4afc0b0a278eb5379d17dfc3533c5397
Component: engine
 2016-02-12 21:49:54 -05: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
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
Vincent Demeester 8be99d9bc5 Merge pull request #20218 from icecrime/fix_remote_integration-cli 
Improve remote integration-cli tests
Upstream-commit: 4cdd0403cdaac7e500f3fa6740c43792a6e066a4
Component: engine
 2016-02-11 22:51:20 +01:00
Alexander Morozov 9e5008a270 Merge pull request #20239 from calavera/remove_server_port_allocation 
Move listeners and port allocation outside the server. 
Upstream-commit: 02a37a281cb1200747e10bef7409ac1e65bc24f4
Component: engine
 2016-02-11 13:50:48 -08:00
Christopher Jones 6d38af4937 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>
Upstream-commit: 045aee2002e76cbfc9999472fe6e8fc54e0c0085
Component: engine
 2016-02-11 16:47:40 -05:00
Jessica Frazelle ea8becc33f update cap-add docs for seccomp 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 1e92e5fdaab833000d6d3a4f6756cb677cb7899e
Component: engine
 2016-02-11 13:47:08 -08:00
David Calavera 2f2c113322 Merge pull request #20231 from vdemeester/move-getcontext-away 
Move getContext… function to builder package
Upstream-commit: 931e78df1b50e83837bff4966bb62458675e3c32
Component: engine
 2016-02-11 13:38:57 -08:00
Vincent Demeester e56e27b666 Move getContext… function to builder package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 312f5e435bed2ca45477dc9e4713d35aabe37075
Component: engine
 2016-02-11 20:59:59 +01:00
David Calavera c9c9d43ade Move listeners and port allocation outside the server. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 34c29277c2c1fd1d1adc4409dc7075685f681de4
Component: engine
 2016-02-11 14:42:49 -05:00
Anusha Ragunathan 98ae33ee9b 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>
Upstream-commit: f3b2233d126aec8ab15fa589f5a9360eec280f01
Component: engine
 2016-02-11 10:53:51 -08:00
Aaron Lehmann bd6d7c6931 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>
Upstream-commit: 7b81bc147cf75cb32697e8fdf88e05ae879cb879
Component: engine
 2016-02-11 10:48:11 -08:00
Aaron Lehmann ece54e525a Update vendored docker/distribution 
The registry/client/auth package now provides ErrNoBasicAuthCredentials.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 4436f07ef42d367a801695c9bfac521e85072033
Component: engine
 2016-02-11 10:28:18 -08:00
Brian Goff 3f33957369 Merge pull request #20124 from calavera/fix_vendor_codec_cleanup 
Do not purge github.com/ugorji/go/codec from vendor.
Upstream-commit: 944e4cab2ed8370f088416ccb3cad890f3aa5102
Component: engine
 2016-02-11 12:51:35 -05:00
Sebastiaan van Stijn 2d3744313f Merge pull request #20234 from kiawin/20232-improve-overriding-user-command-details 
Improve usage details on overriding USER command in Docker run refere…
Upstream-commit: d4d0b8a42bcf5e5e1df3565101277dc10843735a
Component: engine
 2016-02-11 18:18:26 +01:00
Phil Estes 8625825024 Merge pull request #20214 from mavenugo/vin0.7.0-dev.1 
Vendor libnetwork v0.7.0-dev.2
Upstream-commit: 6672d7de200d938f6a6c4e372c31712318e54dc2
Component: engine
 2016-02-11 12:12:58 -05:00
Brian Goff 743f98d553 Merge pull request #20233 from tianon/busybox-dbus 
Remove "--group-add dbus" from busybox example (no dbus group in busybox anymore)
Upstream-commit: f6523a44ccae5a69aba41a769a3b1b054e1f22ad
Component: engine
 2016-02-11 11:43:28 -05:00
David Calavera 66b576e776 Merge pull request #20230 from estesp/zfs-ref-counting 
Add proper refcounting to zfs graphdriver
Upstream-commit: 803e3d4d1e7b9f029bbe31a80197403bf4d27252
Component: engine
 2016-02-11 08:27:26 -08:00
David Calavera ac0021ada8 Do not purge github.com/ugorji/go/codec from vendor. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d11a2c758a497500bba08495f218b8f242fafad3
Component: engine
 2016-02-11 11:22:55 -05:00
Tianon Gravi 784a3213bb Remove "--group-add dbus" from busybox example (no dbus group in busybox anymore) 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: b1e5c773b28d27a67d20c0aa0182d40005cfdb50
Component: engine
 2016-02-11 08:20:28 -08:00
Sian Lerk Lau d0366b3eb4 Improve usage details on overriding USER command in Docker run reference page 
Signed-off-by: Sian Lerk Lau <kiawin@gmail.com>
Upstream-commit: bc3e02b9ec4702981bbbd337e4f6ca12bf4eb202
Component: engine
 2016-02-12 00:05:32 +08:00
Brian Goff b27ac0630e Merge pull request #20209 from aaronlehmann/upper-case-hostnames 
Allow uppercase characters in image reference hostname
Upstream-commit: acd8baccff10642e1d44a342414cd196b81a4605
Component: engine
 2016-02-11 10:50:05 -05:00
Sebastiaan van Stijn 4a90ae0f7e Merge pull request #19720 from vdemeester/carry-pr-18912 
Carry #18912 : Docker Remote API documentation update
Upstream-commit: f923e5a5a441ab3f7fc70816f339f06718ea13bb
Component: engine
 2016-02-11 16:40:59 +01:00