clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-08 23:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,275 Commits 9 Branches 112 Tags
894eff64b499b2df5d7eadca55f2ea2feee7c380
Commit Graph
3275 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Rothfusz 894eff64b4 Merge pull request #1880 from getvictor/patch-api 
Fixed LxcConf example in Remote API v1.4 and v1.5
 2013-09-13 13:28:26 -07:00
Andy Rothfusz 71e15d1c3c Merge pull request #1881 from dotcloud/ubuntu-install-instructions 
Change apt source to http
 2013-09-13 13:27:58 -07:00
Michael Crosby 74daeccec5 Change apt source to http 2013-09-13 19:21:43 +00:00
getvictor 102522bcd1 Fixing LxcConf example in docker_remote_api_v1.4.rst 2013-09-13 14:10:05 -05:00
getvictor b3cbf424ec Fixed LxcConf example for docker_remote_api_v1.5.rst 
Based on how command line docker sends the request.
 2013-09-13 14:09:05 -05:00
Michael Crosby 33972627b7 Merge pull request #1848 from dotcloud/build-clean 
Add rm option to docker build to remove intermediate containers
 2013-09-13 10:58:59 -07:00
Michael Crosby 4234fc699f Merge pull request #1716 from eliasp/fixme 
Added FIXME for iproute → netlink as advised in issue #925.
 2013-09-13 10:58:28 -07:00
Michael Crosby b986fd00e0 Merge pull request #1846 from dotcloud/fix_return_error 
Fix wrong return error
 2013-09-13 09:44:38 -07:00
Daniel Mizyrycki f368fd9f9f Merge pull request #1862 from dotcloud/dockerfile-multiline-space 
Replace multiline with empty string not space
 2013-09-13 08:52:57 -07:00
Michael Crosby ffc850244f Merge pull request #1741 from griff/1737_fix_volume_uid_gid 
Transfer uid and gid from image to volume
 2013-09-12 10:38:37 -07:00
Andy Rothfusz 83623675ce Merge pull request #1593 from kyleconroy/master 
Enable mobile view for website.
 2013-09-12 10:30:16 -07:00
Andy Rothfusz 46f644c074 Merge pull request #1865 from lgp171188/patch-1 
Fixed a minor typo
 2013-09-12 10:11:18 -07:00
Andy Rothfusz 1bc2ab05ec Merge pull request #1859 from Bachmann1234/patch-1 
Fix typo in hello_world.rst
 2013-09-12 10:10:49 -07:00
Michael Crosby 1d935c6307 Update docker.bash script for build -rm 2013-09-12 16:57:10 +00:00
Michael Crosby b7a3fc687e Add rm option to docker build to remove intermediate containers 2013-09-12 16:55:36 +00:00
Guruprasad 718b1f9fe7 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"
 2013-09-12 13:25:05 +05:30
Michael Crosby 1e723bc95a Replace multiline with empty string not space 2013-09-11 23:43:55 +00:00
Kyle Conroy 9dd98df1a3 Merge branch 'master' of https://github.com/dotcloud/docker 2013-09-11 15:38:52 -07:00
Andy Rothfusz 557e3ec88e Merge pull request #1851 from metalivedev/1601-ec2install 
Fix #1601 and #1845
 2013-09-11 14:41:43 -07:00
Matt Bachmann dfe45e1ad5 Update hello_world.rst 
Small typo
 2013-09-11 15:35:05 -04:00
Victor Vieux d5480fb78d Merge pull request #1857 from shin-/master 
Fixed push bug
 2013-09-11 10:52:05 -07:00
shin- c6dc90ccb9 Fixed push bug 2013-09-11 19:39:33 +02:00
Michael Crosby 02037a9b53 Merge pull request #1726 from dsissitka/1615-2 
Updated "POST /containers/create" to return the right Content-Type. Fixes #1615.
 2013-09-11 09:09:48 -07:00
David Sissitka 71d46eaf02 Fixed a bug I created when rebasing. 2013-09-11 01:39:55 -07:00
David Sissitka f4ba0d4267 Replaced leading spaces with tabs. Again. 2013-09-11 01:28:20 -07:00
David Sissitka d48ea32186 Updated postContainersCreate to use writeJSON. 2013-09-11 01:26:26 -07:00
David Sissitka 33e4d73629 Replaced leading spaces with tabs. 2013-09-11 01:07:05 -07:00
David Sissitka 07324a37eb Rebased. 2013-09-11 01:03:17 -07:00
David Sissitka dd49cc45c8 Added a status code argument to writeJSON. 2013-09-11 00:23:53 -07:00
Andy Rothfusz 21be3b76e9 Fix #1601 with vagrantless installation instructions. 2013-09-10 18:54:13 -07:00
Brian Olsen 9cfbaecfe5 Transfer uid and gid to volume. Fixes #1737. 2013-09-11 03:17:42 +02:00
Andy Rothfusz c75926be4f Fix #1845 lxc typo in images 2013-09-10 14:54:35 -07:00
Michael Crosby bd0e4fde9a Merge pull request #1838 from jmcvetta/multiline_dockerfile 
Implementation of multiline syntax for Dockerfile
 2013-09-10 14:22:34 -07:00
Andy Rothfusz de75241b62 Merge pull request #1835 from metalivedev/1821-exampleslanding 
fix #1821 landing page for examples
 2013-09-10 14:14:00 -07:00
Kyle Conroy c24c5c3b60 Merge branch 'master' of https://github.com/dotcloud/docker 2013-09-10 10:57:33 -07:00
Victor Vieux 44d0f941f2 fix wrong return error 2013-09-10 17:16:59 +00:00
Victor Vieux b7826f5666 add Brian Olsen to AUTHORS 2013-09-10 16:55:27 +00:00
Victor Vieux 27ca0c225a Merge branch '1582_fix_volume_content' of https://github.com/griff/docker into griff-1582_fix_volume_content 2013-09-10 16:52:46 +00:00
Michael Crosby ad152efbed Merge pull request #1759 from bdon/graph-map 
Minor refactor of Graph; replace uses of Graph.All (slice) with Graph.Map (map)
 2013-09-10 08:49:11 -07:00
Jason McVetta 6a4afb7f8e stricter regexp for Dockerfile line continuations 2013-09-09 18:23:57 -07:00
Jason McVetta c01f6df43e Test dockerfile with line containing literal "\n" 2013-09-09 18:23:17 -07:00
Michael Crosby e89396809f Merge pull request #1735 from dotcloud/1301-support-domainname 
Add domain name support
 2013-09-09 17:21:11 -07:00
Jason McVetta 4f3b8033f2 cruft removal 2013-09-09 17:17:09 -07:00
Jason McVetta ebb934c1b0 line continuation regex 2013-09-09 17:02:45 -07:00
Victor Vieux 2801624462 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
 2013-09-09 16:58:54 -07:00
Jason McVetta 6921ca4813 read Dockerfile into memory before parsing, to facilitate regexp preprocessing 2013-09-09 16:42:04 -07:00
Victor Vieux 58281b4f18 Merge pull request #1793 from reds/master 
From FIXME: local path for ADD
 2013-09-09 16:14:59 -07:00
Jason McVetta 672f1e0683 failing test case for multiline command in dockerfile 2013-09-09 15:21:04 -07:00
Victor Vieux dd806b4ecd add Martin Redmond to AUTHORS 2013-09-09 22:19:28 +00:00
Victor Vieux 843f9091f2 Merge branch 'filter' of https://github.com/reds/docker into reds-filter 2013-09-09 22:16:16 +00:00