toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,904 Commits 3 Branches 295 Tags
9a46759761b5941c791cd84c6e3f4b8f8fc5c8c9
Commit Graph
4904 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sven Dowideit 9a46759761 use the Makefile in the dev environment documentation - its way less typing, and fewer typing mistakes 
Upstream-commit: e9bf971e69800f1189dd240d95972f5f0dcc3bec
Component: engine
 2013-12-05 21:48:35 +10:00
Andy Rothfusz 25e3f85d24 Merge pull request #2991 from fortybillion/patch-1 
API documentation: added format of Volumes and Binds parameters to "create" and "start" 
Upstream-commit: 94d46a8d3a2278962c30c01e831754d6cefe9b2e
Component: engine
 2013-12-04 18:32:19 -08:00
Andy Rothfusz 3776c7a304 Merge branch '2971-cleanconflicts' 
Upstream-commit: ec9f2f1d0f8255913208dc1193c954629c57c91d
Component: engine
 2013-12-04 18:26:45 -08:00
Andy Rothfusz e5d73f33fc Merge branch 'pgdoc' of github.com:jamtur01/docker into 2971-cleanconflicts 
Conflicts:
	docs/sources/examples/postgresql_service.rst
Upstream-commit: 0bfa22124e87197be8ce47cee4e998eb9d6891b5
Component: engine
 2013-12-04 18:25:58 -08:00
Victor Vieux e0c7cf69e6 Merge pull request #2907 from goldmann/iptables-fix 
Make sure the firewall rules are created even if the bridge interface is already created
Upstream-commit: 79031c4f8cd443a3d6fe26205b6d66830e306619
Component: engine
 2013-12-04 18:04:57 -08:00
Victor Vieux 3f773fbd23 Merge pull request #2966 from andrewsmedina/govet2 
fixed some `go vet` issues.
Upstream-commit: 5f55c1aee1a6acdce35f5d7be776104d66e44483
Component: engine
 2013-12-04 17:57:10 -08:00
Solomon Hykes 8c8b421058 Merge pull request #3031 from jamtur01/docsmaintain 
Add James Turnbull to docs maintainers
Upstream-commit: c35cebaa06477133a454ab8b2e3765e320ef8503
Component: engine
 2013-12-04 17:48:45 -08:00
Victor Vieux 1a4bb9936c Merge pull request #2993 from jpoimboe/rhel6-version-check 
remove kernel version warning on rhel 6.5
Upstream-commit: 41b5e87873097e8d776f37c9034653f6b45a2c7d
Component: engine
 2013-12-04 17:46:20 -08:00
Andy Rothfusz 26d53f3ec4 Merge pull request #2834 from fj/topic/clarify-aws-instructions 
Fix installing-on-AWS workflow description
Upstream-commit: 9dfc7bc36f51972ade2c6325b452f997f1583a4a
Component: engine
 2013-12-04 17:25:35 -08:00
Guillaume J. Charmes 4b1e431156 Merge pull request #3058 from dotcloud/add_stderr_hijack 
fix docker run -a stderr
Upstream-commit: afbea3f13ffde3bdef33e05c735c3172715732d5
Component: engine
 2013-12-04 17:16:56 -08:00
Andy Rothfusz 86c79e6a69 Merge pull request #2886 from jamtur01/fedora_community 
Updated Fedora docs
Upstream-commit: 5dab47a475fe64d11834133d0689104b4e4c57ba
Component: engine
 2013-12-04 17:12:00 -08:00
Victor Vieux e215a324cf fix docker run -a stderr 
Upstream-commit: 3ba279a3705b3417fea36e8d2eb7d54e95d60fad
Component: engine
 2013-12-04 17:08:14 -08:00
Guillaume J. Charmes 991a112d99 Merge pull request #2967 from crosbymichael/return-host-config 
Add hostconfig to container inspect
Upstream-commit: 944c1f10eadd98a8044cd869e81badd897f96f1f
Component: engine
 2013-12-04 16:50:42 -08:00
Michael Crosby fab26e18da Merge pull request #3032 from tianon/makefile-tweaks 
Tweak Makefile for consistency and Ctrl+C-ability
Upstream-commit: 3a8222dfa54b22ab25128140cbd6a3f3659399a7
Component: engine
 2013-12-04 16:04:47 -08:00
Tianon Gravi 610b53a9fe Tweak Makefile for consistency and Ctrl+C-ability (also, -rm to keep it clean) 
Upstream-commit: 00030ced4bf2d0242883fae0b4ece61149f1d437
Component: engine
 2013-12-04 16:56:01 -07:00
Andy Rothfusz 1fbf17a644 Merge pull request #3033 from proppy/add-compute-docs 
Add Google Cloud Platform installation docs
Upstream-commit: f95621fd054004e8cc438c1bb443c3df6823d45e
Component: engine
 2013-12-04 15:05:07 -08:00
Guillaume J. Charmes 2f933c3fb1 Merge pull request #3020 from crosbymichael/remove-init-layer 
Ensure that the init layer is removed with the container
Upstream-commit: 4328926acc4cbaa96f0bba44b652e40a559bb0bd
Component: engine
 2013-12-04 14:46:48 -08:00
Johan Euphrosine 938c440dbd docs/installation: add google compute engine quickstart 
Upstream-commit: 3df5d120de4f42cc208283bf78b26ca5b21c6776
Component: engine
 2013-12-04 12:25:22 -08:00
Victor Vieux 24b2c5b755 Merge pull request #3046 from dotcloud/fix_offline_image_transfert_jsonmessage 
Fix offline image transfer jsonmessage
Upstream-commit: 1b5517b68f7d63735141a19779cc86eab580e589
Component: engine
 2013-12-04 12:05:28 -08:00
Victor Vieux dbb1b9b6d5 fix jsonmessage 
Upstream-commit: 4bc100b494022901d4d7f51cba303ae3562b1303
Component: engine
 2013-12-04 11:57:18 -08:00
Victor Vieux 0624a140ec fix offline image transfert 
Upstream-commit: be282b57d561bdb7e686ed8d4f7b6327e7a65b70
Component: engine
 2013-12-04 11:55:42 -08:00
Victor Vieux 8eac8d89db remove unused parameter in Download 
Upstream-commit: 12180948be8040a4cdf99a0e660098cd33e32832
Component: engine
 2013-12-04 11:54:11 -08:00
Victor Vieux f9faf9ad5d Merge pull request #2796 from EmilHernvall/master 
Support for same port on multiple interfaces
Upstream-commit: 6cf2c14c0065e0adb95c505fdc09c00826f4011a
Component: engine
 2013-12-04 11:15:51 -08:00
Michael Crosby f2f4f227e1 Merge pull request #2790 from proppy/fix-tar 
utils: remove dotcloud/tar dep
Upstream-commit: dc9f8bf072dfb65f32c6dc569d133361030daa0a
Component: engine
 2013-12-04 11:06:13 -08:00
Michael Crosby 6e7481e8ee Merge pull request #3018 from pnasrat/3017-debug-expvar 
Expose expvar endpoint during debugging.
Upstream-commit: 0862756beb103c7a40b935f7e0a7dfd79de0c754
Component: engine
 2013-12-04 10:53:35 -08:00
Andy Rothfusz dce2c8c9b7 Merge pull request #2946 from dhrp/doc-postgres-typo 
Fixed some grammar and one other line in postgres example
Upstream-commit: de60bee3d4f34cdc61120463851fb996c4d8eb4c
Component: engine
 2013-12-04 10:51:02 -08:00
Michael Crosby 55c7790d1c Merge pull request #3000 from creack/improve_make_sh_test 
Improve make sh test
Upstream-commit: 51b9fe73012e84d27dbf1361df61162d6bf6761c
Component: engine
 2013-12-04 10:41:55 -08:00
Michael Crosby 06ae34a0b2 Merge pull request #3029 from pnasrat/container-refactoring 
Container refactoring
Upstream-commit: 61aad8fc105ee58d585fc403647146acc3e10f09
Component: engine
 2013-12-04 10:35:42 -08:00
Paul Nasrat e21c443f19 Extract volume bind, creation and external methods. 
Make Start() slightly more readable.
Upstream-commit: 40fe9f581bd56bbcab9f231763cfac20e659d8c3
Component: engine
 2013-12-03 18:58:31 -05:00
Sam Alba 0171e1cc75 Merge pull request #2339 from shin-/private_reg_auth 
Private registry auth
Upstream-commit: 258d707548619eae7517b39ff0bc9541ebec566c
Component: engine
 2013-12-03 15:29:38 -08:00
Victor Vieux 7da5754161 Merge pull request #2930 from creack/docker-osx 
Docker client on OSX
Upstream-commit: 99e4f5635368b25a505edc114d66061def7163fc
Component: engine
 2013-12-03 15:27:21 -08:00
James Turnbull b4dda37afd Added myself to docs MAINTAINERS 
Upstream-commit: 0132547a385697f3fee1e6bf9fe3fa07c98f3fd0
Component: engine
 2013-12-03 17:51:34 -05:00
Paul Nasrat 0c7bc6f2ce Extract helper method for volume linking. 
Makes this more readable.
Upstream-commit: 84f78d9cad4162ddfc1bccbe55402050123cb1c5
Component: engine
 2013-12-03 17:35:54 -05:00
Victor Vieux 9d4980d1a7 Merge pull request #2999 from dotcloud/improve_progress_bars 
Handle small screens
Upstream-commit: f8176de191aa4dff9277ae8a2a08d738932fca73
Component: engine
 2013-12-03 14:24:40 -08:00
Victor Vieux 71ac3b3d2a Handle small screens 
Upstream-commit: f50fe14e13160c7c823613710a6fa12c9fc13bcb
Component: engine
 2013-12-03 14:21:33 -08:00
James Turnbull 8fd397a50c Updated Fedora docs 
* Added Fedora installation instructions
Upstream-commit: 45567f2209d3450142ae8042f674269902d58e3b
Component: engine
 2013-12-03 16:55:55 -05:00
Victor Vieux b151598031 Merge pull request #3009 from silas/stream-logs 
Add stream flag to logs command
Upstream-commit: 2fd76fc0b826524cd6d133fb8163cf6066b8ce03
Component: engine
 2013-12-03 13:43:35 -08:00
Silas Sewell d385113417 Rename logs -stream to logs -f 
Upstream-commit: b699aee91f90b8390dfa6e8ef58e983fc8c4f3e5
Component: engine
 2013-12-03 20:35:22 +00:00
Michael Crosby aea480f046 Add docs for hostconfig in inspect 
Upstream-commit: 664174c7aa1300b9a856eafafc01a1d416a731ff
Component: engine
 2013-12-03 11:09:10 -08:00
Michael Crosby 75c6e1df8f Merge pull request #3022 from pnasrat/3021-makefile-testflags 
Support TESTFLAGS
Upstream-commit: 7428e6a5f0edae5ff5f95a96dbb6eeb734ffb59c
Component: engine
 2013-12-03 10:55:22 -08:00
Paul Nasrat 05ddc4a077 Support TESTFLAGS 
Upstream-commit: d21563ced3a24ebfc8a9b53e5ec687543f7b2979
Component: engine
 2013-12-03 14:49:10 -05:00
Paul Nasrat dadb586d63 Expose expvar endpoint during debugging. 
Fixes #3017
Upstream-commit: 6a55169e2e0d039f7404b236b321fa7c76b99618
Component: engine
 2013-12-03 13:04:18 -05:00
Michael Crosby 7e8e4fe649 Ensure that the init layer is removed with the container 
Upstream-commit: 5976c26c1e7bc7b29489250b8100412ea3d27b60
Component: engine
 2013-12-03 09:44:48 -08:00
shin- 27db2d038b Handle 401 response in auth.Login() for authed private registries 
Upstream-commit: 9be5db8704be5bda02484c374f4bd9b197d5701b
Component: engine
 2013-12-03 16:32:13 +01:00
shin- 3959a8a4bc Don't return req as result of setTokenAuth 
Upstream-commit: 3f921639894d3eca72c9ae105d3ad4f386651caa
Component: engine
 2013-12-03 16:32:13 +01:00
shin- 14f5d29204 missed one call to setTokenAuth 
Upstream-commit: 3b5010e90bd51ba3630f48091ed70111d26dd31a
Component: engine
 2013-12-03 16:32:13 +01:00
shin- c52437abda Factorized auth token setting 
Upstream-commit: ec4863ae5582d8e7a9dccb57d7f5f3e21c2481ef
Component: engine
 2013-12-03 16:32:13 +01:00
shin- 99feeadcbb gofmt 
Upstream-commit: a02bc8a5dbca763a2a245cf0ca17ff5a21d5b52b
Component: engine
 2013-12-03 16:32:13 +01:00
shin- 37888fa7b4 Use basic auth for private registries when over HTTPS. 
RequestFactory is no longer a singleton (can be different for different instances of Registry)
Registry now has an indexEndpoint member
Registry methods that needed the indexEndpoint parameter no longer do so
Registry methods will only use token auth where applicable if basic auth is not enabled.
Upstream-commit: 045989e3d824f577cd90a6386b66a5814e703766
Component: engine
 2013-12-03 16:32:13 +01:00
shin- 13eb2fe87b Added HTTPAuthDecorator 
Upstream-commit: bbf9135adcaec9edc2e9d0ebce6a78ba3ade3689
Component: engine
 2013-12-03 16:24:47 +01:00