ec20b18bca
Replace multiline with empty string not space
...
Upstream-commit: 1e723bc95a61fb6c46af82557c128d1e95a33a99
Component: engine
2013-09-11 23:43:55 +00:00
f64d317995
Fixed push bug
...
Upstream-commit: c6dc90ccb9a77dab9f40c13be7465a759a25885b
Component: engine
2013-09-11 19:39:33 +02:00
2d267aa7ec
Fixed a bug I created when rebasing.
...
Upstream-commit: 71d46eaf029fcc49edade5e7a967909d57e5c723
Component: engine
2013-09-11 01:39:55 -07:00
da3c9e0ef2
Replaced leading spaces with tabs. Again.
...
Upstream-commit: f4ba0d42675a4085dfe96543a9265d9caf6b5e85
Component: engine
2013-09-11 01:28:20 -07:00
184c209869
Updated postContainersCreate to use writeJSON.
...
Upstream-commit: d48ea32186cfa069db80d6dd3b79a9d2e0c14c7f
Component: engine
2013-09-11 01:26:26 -07:00
29774e010f
Replaced leading spaces with tabs.
...
Upstream-commit: 33e4d73629dd2a913e5b8e4c96faba09bcb1bcac
Component: engine
2013-09-11 01:07:05 -07:00
a591fb2b8f
Rebased.
...
Upstream-commit: 07324a37eb7cc6daf32e47a85aedaa03b07586b5
Component: engine
2013-09-11 01:03:17 -07:00
6d9de425d6
Added a status code argument to writeJSON.
...
Upstream-commit: dd49cc45c885de15133a6e547671846e63a0334a
Component: engine
2013-09-11 00:23:53 -07:00
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
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
c0f4a2ef7d
add Brian Olsen to AUTHORS
...
Upstream-commit: b7826f56664c85e44207ce5e1e685ed04016feb6
Component: engine
2013-09-10 16:55:27 +00:00
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
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
867da1f571
stricter regexp for Dockerfile line continuations
...
Upstream-commit: 6a4afb7f8eacde9cb81202347258983908a9f7c6
Component: engine
2013-09-09 18:23:57 -07:00
9a3ed98cdb
Test dockerfile with line containing literal "\n"
...
Upstream-commit: c01f6df43e1280c398d921c2d5eff01db8c26f94
Component: engine
2013-09-09 18:23:17 -07:00
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
40bf9b7fa6
cruft removal
...
Upstream-commit: 4f3b8033f287051156e6b81aeff9da3c44f64cba
Component: engine
2013-09-09 17:17:09 -07:00
58dbcaf56e
line continuation regex
...
Upstream-commit: ebb934c1b044f4bbffe312e9c88c00134c94ef7f
Component: engine
2013-09-09 17:02:45 -07:00
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
f94f2fe1fc
read Dockerfile into memory before parsing, to facilitate regexp preprocessing
...
Upstream-commit: 6921ca4813a583948d3871a53d0349b834f31036
Component: engine
2013-09-09 16:42:04 -07:00
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
dda5c87060
failing test case for multiline command in dockerfile
...
Upstream-commit: 672f1e068392e95966cd57b4bc49bd8d1b8859dd
Component: engine
2013-09-09 15:21:04 -07:00
a719a21e63
add Martin Redmond to AUTHORS
...
Upstream-commit: dd806b4ecd2c94356342da720e580ab13288df33
Component: engine
2013-09-09 22:19:28 +00:00
bddbd1b5d0
Merge branch 'filter' of https://github.com/reds/docker into reds-filter
...
Upstream-commit: 843f9091f25eee67a8c858ddf9b61d630b17a11d
Component: engine
2013-09-09 22:16:16 +00:00
14a282bed0
Merge pull request #1837 from dotcloud/fix-tests-1812
...
only os.Exits on error
Upstream-commit: 53da0507e456b11dc9b98c304038c1e56df66530
Component: engine
2013-09-09 15:12:32 -07:00
2d20e5611c
rebase master
...
Upstream-commit: bd847f66c635380096b19c41c4a3536dff4199e1
Component: engine
2013-09-09 22:11:53 +00:00
7f77532ae1
Merge pull request #1825 from dotcloud/merge-builder-runtime
...
Refactor to merge builder.go into runtime.go
Upstream-commit: e503f6a87802d388cc8c9829c4f1eacbab1a13a6
Component: engine
2013-09-09 15:11:41 -07:00
cebebc8343
gofmt
...
Upstream-commit: 6678a26d1c94e7838c055a3da3b91ae3de8c3e3c
Component: engine
2013-09-09 15:11:30 -07:00
f14e5c017d
Merge pull request #1828 from mmikulicic/patch-1
...
Please add go-dockerclient to docker API clients doc
Upstream-commit: 8ddfb4d6aa43de31e2043fd86dcefb0ed4f591b0
Component: engine
2013-09-09 14:51:28 -07:00
94007cc5e6
remove docker-ruby from docs
...
we don't maintain it anymore as we now recommend proper HTTP api based clients instead.
Upstream-commit: 3c90e96b6d9e16b3983cd7e387b06e81130f1e7c
Component: engine
2013-09-09 14:42:45 -07:00
fb9071f221
only os.Exits on error
...
Upstream-commit: 46a1cd69a99a9adc7bc366f1eb2c03b62f464d39
Component: engine
2013-09-09 21:26:35 +00:00
887e5a84ef
Merge pull request #1812 from dotcloud/return-run-exit-code
...
*Client: Return the process exit code for run commands
Upstream-commit: 9b088ada7e1f7bf9021d6c319550ff11be1b0a22
Component: engine
2013-09-09 14:10:46 -07:00
9cb316385e
Merge pull request #1773 from hectcastro/hc-riak-example
...
Add a Docker example for running Riak
Upstream-commit: 0508bd8da78af21fef74cb45993f60f188eeac39
Component: engine
2013-09-09 13:31:41 -07:00
23416421ac
fix init layer
...
Upstream-commit: 446ca4b57b228a2d030f0c816e08948ff7da1d79
Component: engine
2013-09-09 20:29:57 +00:00
8ab45c6770
bind mount /etc/hosts and /etc/hostname
...
Upstream-commit: 4f2e59f94a771c4b60947726815d065ef0ea253a
Component: engine
2013-09-09 20:29:57 +00:00
b8740215e5
add domainname support
...
Upstream-commit: 0a436e03b8289510ad191a89fcbd5ec06fb8865d
Component: engine
2013-09-09 20:29:06 +00:00
bdd7f084cd
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
Upstream-commit: c66a827c98027ce5e3b4ebe83f8b2143e2a62d8b
Component: engine
2013-09-09 13:27:48 -07:00
122c44caef
Created a little landing page for the examples, combined first two.
...
Upstream-commit: fe99e51634f7068ce997e9866516f2b14a93bda9
Component: engine
2013-09-09 13:19:07 -07:00
3b3fbee916
Push tags to registry even if images are already uploaded
...
Upstream-commit: 64bc08f1c4bee42ff5a17b2d6ababb288fd8f209
Component: engine
2013-09-09 21:02:37 +02:00
fe18d490b4
note about exiting from attachment prior to running
...
Upstream-commit: 9749d94fb0f3034247dbd969f6dad390f2605e1a
Component: engine
2013-09-09 10:30:06 -04:00
04edea7666
improve sentence readabilty
...
Upstream-commit: 630ae43e7d11fa34421a253c765edb6cef5a3371
Component: engine
2013-09-09 10:19:45 -04:00
6d96bcd64c
Please add go-dockerclient to docker API clients doc
...
Upstream-commit: 268928ab35a5402ff37413ab258200c4bed48790
Component: engine
2013-09-09 11:01:15 +01:00
f75afeebe3
Add missing package import
...
Upstream-commit: eca861a99d1a5abe91704b55d044eb8280adb8d1
Component: engine
2013-09-07 17:03:40 -07:00
7985dd19d1
Add missing comments to runtime.go
...
Upstream-commit: 6a9f4ecf9bc4263baef8e9a1d86f1474f9c66d31
Component: engine
2013-09-06 17:43:34 -07:00
aa0ad01db6
Merge builder.go into runtime.go
...
Upstream-commit: 24e02043a2672320abebc3bd5fa6a592e2ebd082
Component: engine
2013-09-06 17:33:05 -07:00
eed5427302
Remove import os/user
...
Upstream-commit: b07314e2e066a1308040e1eb45a96a0e1056f28a
Component: engine
2013-09-06 23:00:21 +00:00
14c14520dc
README: remove original shipping containers 'manifesto'. It's a little long to stay here.
...
Upstream-commit: eed00a4afd1e8e8e35f8ca640c94d9c9e9babaf7
Component: engine
2013-09-06 15:09:40 -07:00
6a1261fd84
README: replace 'install instructions' and 'usage examples' with references to the website and docs
...
Upstream-commit: 6679f3b053344e6e99d5e490720c9ccb924a7d4c
Component: engine
2013-09-06 15:09:04 -07:00
8e77b3527e
README: harmonize intro with website
...
Upstream-commit: 70ab25a5dbc8f54dbe15e9375687b4669ed919df
Component: engine
2013-09-06 15:08:01 -07:00
c1a63c6958
README: refer to the docs for install instructions to remove duplication.
...
Upstream-commit: bcb8d3fd86ac620dc4f35c805b4e0f8e8fcb7663
Component: engine
2013-09-06 14:52:14 -07:00
