toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,276 Commits 3 Branches 295 Tags
80d0a74f8bae14d72d5ca63990b5385f333f44f4
Commit Graph
3276 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Rothfusz 80d0a74f8b clarify "use" 
Upstream-commit: cd289cc10ccefea72206a6f262e978c346c6679a
Component: engine
 2013-09-13 17:22:53 -07:00
Andy Rothfusz 32f8da3a7e Merge pull request #1880 from getvictor/patch-api 
Fixed LxcConf example in Remote API v1.4 and v1.5
Upstream-commit: 894eff64b499b2df5d7eadca55f2ea2feee7c380
Component: engine
 2013-09-13 13:28:26 -07:00
Andy Rothfusz 9fc7b61184 Merge pull request #1881 from dotcloud/ubuntu-install-instructions 
Change apt source to http
Upstream-commit: 71e15d1c3cf2e0d80158709ece4601893db05fe6
Component: engine
 2013-09-13 13:27:58 -07:00
Michael Crosby 4b16804ae0 Change apt source to http 
Upstream-commit: 74daeccec580c27c33c982cd246afc537f2804be
Component: engine
 2013-09-13 19:21:43 +00:00
getvictor 262f4e57a2 Fixing LxcConf example in docker_remote_api_v1.4.rst 
Upstream-commit: 102522bcd1e87730394665c5a78f8e8bbcc50b7e
Component: engine
 2013-09-13 14:10:05 -05:00
getvictor 40a7f3c469 Fixed LxcConf example for docker_remote_api_v1.5.rst 
Based on how command line docker sends the request.
Upstream-commit: b3cbf424ec7dbce8a42f75b23f48083f3f62abaf
Component: engine
 2013-09-13 14:09:05 -05:00
Michael Crosby 4de754b9f6 Merge pull request #1848 from dotcloud/build-clean 
Add rm option to docker build to remove intermediate containers
Upstream-commit: 33972627b7feb7bddce87e92d3789de6eb4611ef
Component: engine
 2013-09-13 10:58:59 -07:00
Michael Crosby dea87b774e Merge pull request #1716 from eliasp/fixme 
Added FIXME for iproute → netlink as advised in issue #925.
Upstream-commit: 4234fc699f9ab30677131fc9b43a4ffd78cb7aa3
Component: engine
 2013-09-13 10:58:28 -07:00
Michael Crosby a0167b5a29 Merge pull request #1846 from dotcloud/fix_return_error 
Fix wrong return error
Upstream-commit: b986fd00e074432c2f0d05655b4cf22c8d51b36f
Component: engine
 2013-09-13 09:44:38 -07:00
Daniel Mizyrycki c2de80738c Merge pull request #1862 from dotcloud/dockerfile-multiline-space 
Replace multiline with empty string not space
Upstream-commit: f368fd9f9f3fcd9904f766f2fd00b875847cc676
Component: engine
 2013-09-13 08:52:57 -07:00
Michael Crosby b9d752c34e Merge pull request #1741 from griff/1737_fix_volume_uid_gid 
Transfer uid and gid from image to volume
Upstream-commit: ffc850244f4450990eb1c2e13dc1f35c2d4772b4
Component: engine
 2013-09-12 10:38:37 -07:00
Andy Rothfusz dec68f5c30 Merge pull request #1593 from kyleconroy/master 
Enable mobile view for website.
Upstream-commit: 83623675ceba17a5dcc283010f8e7f53f0910a4a
Component: engine
 2013-09-12 10:30:16 -07:00
Andy Rothfusz 909728c3a8 Merge pull request #1865 from lgp171188/patch-1 
Fixed a minor typo
Upstream-commit: 46f644c074ac2f0b30cba608db32995ee2f02551
Component: engine
 2013-09-12 10:11:18 -07:00
Andy Rothfusz bd04c634f0 Merge pull request #1859 from Bachmann1234/patch-1 
Fix typo in hello_world.rst
Upstream-commit: 1bc2ab05ec244935a5219fdc827f62e911dee37a
Component: engine
 2013-09-12 10:10:49 -07:00
Michael Crosby bb7df4f70e Update docker.bash script for build -rm 
Upstream-commit: 1d935c630745248d5851440eb0907cd363cd88d0
Component: engine
 2013-09-12 16:57:10 +00:00
Michael Crosby efc88e6663 Add rm option to docker build to remove intermediate containers 
Upstream-commit: b7a3fc687ec55b68ee0cadf78d7f1eff3e531fbd
Component: engine
 2013-09-12 16:55:36 +00:00
Guruprasad 424f44ba41 Fixed a minor typo 
Changed "You need to enable namespaces and cgroups, to the extend of what is needed to run LXC containers" to "You need to enable namespaces and cgroups, to the extent of what is needed to run LXC containers"
Upstream-commit: 718b1f9fe74f3a26881e462b3e9e91a93232568b
Component: engine
 2013-09-12 13:25:05 +05:30
Michael Crosby ec20b18bca Replace multiline with empty string not space 
Upstream-commit: 1e723bc95a61fb6c46af82557c128d1e95a33a99
Component: engine
 2013-09-11 23:43:55 +00:00
Kyle Conroy de832f166e Merge branch 'master' of https://github.com/dotcloud/docker 
Upstream-commit: 9dd98df1a3c4115da897b93809d0b004b8fccc1a
Component: engine
 2013-09-11 15:38:52 -07:00
Andy Rothfusz 2f028893cb Merge pull request #1851 from metalivedev/1601-ec2install 
Fix #1601 and #1845
Upstream-commit: 557e3ec88e319e8547efda73ffe54773a7ed918d
Component: engine
 2013-09-11 14:41:43 -07:00
Matt Bachmann f3b949b816 Update hello_world.rst 
Small typo
Upstream-commit: dfe45e1ad5fe741c379c5549c9ea56ec440d2579
Component: engine
 2013-09-11 15:35:05 -04:00
Victor Vieux 2bbd215a6a Merge pull request #1857 from shin-/master 
Fixed push bug
Upstream-commit: d5480fb78d9cd8d6d31276b8c882304e84748960
Component: engine
 2013-09-11 10:52:05 -07:00
shin- f64d317995 Fixed push bug 
Upstream-commit: c6dc90ccb9a77dab9f40c13be7465a759a25885b
Component: engine
 2013-09-11 19:39:33 +02:00
Michael Crosby 69cd7cd278 Merge pull request #1726 from dsissitka/1615-2 
Updated "POST /containers/create" to return the right Content-Type. Fixes #1615.
Upstream-commit: 02037a9b535561c97b4c2f65bc920282f4f35c4d
Component: engine
 2013-09-11 09:09:48 -07:00
David Sissitka 2d267aa7ec Fixed a bug I created when rebasing. 
Upstream-commit: 71d46eaf029fcc49edade5e7a967909d57e5c723
Component: engine
 2013-09-11 01:39:55 -07:00
David Sissitka da3c9e0ef2 Replaced leading spaces with tabs. Again. 
Upstream-commit: f4ba0d42675a4085dfe96543a9265d9caf6b5e85
Component: engine
 2013-09-11 01:28:20 -07:00
David Sissitka 184c209869 Updated postContainersCreate to use writeJSON. 
Upstream-commit: d48ea32186cfa069db80d6dd3b79a9d2e0c14c7f
Component: engine
 2013-09-11 01:26:26 -07:00
David Sissitka 29774e010f Replaced leading spaces with tabs. 
Upstream-commit: 33e4d73629dd2a913e5b8e4c96faba09bcb1bcac
Component: engine
 2013-09-11 01:07:05 -07:00
David Sissitka a591fb2b8f Rebased. 
Upstream-commit: 07324a37eb7cc6daf32e47a85aedaa03b07586b5
Component: engine
 2013-09-11 01:03:17 -07:00
David Sissitka 6d9de425d6 Added a status code argument to writeJSON. 
Upstream-commit: dd49cc45c885de15133a6e547671846e63a0334a
Component: engine
 2013-09-11 00:23:53 -07:00
Andy Rothfusz ee4708b50c Fix #1601 with vagrantless installation instructions. 
Upstream-commit: 21be3b76e99d0a6a9d9722d6221ee15ea971dbf4
Component: engine
 2013-09-10 18:54:13 -07:00
Brian Olsen 3604478445 Transfer uid and gid to volume. Fixes #1737. 
Upstream-commit: 9cfbaecfe5b1ccb1ab21c66400f3a1ba1b33da1e
Component: engine
 2013-09-11 03:17:42 +02:00
Andy Rothfusz 70b97c6387 Fix #1845 lxc typo in images 
Upstream-commit: c75926be4f1a606251c6cdc926c5a37795d358b9
Component: engine
 2013-09-10 14:54:35 -07:00
Michael Crosby 97c0d31d6a Merge pull request #1838 from jmcvetta/multiline_dockerfile 
Implementation of multiline syntax for Dockerfile
Upstream-commit: bd0e4fde9a2a1fb1f676e7ea19e111be46cb87c8
Component: engine
 2013-09-10 14:22:34 -07:00
Andy Rothfusz 3c51fffb9b Merge pull request #1835 from metalivedev/1821-exampleslanding 
fix #1821 landing page for examples
Upstream-commit: de75241b627730a24e4db59ddb5bc06ba27bffac
Component: engine
 2013-09-10 14:14:00 -07:00
Kyle Conroy f16ec54fce Merge branch 'master' of https://github.com/dotcloud/docker 
Upstream-commit: c24c5c3b6004edd31c1fd503125b1ba150c2e23a
Component: engine
 2013-09-10 10:57:33 -07:00
Victor Vieux 007dc4770c fix wrong return error 
Upstream-commit: 44d0f941f287d5dcf6212216b7c0b72b085bdb1a
Component: engine
 2013-09-10 17:16:59 +00:00
Victor Vieux c0f4a2ef7d add Brian Olsen to AUTHORS 
Upstream-commit: b7826f56664c85e44207ce5e1e685ed04016feb6
Component: engine
 2013-09-10 16:55:27 +00:00
Victor Vieux 62ef8f176e Merge branch '1582_fix_volume_content' of https://github.com/griff/docker into griff-1582_fix_volume_content 
Upstream-commit: 27ca0c225aebfe93c4edd2d39d188175f4b2f516
Component: engine
 2013-09-10 16:52:46 +00:00
Michael Crosby 0d8ea16762 Merge pull request #1759 from bdon/graph-map 
Minor refactor of Graph; replace uses of Graph.All (slice) with Graph.Map (map)
Upstream-commit: ad152efbed6ddb74a352c39147bae9b0e8c87435
Component: engine
 2013-09-10 08:49:11 -07:00
Jason McVetta 867da1f571 stricter regexp for Dockerfile line continuations 
Upstream-commit: 6a4afb7f8eacde9cb81202347258983908a9f7c6
Component: engine
 2013-09-09 18:23:57 -07:00
Jason McVetta 9a3ed98cdb Test dockerfile with line containing literal "\n" 
Upstream-commit: c01f6df43e1280c398d921c2d5eff01db8c26f94
Component: engine
 2013-09-09 18:23:17 -07:00
Michael Crosby 8ec924d460 Merge pull request #1735 from dotcloud/1301-support-domainname 
Add domain name support
Upstream-commit: e89396809fc3cc9a52e7787f829a8b96c7cee4a4
Component: engine
 2013-09-09 17:21:11 -07:00
Jason McVetta 40bf9b7fa6 cruft removal 
Upstream-commit: 4f3b8033f287051156e6b81aeff9da3c44f64cba
Component: engine
 2013-09-09 17:17:09 -07:00
Jason McVetta 58dbcaf56e line continuation regex 
Upstream-commit: ebb934c1b044f4bbffe312e9c88c00134c94ef7f
Component: engine
 2013-09-09 17:02:45 -07:00
Victor Vieux 108dc7f51c Merge pull request #1796 from shin-/api_1_5 
*Remote API: Bumped API version to 1.5
*Registry: Implement login with private registry
*Remote API: Improve port mapping information 
Upstream-commit: 2801624462a4b3842930d38b09a5039629d1a5d3
Component: engine
 2013-09-09 16:58:54 -07:00
Jason McVetta f94f2fe1fc read Dockerfile into memory before parsing, to facilitate regexp preprocessing 
Upstream-commit: 6921ca4813a583948d3871a53d0349b834f31036
Component: engine
 2013-09-09 16:42:04 -07:00
Victor Vieux 9a252c6ee5 Merge pull request #1793 from reds/master 
From FIXME: local path for ADD
Upstream-commit: 58281b4f18b01b06f49e9ca90e39c918bfc3275b
Component: engine
 2013-09-09 16:14:59 -07:00
Jason McVetta dda5c87060 failing test case for multiline command in dockerfile 
Upstream-commit: 672f1e068392e95966cd57b4bc49bd8d1b8859dd
Component: engine
 2013-09-09 15:21:04 -07:00
Victor Vieux a719a21e63 add Martin Redmond to AUTHORS 
Upstream-commit: dd806b4ecd2c94356342da720e580ab13288df33
Component: engine
 2013-09-09 22:19:28 +00:00