70b97c6387
Fix #1845 lxc typo in images
...
Upstream-commit: c75926be4f1a606251c6cdc926c5a37795d358b9
Component: engine
2013-09-10 14:54:35 -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
c63c08e39f
Remove fixed FIXMEs
...
Upstream-commit: 228b7af516e023984a3d0ceba98c639cec9695d0
Component: engine
2013-09-10 11:33:37 -07:00
5e2f733cce
Update usage comments in hack/make.sh
...
Upstream-commit: d14058bc29512918ffd4e7413c6d5ae8524088ed
Component: engine
2013-09-10 11:33:26 -07:00
47c1ee3661
Packager's manual: official build vs distro build
...
Upstream-commit: 5b361f31f7d4eb547cbf60fda2968537600772ca
Component: engine
2013-09-10 11:30:14 -07:00
f16ec54fce
Merge branch 'master' of https://github.com/dotcloud/docker
...
Upstream-commit: c24c5c3b6004edd31c1fd503125b1ba150c2e23a
Component: engine
2013-09-10 10:57:33 -07:00
007dc4770c
fix wrong return error
...
Upstream-commit: 44d0f941f287d5dcf6212216b7c0b72b085bdb1a
Component: engine
2013-09-10 17:16:59 +00: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
ab16a55cf8
PACKAGERS.md: a guide to packaging Docker for your favorite distro
...
Upstream-commit: 14bbbcd57181f9d6e908b2e84474e731314d0d77
Component: engine
2013-09-09 23:39:55 -07:00
173e478738
Break down hack/make.sh into small scripts, one per 'bundle': test, binary, ubuntu etc.
...
Upstream-commit: 3d39336a46a0d7f411467d29eb6328dc1ab3e900
Component: engine
2013-09-09 18:45:40 -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
1dc33725a8
Add the output of the tests to each release
...
Upstream-commit: 59856a20bfbad6f59308071fda220a04c3b0df09
Component: engine
2013-09-09 16:30:24 -07:00
a4daaece9a
Integrate unit tests into hack/make.sh
...
Upstream-commit: b187cc40cda36fb1b4890d80fc7367b2df4fbd6e
Component: engine
2013-09-09 16:20:30 -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
b6370d00a5
Hack: use vendored dependencies in-place, for less moving parts when developing
...
Upstream-commit: e37dcd726fe415193eaed18729251d293a018909
Component: engine
2013-09-09 15:05:25 -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
774dff2935
Hack: we no longer need to generate test binaries.
...
Upstream-commit: 4cd59b96ed93d8a4c35099a0a1171e17170071ab
Component: engine
2013-09-08 18:45:23 -07:00
3184ad242c
vendor.sh can cleanly update vendored dependencies
...
Upstream-commit: 055bbb79c10a829e054d6741d1937f0304dbb7fd
Component: engine
2013-09-07 17:48:52 -07:00
911d6019d5
gitignore: ignore bundles directory
...
Upstream-commit: 19dc3b0792272c2f0fbcfb654349fe5e86bc8046
Component: engine
2013-09-07 17:35:49 -07:00
9327ca0955
move deps installation to vendor.sh script
...
Upstream-commit: 20d24a450cbf22b6d5268bc1fe76022fa554d6be
Component: engine
2013-09-07 17:35:48 -07:00
f75afeebe3
Add missing package import
...
Upstream-commit: eca861a99d1a5abe91704b55d044eb8280adb8d1
Component: engine
2013-09-07 17:03:40 -07:00
