Commit Graph

3248 Commits

Author SHA1 Message Date
Michael Crosby 1e723bc95a Replace multiline with empty string not space 2013-09-11 23:43:55 +00: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
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
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
Victor Vieux 53da0507e4 Merge pull request #1837 from dotcloud/fix-tests-1812
only os.Exits on error
2013-09-09 15:12:32 -07:00
Victor Vieux bd847f66c6 rebase master 2013-09-09 22:11:53 +00:00
Solomon Hykes e503f6a878 Merge pull request #1825 from dotcloud/merge-builder-runtime
Refactor to merge builder.go into runtime.go
2013-09-09 15:11:41 -07:00
Jason McVetta 6678a26d1c gofmt 2013-09-09 15:11:30 -07:00
Andy Rothfusz 8ddfb4d6aa Merge pull request #1828 from mmikulicic/patch-1
Please add go-dockerclient to docker API clients doc
2013-09-09 14:51:28 -07:00
Andy Rothfusz 28f2fe9167 Merge pull request #1836 from srid/patch-2
remove docker-ruby from docs
2013-09-09 14:50:36 -07:00
Sridhar Ratnakumar 3c90e96b6d remove docker-ruby from docs
we don't maintain it anymore as we now recommend proper HTTP api based clients instead.
2013-09-09 14:42:45 -07:00
Victor Vieux 46a1cd69a9 only os.Exits on error 2013-09-09 21:26:35 +00:00
Victor Vieux 9b088ada7e Merge pull request #1812 from dotcloud/return-run-exit-code
*Client: Return the process exit code for run commands
2013-09-09 14:10:46 -07:00
Andy Rothfusz 0508bd8da7 Merge pull request #1773 from hectcastro/hc-riak-example
Add a Docker example for running Riak
2013-09-09 13:31:41 -07:00
Victor Vieux 446ca4b57b fix init layer 2013-09-09 20:29:57 +00:00
Victor Vieux 4f2e59f94a bind mount /etc/hosts and /etc/hostname 2013-09-09 20:29:57 +00:00
Victor Vieux 0a436e03b8 add domainname support 2013-09-09 20:29:06 +00:00
Andy Rothfusz c66a827c98 Merge pull request #1807 from tianon/gentoo-docs
Update Gentoo docs to reflect the package name change from app-emulation/lxc-docker to app-emulation/docker
2013-09-09 13:27:48 -07:00
Andy Rothfusz fe99e51634 Created a little landing page for the examples, combined first two. 2013-09-09 13:19:07 -07:00
Joffrey F 49b5c44ee9 Merge pull request #1833 from shin-/1815-always-push-tags
Push tags to registry even if images are already uploaded
2013-09-09 13:10:40 -07:00
shin- 64bc08f1c4 Push tags to registry even if images are already uploaded 2013-09-09 21:02:37 +02:00
Andy Rothfusz 2d4ac06426 Merge pull request #1831 from brianshumate/jbs-docs-edits
Hello World Daemon edits
2013-09-09 11:48:12 -07:00
Brian Shumate 9749d94fb0 note about exiting from attachment prior to running 2013-09-09 10:30:06 -04:00
Brian Shumate 630ae43e7d improve sentence readabilty 2013-09-09 10:19:45 -04:00
Marko Mikulicic 268928ab35 Please add go-dockerclient to docker API clients doc 2013-09-09 11:01:15 +01:00
Solomon Hykes eca861a99d Add missing package import 2013-09-07 17:03:40 -07:00
Solomon Hykes 6a9f4ecf9b Add missing comments to runtime.go 2013-09-06 17:43:34 -07:00
Solomon Hykes 24e02043a2 Merge builder.go into runtime.go 2013-09-06 17:33:05 -07:00