0089cd0195Merge branch 'master' into add_last_version-feature Upstream-commit: 39ff542142e61dd9041925ad95fbac23be307414 Component: engine
Victor Vieux
2013-07-18 20:51:31 +00:00
03dd48c968Merge pull request #1230 from dotcloud/switch_dev
Victor Vieux
2013-07-18 13:50:40 -07:00
325ed80b66switch version to -dev Upstream-commit: 0089dd05e910852d5b821074c73287e730040630 Component: engine
Victor Vieux
2013-07-18 20:50:04 +00:00
d7ec6adcd6Merge pull request #1227 from dotcloud/bump_0.5.0
Victor Vieux
2013-07-18 11:51:29 -07:00
3427bb07afdocumentation. Upstream-commit: cd209f406e889feaba50103e5ce50f7dcd23767a Component: engine
Nan Monnand Deng
2013-07-18 14:22:49 -04:00
e4606d6f3fMerge pull request #1226 from metalivedev/easydockerfile
Andy Rothfusz
2013-07-18 10:14:22 -07:00
608601a191change -b -> -v and add udp example Upstream-commit: b083418257edbcb769dd1bf9a6a3dafd334d5969 Component: engine
Victor Vieux
2013-07-18 16:24:12 +00:00
093a55ab02Merge pull request #1169 from crosbymichael/buildfile-tests
Victor Vieux
2013-07-18 08:35:23 -07:00
1df4154799Add unit tests for buildfile config instructions
Michael Crosby
2013-07-08 17:06:06 -09:00
e1b72763dcadd debug and simplify docker logs Upstream-commit: 1b0fd7ead33722d8782634d54cbd797f284aa085 Component: engine
Victor Vieux
2013-07-18 13:29:40 +00:00
9423c7f84dadd legacy support Upstream-commit: a926cd4d880904258e01ea521ecd9e1b908f2b97 Component: engine
Victor Vieux
2013-07-18 13:25:47 +00:00
97e62e30e8Make dockerfile docs easier to find. Clean up formatting. Upstream-commit: aa5671411b727d7142c289b5c1b473209aeaf630 Component: engine
Andy Rothfusz
2013-07-17 18:56:40 -07:00
7c7e6abf06+ Runtime: inject dockerinit at /.dockerinit instead of overwriting /sbin/init. This makes it possible to run /sbin/init inside a container. Upstream-commit: 5d8efc107d2c7b7da61a6d22657190c6f13713d2 Component: engine
Solomon Hykes
2013-06-14 16:56:08 -07:00
7446d96badMerge pull request #1225 from dotcloud/hotfix_docker_rmi
Victor Vieux
2013-07-17 14:31:56 -07:00
13dc02d1d8add VolumesFrom to MergeConfig, and test Upstream-commit: 1a226f0e28e7da4eb3701b31dbe959142c42b752 Component: engine
Victor Vieux
2013-07-17 21:06:46 +00:00
3e4e3b1c00Merge pull request #1219 from metalivedev/docs-repoupdate
Andy Rothfusz
2013-07-17 13:53:12 -07:00
ef71cbddf6add Volumes and VolumesFrom to CompareConfig Upstream-commit: 7c00201222e29989214b7e8a221b057daba0a27d Component: engine
Victor Vieux
2013-07-17 20:51:25 +00:00
fb0bdc7ba8prevent any kind of operation simultaneously Upstream-commit: 2db99441c85fdf1e7d468bc02b085d9e1b95704c Component: engine
Victor Vieux
2013-07-17 20:39:36 +00:00
2b2f5cce76Merge pull request #1194 from crosbymichael/build-verbose
Guillaume J. Charmes
2013-07-17 12:53:06 -07:00
a44b5f6d5bchange rm usage in docs Upstream-commit: 9cf2b41c053d557af6c563311b4953c4b9bab6d6 Component: engine
Victor Vieux
2013-07-17 19:24:54 +00:00
aa3ed33e67Merge branch 'master' of https://github.com/kencochrane/docker into kencochrane-master Upstream-commit: f310b875f8972870e87e4395b5dbd8613b66fa39 Component: engine
Victor Vieux
2013-07-17 19:23:06 +00:00
926b49f016Changed date on changelog Upstream-commit: ac14c463d55494fdab88d36ea74a4ecef8ab48dc Component: engine
Solomon Hykes
2013-07-17 11:51:26 -07:00
59f9a15c00Merge pull request #1212 from dotcloud/merge_v_b_options
Guillaume J. Charmes
2013-07-17 11:43:47 -07:00
7e19e5b9ccMerge pull request #1222 from lopter/master
Victor Vieux
2013-07-17 11:40:33 -07:00
28398dc429updated with notes from @vieux Upstream-commit: d0e8ca1257f7f969a035d3d78b55e08c067e8a20 Component: engine
Ken Cochrane
2013-07-17 13:46:11 -04:00
7d6b6db98efix docker rmi via id Upstream-commit: 5a934fc923af316a6e82b9dd11169484b3b744f6 Component: engine
Victor Vieux
2013-07-17 15:48:53 +00:00
be8eb02780Always stop the opposite goroutine in network_proxy.go (closes#1213) Upstream-commit: c766d064ac6c2183321cb2e47ea8c0b0b2d2d238 Component: engine
Louis Opter
2013-07-17 01:02:07 -07:00
edde9aeb1cAdd CompareConfig test Upstream-commit: 48a892bee5270feea3d0e7b64963acb38dbd634b Component: engine
Victor Vieux
2013-07-16 15:58:23 +00:00
e7c82564d0add server.ContainerTop, server.poolAdd and ser.poolRemove tests Upstream-commit: fb005a3da813ba855b6597c146b66842846df3d8 Component: engine
Victor Vieux
2013-07-16 14:38:18 +00:00
ef03a6ab8cHotfix: make sure ./utils tests pass Upstream-commit: 1004d57b85fc3714b089da4c457228690f254504 Component: engine
Guillaume J. Charmes
2013-07-15 17:56:18 -07:00
f64f4f840fMerge pull request #1210 from dotcloud/improve_configmerge
Nick Stinemates
2013-07-15 18:04:12 -07:00
df2dfb45a8Merge -b and -v options Upstream-commit: eefbadd230d2788b0bdf0daac38ada0d145e3861 Component: engine
Guillaume J. Charmes
2013-07-15 17:18:11 -07:00
723f4f9ef0Bump version to 0.5.0 Upstream-commit: bc21b3ebf0dadc51e47d971217d132e5299831a0 Component: engine
Guillaume J. Charmes
2013-07-15 14:55:51 -07:00
6a9b073bb8Merge pull request #1208 from crosbymichael/1201-rw-volumes-from
Guillaume J. Charmes
2013-07-15 10:59:51 -07:00
ff7fe2dacdMerge pull request #1096 from dotcloud/remove_os_user
Guillaume J. Charmes
2013-07-15 10:19:09 -07:00
08204dd54eAdd unit test to check wrong uid case Upstream-commit: e41507bde2d87cb9bbb0c328e414a39354dae10e Component: engine
Guillaume J. Charmes
2013-07-01 17:08:42 -07:00
80066854b8store both logs in a same file, as JSON Upstream-commit: 599f85d4e4362f24dc2850c71a689671122c456b Component: engine
Victor Vieux
2013-07-15 16:17:58 +00:00
cb4f99ad54Merge branch 'master' into new_logs Upstream-commit: 5756ba9bc48ef428bd73b9b123807097c1519db0 Component: engine
Victor Vieux
2013-07-15 13:57:54 +00:00
c3b2bff375improve mergeconfig, if dns, portspec, env or volumes specify in docker run, apend and not replace Upstream-commit: 193a7e1dc1945bc9988b6205c63db9d2e0578c55 Component: engine
Victor Vieux
2013-07-15 13:12:33 +00:00
632014a7bfdocker.upstart: use the same start/stop events as sshd
Jonas Pfenniger
2013-07-15 11:41:19 +01:00
4b7018962adocker.upstart: avoid spawning a sh process
Jonas Pfenniger
2013-07-15 11:36:05 +01:00
6fdf5346eaCopy VolumesRW values when using --volumes-from
Michael Crosby
2013-07-14 18:23:20 -09:00
f2d0413152reuse the type Upstream-commit: d639f61ec1c80f8d8d65386ec9331dbb6e218cb0 Component: engine
benoitc
2013-07-13 19:19:38 +02:00
f58c6a0202Merge pull request #1200 from ToothlessGear/fix-whitespaces_progessbar
Victor Vieux
2013-07-13 08:50:50 -07:00
4e2ad07ebeMerge pull request #1190 from dotcloud/1189-add_debug_error
Victor Vieux
2013-07-13 08:15:59 -07:00
89d632a562Merge pull request #1198 from dotcloud/fix_pull_tag
Victor Vieux
2013-07-13 08:14:47 -07:00
913ca03001useless function. forgot to remove it. Upstream-commit: a3b1a9f01a1c08c63e6c37945414481176817ba6 Component: engine
benoitc
2013-07-13 17:04:04 +02:00
2ad516346auseless type Upstream-commit: 507cef8bcea5b56d25d34ca7073c46f608962f19 Component: engine
benoitc
2013-07-13 17:03:04 +02:00
48162573baput the websocket route in the map containing all routes
benoitc
2013-07-13 16:59:07 +02:00
1aa0235482Hack: use helper functions in tests for less copy-pasting Upstream-commit: 080243f0407a90cdacf128dc3b53a802549d7797 Component: engine
Solomon Hykes
2013-07-12 17:56:55 -07:00
26198a8a13Merge pull request #1054 from nickstenning/getimage-by-tag
Guillaume J. Charmes
2013-07-12 16:15:04 -07:00
54ca7a355cReverse priority of tag lookup in TagStore.GetImage
Nick Stenning
2013-06-28 17:06:00 +01:00
8b3fabeb5fMerge pull request #1083 from hukeli/debian
Daniel Mizyrycki
2013-07-12 15:24:37 -07:00
9da4e15f2eMerge pull request #1203 from dotcloud/1202-packaging-debian
Daniel Mizyrycki
2013-07-12 15:11:57 -07:00
969d894058Packaging, issue #1202: Upgrade vagrantfile go in debian packaging Upstream-commit: c7a48e91d8d31a8b80b46f4cb17d866e36147ddc Component: engine
Daniel Mizyrycki
2013-07-12 15:06:02 -07:00
51c31b8a66*Client: Fix the progressbar, without manipulating other outputs
Marcus Farkas
2013-07-12 20:15:25 +02:00
23db3e215bRevert "Client: better progressbar output"
Marcus Farkas
2013-07-12 20:08:45 +02:00
aa8559ee18updated the rmi command docs, the had typos Upstream-commit: 364f48d6c7386874ee3fa0696b7a466f76fcf698 Component: engine
Ken Cochrane
2013-07-12 14:05:26 -04:00
f649b0a057updated the help commands on a few commands that were not correct Upstream-commit: 4174e7aa7a6600a2cfedd1c568000556cf1daf79 Component: engine
Ken Cochrane
2013-07-12 13:55:26 -04:00
014efc77a7Remove the os.user dependency and manually lookup /etc/passwd instead Upstream-commit: eb38750d99d4f9706cb2abcb861c84e1d309bd40 Component: engine
Guillaume J. Charmes
2013-07-01 16:48:59 -07:00
c8bc9a992cFixed tag option for "docker pull" (the option was ignored) Upstream-commit: cd0fef633c5d871b192146e405ca7c5bebb2f3ba Component: engine
Sam Alba
2013-07-12 10:42:54 -07:00
3442b5e984Add param to api docs for verbose build output Upstream-commit: d0c73c28df5627bc7158fd54860f6751b4dab0f9 Component: engine
Michael Crosby
2013-07-12 06:22:56 -09:00
6ed4740f8bMerge pull request #1197 from crosbymichael/buildfile-doc-ordering
Victor Vieux
2013-07-12 05:27:47 -07:00
5d09c440fbMerge pull request #977 from dotcloud/966-improve_docker_login_parameters-feature
Victor Vieux
2013-07-12 05:07:25 -07:00
e7310096d4Merge pull request #1102 from dotcloud/1098-store_hostconfig_tmp
Victor Vieux
2013-07-12 05:04:10 -07:00
a1035172cdMerge pull request #1192 from dotcloud/docker_port-fix
Victor Vieux
2013-07-12 04:57:53 -07:00
318bacb03aMerge pull request #1055 from dotcloud/list_container_processes-feature
Victor Vieux
2013-07-12 04:56:12 -07:00
ac70e7d7dbfix tests regarding the new test image Upstream-commit: a8a6848ce0c3c54d00cfcd85727546e54a4dcf7e Component: engine
Victor Vieux
2013-07-12 11:54:53 +00:00
c22c23bfc2Merge branch 'master' into list_container_processes-feature Upstream-commit: 9232d1ef62b6be8979052599625af8a71227662c Component: engine
Victor Vieux
2013-07-12 11:47:27 +00:00
89646a08c9Revert changes from PR 1030
Michael Crosby
2013-07-11 15:52:08 -09:00
7bf5a45cfeFix buildfile tests after rebase Upstream-commit: 49044a96089487b9df075fa972e83e4c05c7fae8 Component: engine
Michael Crosby
2013-07-11 15:37:26 -09:00
725d76d0d9Hotfix: check the length of entrypoint before comparing. Upstream-commit: 71d2ff494694d7f18310c7994daa34dce33af98b Component: engine
Guillaume J. Charmes
2013-07-11 17:31:07 -07:00
015f243412Add verbose output to docker build
Michael Crosby
2013-07-11 15:12:25 -09:00
900f657bd8Merge pull request #1124 from crosbymichael/buildfile-volumes
Guillaume J. Charmes
2013-07-11 17:16:57 -07:00
ba109b6d9afix broken docker port Upstream-commit: affe7caf78288a638df3db37d5cebb4dc7f9ff72 Component: engine
Victor Vieux
2013-07-11 19:27:19 +02:00
750c01d0afwip Upstream-commit: 941e3e2ef09092306a7a287ce62b6fb518af9c56 Component: engine
Victor Vieux
2013-07-11 17:18:28 +00:00
de5cf1eef5add debug for error in the server Upstream-commit: b7937e268fcbc529a168164fc242edc56d51094c Component: engine
Victor Vieux
2013-07-11 12:21:43 +00:00
cafbcadc85Make the TestAllocate{UDP,TCP}PortLocalhost more reliable
Louis Opter
2013-07-10 18:02:41 -07:00
1aa2442604Packaging, issue #1174: Add pure binary to docker release Upstream-commit: bf26ae03cfe38fc0fdd6f7dedd53041204df0767 Component: engine
Daniel Mizyrycki
2013-07-10 17:39:00 -07:00
720f595c48Merge pull request #1178 from dotcloud/fix-dev-environment
Andy Rothfusz
2013-07-10 16:53:22 -07:00
a7f78c9225Merge pull request #1183 from dotcloud/960-packaging-PPA
Daniel Mizyrycki
2013-07-10 16:16:31 -07:00
646603a285Packaging, issue #960: Document PUBLISH_PPA for staging/production release Upstream-commit: f83c31e18834d57ec56e1249b80174fbe0a0f8c9 Component: engine
Daniel Mizyrycki
2013-07-10 16:00:35 -07:00
26ac911253Raise the timeouts for the TCP/UDP localhost proxy tests
Louis Opter
2013-07-10 16:05:14 -07:00
ebb59e49d1reduce the number of string copy operations. Upstream-commit: 73e79a3310f3976b61a295f45e12aead9af41962 Component: engine
Nan Monnand Deng
2013-07-01 17:57:56 -04:00