toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,940 Commits 3 Branches 295 Tags
db8076813b7cb80e2a6689bb0304ef112b906a44
Commit Graph
4579 Commits
Author SHA1 Message Date
Josh Hawn db8076813b Adjusted handling of inactive user login 
The return status for inactive users was being checked
too early in the process, so I moved it from just after
the handling of POST /v1/users/ to after getting the
response from GET /v1/users/
Upstream-commit: 6720bfb24312a558a27453ce104beeb04c53ec68
Component: engine
 2013-12-06 11:57:05 -08:00
Victor Vieux 3365b34767 Merge pull request #3004 from tianon/shebang-bash 
Update bundlescript shebangs to be bash, reflecting how they're actually invoked
Upstream-commit: 35e80868addd9ac5a2c1e006e650ac3e71f52c6a
Component: engine
 2013-12-05 16:04:09 -08:00
Tianon Gravi abd44b15ab Merge pull request #2983 from tianon/udev 
Add udev rules files for hiding the docker loopback devices from udisks
Upstream-commit: 2acea6090f6071b66f546f4de72a7e59731ab467
Component: engine
 2013-12-05 16:01:04 -08:00
Andy Rothfusz dd568b3dd1 Merge pull request #3065 from SvenDowideit/use-makefile-in-devenv-documentation 
use the Makefile in the dev environment documentation - its way less typing, and fewer typing mistakes
Upstream-commit: 81b25fde7998cb9f5720844e5d487f73c7942d07
Component: engine
 2013-12-05 15:27:36 -08:00
Andy Rothfusz 8a00a3de0b Merge pull request #3062 from SvenDowideit/cli-examples-dollar-sudo-docker 
Some examples didnt use $ sudo docker, so this makes it a little more consistent
Upstream-commit: 0189a994715f0ca141c7af289ede6d553c12b78e
Component: engine
 2013-12-05 15:25:09 -08:00
Andy Rothfusz c8f60ad629 Merge pull request #3061 from shykes/sven-doc-maintainers 
Add Sven Dowideit to docs maintainers
Upstream-commit: 9320f4e2d1caf0b3d84388808c23767543987fd0
Component: engine
 2013-12-05 15:17:34 -08:00
Guillaume J. Charmes b5ccf77471 Merge pull request #3075 from dotcloud/pull_layers 
Wait on pull from another client
Upstream-commit: d1a4f83e5ec4b332c0d61ace7b03da5de2f6bebd
Component: engine
 2013-12-05 14:47:39 -08:00
Victor Vieux 1181340954 wait on pull from another client 
Upstream-commit: fb810b54ff404e81bd2486a944e24583a55fe8bf
Component: engine
 2013-12-05 14:41:56 -08:00
Michael Crosby f74efb9865 Merge pull request #2992 from jpoimboe/bridge-create-ioctl 
Create the bridge device with ioctl
Upstream-commit: 06379d8bd9bb82b5a5c2f84ccca6c56172abfd5c
Component: engine
 2013-12-05 14:40:03 -08:00
Andy Rothfusz f9d6ff33ee include Red Hat Enterprise, should have part of #3011 
oops, forgot the index!
Upstream-commit: a96bf7439774d905f72e835218c72a5b45da37c0
Component: engine
 2013-12-05 14:34:10 -08:00
Andy Rothfusz 89905dc61d Merge pull request #3011 from goldmann/rhel_instructions 
Instructions on how to install Docker on Red Hat Enterprise Linux / CentOS
Upstream-commit: cc0466bb685ad9c393e282860734282659a4b409
Component: engine
 2013-12-05 14:30:31 -08:00
Andy Rothfusz 8592a6729a Merge pull request #3034 from rogaha/fix_doc_registry_index_spec 
- Updated the doc according to the current implementation status
Upstream-commit: 0a7e0f081958e3b12ad7941ace04af0fb5ef675b
Component: engine
 2013-12-05 14:24:13 -08:00
Guillaume J. Charmes 629f490217 Merge pull request #3074 from crosbymichael/dm-history-calc 
Save layersize on pull
Upstream-commit: ef157cee30795229d781c6b91dafded75c3e96c0
Component: engine
 2013-12-05 14:13:03 -08:00
Michael Crosby 18b9488ee1 Save layersize on pull 
Do not display size and virtual size on the cli.
Only display virtual size on the cli
Upstream-commit: 697707e4afe6f1e7e5e33c24ada2f1f2af279142
Component: engine
 2013-12-05 14:03:23 -08:00
Andy Rothfusz 754f4c422f Merge pull request #3010 from SvenDowideit/origin/docker-ps-linked-container-alias-example 
add an example of docker ps, and also of link aliases
Upstream-commit: e3c3f3c324e37536cc582f91b8963ba10d337417
Component: engine
 2013-12-05 14:00:53 -08:00
Guillaume J. Charmes 7dfca4d041 Merge pull request #3057 from crosbymichael/test-cpu-share 
Move test cpu shares out of test start
Upstream-commit: 797bac2344b17e1fe0ea2c629c12f0ab90907013
Component: engine
 2013-12-05 13:58:01 -08:00
Josh Poimboeuf dccee4fb11 create the bridge device with ioctl 
On RHEL 6, creation of a bridge device with netlink fails.  Use the more
backward-compatible ioctl instead.  This fixes networking on RHEL 6.
Upstream-commit: 7a94cdf8edd917899a38a58917cd4439652047a1
Component: engine
 2013-12-05 15:32:15 -06:00
Guillaume J. Charmes 8ece76c065 Merge pull request #3016 from pnasrat/3014-clarify-maintainer-process 
Add a proposal step for potential MAINTAINERS.
Upstream-commit: 1525f71b5acb388418ed5fe1de861e95f7a9572d
Component: engine
 2013-12-05 11:28:30 -08:00
Guillaume J. Charmes f81857be89 Merge pull request #3024 from jamtur01/ubunturepo 
Added note about Ubuntu curl installation
Upstream-commit: 4188cd6bcd6d078ebf2bc72d5685970965453a96
Component: engine
 2013-12-05 11:27:46 -08:00
Andy Rothfusz 370b2a74f3 Merge pull request #3038 from SvenDowideit/2485-ambassador-pattern-doc 
initial stab at writing a use/ambassador-pattern howto
Upstream-commit: e304e8936b4f23c875dfe18e07763642cdf73a64
Component: engine
 2013-12-05 11:01:27 -08:00
Guillaume J. Charmes 655f0f72fa Merge pull request #3060 from dotcloud/sd_notify 
sd_notify ready status when accepting API requests
Upstream-commit: 066b961a0cf93c5edd0cd4084029e2027c1ab483
Component: engine
 2013-12-05 10:33:29 -08:00
Victor Vieux f1ec7415d1 Merge pull request #2917 from codeaholics/2698-only-tag-top-layer 
Only tag the top-most layer when pushing to a registry
Upstream-commit: a8e99d923507e245f933599c94a061bfdc375452
Component: engine
 2013-12-05 10:02:57 -08:00
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
Roberto Gandolfo Hashioka 534fc04e4e - Added link to the source code repo on github 
Upstream-commit: 909da5d5249880b02bad5fb893d12fe2a3fdd942
Component: engine
 2013-12-04 21:08:44 -08:00
Sven Dowideit 53cfdbe273 I was reading the doc, and noticed that some examples didnt use $ sudo docker, so this makes it a little more consistent 
Upstream-commit: af020e2d67256d386e43741071dc4855735d92a3
Component: engine
 2013-12-05 14:14:08 +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 6e5bbd93f0 Add Sven Dowideit to docs maintainers 
Upstream-commit: b4e21ad1da616ab46669401dc7d62a6e19b05619
Component: engine
 2013-12-04 17:50:33 -08:00
Victor Vieux 9684769cb6 sd_notify ready status when accepting API requests 
Upstream-commit: 97088ebef7c638f8175d7c61934642eeb2c054c4
Component: engine
 2013-12-04 17:50:20 -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 f84d85cd37 Move test cpu shares out of test start 
Fixes #2107
Upstream-commit: 0d1506adb30ecd56f5e413c3ff376a1acfbe3697
Component: engine
 2013-12-04 16:31:09 -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 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