c0f4a2ef7dadd Brian Olsen to AUTHORS Upstream-commit: b7826f56664c85e44207ce5e1e685ed04016feb6 Component: engine
Victor Vieux
2013-09-10 16:55:27 +00:00
62ef8f176eMerge branch '1582_fix_volume_content' of https://github.com/griff/docker into griff-1582_fix_volume_content Upstream-commit: 27ca0c225aebfe93c4edd2d39d188175f4b2f516 Component: engine
Victor Vieux
2013-09-10 16:52:46 +00:00
0d8ea16762Merge pull request #1759 from bdon/graph-map
Michael Crosby
2013-09-10 08:49:11 -07:00
ab16a55cf8PACKAGERS.md: a guide to packaging Docker for your favorite distro Upstream-commit: 14bbbcd57181f9d6e908b2e84474e731314d0d77 Component: engine
Solomon Hykes
2013-09-09 23:39:55 -07:00
173e478738Break down hack/make.sh into small scripts, one per 'bundle': test, binary, ubuntu etc. Upstream-commit: 3d39336a46a0d7f411467d29eb6328dc1ab3e900 Component: engine
Solomon Hykes
2013-09-09 18:45:40 -07:00
867da1f571stricter regexp for Dockerfile line continuations Upstream-commit: 6a4afb7f8eacde9cb81202347258983908a9f7c6 Component: engine
Jason McVetta
2013-09-09 18:23:42 -07:00
9a3ed98cdbTest dockerfile with line containing literal "\n" Upstream-commit: c01f6df43e1280c398d921c2d5eff01db8c26f94 Component: engine
Jason McVetta
2013-09-09 18:22:58 -07:00
8ec924d460Merge pull request #1735 from dotcloud/1301-support-domainname
Michael Crosby
2013-09-09 17:21:11 -07:00
108dc7f51cMerge pull request #1796 from shin-/api_1_5
Victor Vieux
2013-09-09 16:58:54 -07:00
f94f2fe1fcread Dockerfile into memory before parsing, to facilitate regexp preprocessing Upstream-commit: 6921ca4813a583948d3871a53d0349b834f31036 Component: engine
Jason McVetta
2013-09-09 16:42:04 -07:00
1dc33725a8Add the output of the tests to each release Upstream-commit: 59856a20bfbad6f59308071fda220a04c3b0df09 Component: engine
Solomon Hykes
2013-09-09 16:30:24 -07:00
a4daaece9aIntegrate unit tests into hack/make.sh Upstream-commit: b187cc40cda36fb1b4890d80fc7367b2df4fbd6e Component: engine
Solomon Hykes
2013-09-09 16:20:30 -07:00
9a252c6ee5Merge pull request #1793 from reds/master
Victor Vieux
2013-09-09 16:14:59 -07:00
dda5c87060failing test case for multiline command in dockerfile Upstream-commit: 672f1e068392e95966cd57b4bc49bd8d1b8859dd Component: engine
Jason McVetta
2013-09-09 15:21:04 -07:00
a719a21e63add Martin Redmond to AUTHORS Upstream-commit: dd806b4ecd2c94356342da720e580ab13288df33 Component: engine
Victor Vieux
2013-09-09 22:19:28 +00:00
bddbd1b5d0Merge branch 'filter' of https://github.com/reds/docker into reds-filter Upstream-commit: 843f9091f25eee67a8c858ddf9b61d630b17a11d Component: engine
Victor Vieux
2013-09-09 22:16:16 +00:00
cebebc8343gofmt Upstream-commit: 6678a26d1c94e7838c055a3da3b91ae3de8c3e3c Component: engine
Jason McVetta
2013-09-09 15:11:30 -07:00
b6370d00a5Hack: use vendored dependencies in-place, for less moving parts when developing Upstream-commit: e37dcd726fe415193eaed18729251d293a018909 Component: engine
Solomon Hykes
2013-09-09 15:05:25 -07:00
f14e5c017dMerge pull request #1828 from mmikulicic/patch-1
Andy Rothfusz
2013-09-09 14:51:28 -07:00
0f7accf191Merge pull request #1836 from srid/patch-2
Andy Rothfusz
2013-09-09 14:50:36 -07:00
94007cc5e6remove docker-ruby from docs
Sridhar Ratnakumar
2013-09-09 14:42:45 -07:00
fb9071f221only os.Exits on error Upstream-commit: 46a1cd69a99a9adc7bc366f1eb2c03b62f464d39 Component: engine
Victor Vieux
2013-09-09 21:26:35 +00:00
887e5a84efMerge pull request #1812 from dotcloud/return-run-exit-code
Victor Vieux
2013-09-09 14:10:46 -07:00
9cb316385eMerge pull request #1773 from hectcastro/hc-riak-example
Andy Rothfusz
2013-09-09 13:31:41 -07:00
8ab45c6770bind mount /etc/hosts and /etc/hostname Upstream-commit: 4f2e59f94a771c4b60947726815d065ef0ea253a Component: engine
Victor Vieux
2013-09-09 18:57:25 +00:00
b8740215e5add domainname support Upstream-commit: 0a436e03b8289510ad191a89fcbd5ec06fb8865d Component: engine
Victor Vieux
2013-08-29 22:21:32 +00:00
bdd7f084cdMerge pull request #1807 from tianon/gentoo-docs
Andy Rothfusz
2013-09-09 13:27:48 -07:00
122c44caefCreated a little landing page for the examples, combined first two. Upstream-commit: fe99e51634f7068ce997e9866516f2b14a93bda9 Component: engine
Andy Rothfusz
2013-09-09 13:19:07 -07:00
ad4c847399Merge pull request #1833 from shin-/1815-always-push-tags
Joffrey F
2013-09-09 13:10:40 -07:00
3b3fbee916Push tags to registry even if images are already uploaded Upstream-commit: 64bc08f1c4bee42ff5a17b2d6ababb288fd8f209 Component: engine
shin-
2013-09-09 21:02:37 +02:00
79e1a652fcMerge pull request #1831 from brianshumate/jbs-docs-edits
Andy Rothfusz
2013-09-09 11:48:12 -07:00
fe18d490b4note about exiting from attachment prior to running Upstream-commit: 9749d94fb0f3034247dbd969f6dad390f2605e1a Component: engine
Brian Shumate
2013-09-09 10:30:06 -04:00
6d96bcd64cPlease add go-dockerclient to docker API clients doc Upstream-commit: 268928ab35a5402ff37413ab258200c4bed48790 Component: engine
Marko Mikulicic
2013-09-09 11:01:15 +01:00
774dff2935Hack: we no longer need to generate test binaries. Upstream-commit: 4cd59b96ed93d8a4c35099a0a1171e17170071ab Component: engine
Solomon Hykes
2013-09-08 18:45:23 -07:00
970480b8f8Document using the Dockerfile for interactive dev/test cycles Upstream-commit: d757bd0904b71346b6c83622ae5685bc0c0d4349 Component: engine
Solomon Hykes
2013-09-06 20:16:13 -07:00
742fb66041Hack: improve the Dockerfile for an easier development workflow. Build dev container once, run a shell with source mount-binded, run tests as you edit. LIKE A BOSS. Upstream-commit: 47838051be695a4e74c80690ceef811dcd3ef62c Component: engine
Solomon Hykes
2013-09-06 20:14:03 -07:00
4d40f8afe3Add usage instructions to the Dockerfile. Build, test and release docker using docker. Upstream-commit: fa806f26aff927eb0d98b41e79786ae98987da5b Component: engine
Solomon Hykes
2013-09-06 19:58:05 -07:00
c090718b10Adapt Dockerfile to run docker tests inside docker Upstream-commit: 34eab428330ce4a56c22b03f3067dd8eeee7ed41 Component: engine
Solomon Hykes
2013-09-06 19:19:03 -07:00
ae4d5c759fAdapt the original dind script and add a description Upstream-commit: 3c80bd76cf6aa8f6918439f8082b0a8c34fd2c0e Component: engine
Solomon Hykes
2013-09-06 19:03:29 -07:00
14c14520dcREADME: remove original shipping containers 'manifesto'. It's a little long to stay here. Upstream-commit: eed00a4afd1e8e8e35f8ca640c94d9c9e9babaf7 Component: engine
Solomon Hykes
2013-09-06 15:09:40 -07:00
6a1261fd84README: replace 'install instructions' and 'usage examples' with references to the website and docs Upstream-commit: 6679f3b053344e6e99d5e490720c9ccb924a7d4c Component: engine
Solomon Hykes
2013-09-06 15:09:04 -07:00
c1a63c6958README: refer to the docs for install instructions to remove duplication. Upstream-commit: bcb8d3fd86ac620dc4f35c805b4e0f8e8fcb7663 Component: engine
Solomon Hykes
2013-09-06 14:52:14 -07:00
df765d9499Merge pull request #1777 from dotcloud/1620-index-test
Daniel Mizyrycki
2013-09-06 09:21:05 -07:00
8fddc1cc80Improve network performance for VirtualBox
Dmitry Demeshchuk
2013-09-05 21:05:23 -07:00
c9f3b3971fMerge pull request #1780 from shin-/1218-push-dependencies
Joffrey F
2013-09-05 17:32:45 -07:00
7453a21af1Merge pull request #1810 from dotcloud/1798-inspect-fix
Michael Crosby
2013-09-05 17:17:09 -07:00
9d62bab207Merge pull request #1811 from dotcloud/672-remove_getcache
Michael Crosby
2013-09-05 17:07:49 -07:00
73b7802f1fFrom FIXME: local path for ADD Upstream-commit: 8374dac02141c1409b93bb3838f6dabbba4d5b14 Component: engine
Martin Redmond
2013-09-05 08:28:02 -04:00
d2ed0c7fa0Return the process exit code for run commands Upstream-commit: 3bc73fa21e4428cd7040df6c5a384bd0e4772236 Component: engine
Michael Crosby
2013-09-05 23:54:03 +00:00
e7babc83ebfix indent in doc Upstream-commit: 20a763e51934f3b52e48b5a6ba37d63852fd9a0b Component: engine
Victor Vieux
2013-09-05 22:33:04 +00:00
e904047138Detect images/containers conflicts in docker inspect Upstream-commit: 5ec2fea6dd3360de326717ed01909b8fe9c39d0f Component: engine
Victor Vieux
2013-09-05 22:28:51 +00:00
236805a6b0Merge pull request #1803 from dotcloud/1802-skip-TestGetContainersTop
Victor Vieux
2013-09-05 14:44:47 -07:00
cab30800ecUpdate Gentoo docs to reflect the package name change from app-emulation/lxc-docker to app-emulation/docker as discussed in today's #docker-meeting Upstream-commit: d368c2dee99b35830392938a783137f344e5b89a Component: engine
Tianon Gravi
2013-09-05 13:36:56 -06:00
14f3a4d119Bumped API version in api.go ; added <1.5 behavior to getContainersJSON Upstream-commit: 9ae5054c3477c6eb9afc64ad44ff41bb3f10a8ab Component: engine
shin-
2013-09-04 23:41:44 +02:00