Commit Graph

  • c1964bd08e Merge pull request #1232 from dotcloud/1217-testing-coverage Daniel Mizyrycki 2013-07-18 14:27:37 -07:00
  • 9c8c35f4bd handle -dev Upstream-commit: 0afed3eded0950b5899729714fb11d6a7322301e Component: engine Victor Vieux 2013-07-18 20:56:41 +00:00
  • 0089cd0195 Merge branch 'master' into add_last_version-feature Upstream-commit: 39ff542142e61dd9041925ad95fbac23be307414 Component: engine Victor Vieux 2013-07-18 20:51:31 +00:00
  • 03dd48c968 Merge pull request #1230 from dotcloud/switch_dev Victor Vieux 2013-07-18 13:50:40 -07:00
  • 325ed80b66 switch version to -dev Upstream-commit: 0089dd05e910852d5b821074c73287e730040630 Component: engine Victor Vieux 2013-07-18 20:50:04 +00:00
  • d7ec6adcd6 Merge pull request #1227 from dotcloud/bump_0.5.0 Victor Vieux 2013-07-18 11:51:29 -07:00
  • 3427bb07af documentation. Upstream-commit: cd209f406e889feaba50103e5ce50f7dcd23767a Component: engine Nan Monnand Deng 2013-07-18 14:22:49 -04:00
  • e4606d6f3f Merge pull request #1226 from metalivedev/easydockerfile Andy Rothfusz 2013-07-18 10:14:22 -07:00
  • 608601a191 change -b -> -v and add udp example Upstream-commit: b083418257edbcb769dd1bf9a6a3dafd334d5969 Component: engine Victor Vieux 2013-07-18 16:24:12 +00:00
  • 093a55ab02 Merge pull request #1169 from crosbymichael/buildfile-tests Victor Vieux 2013-07-18 08:35:23 -07:00
  • 1df4154799 Add unit tests for buildfile config instructions Michael Crosby 2013-07-08 17:06:06 -09:00
  • e1b72763dc add debug and simplify docker logs Upstream-commit: 1b0fd7ead33722d8782634d54cbd797f284aa085 Component: engine Victor Vieux 2013-07-18 13:29:40 +00:00
  • 9423c7f84d add legacy support Upstream-commit: a926cd4d880904258e01ea521ecd9e1b908f2b97 Component: engine Victor Vieux 2013-07-18 13:25:47 +00:00
  • 97e62e30e8 Make 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
  • 7446d96bad Merge pull request #1225 from dotcloud/hotfix_docker_rmi Victor Vieux 2013-07-17 14:31:56 -07:00
  • 13dc02d1d8 add VolumesFrom to MergeConfig, and test Upstream-commit: 1a226f0e28e7da4eb3701b31dbe959142c42b752 Component: engine Victor Vieux 2013-07-17 21:06:46 +00:00
  • 3e4e3b1c00 Merge pull request #1219 from metalivedev/docs-repoupdate Andy Rothfusz 2013-07-17 13:53:12 -07:00
  • ef71cbddf6 add Volumes and VolumesFrom to CompareConfig Upstream-commit: 7c00201222e29989214b7e8a221b057daba0a27d Component: engine Victor Vieux 2013-07-17 20:51:25 +00:00
  • fb0bdc7ba8 prevent any kind of operation simultaneously Upstream-commit: 2db99441c85fdf1e7d468bc02b085d9e1b95704c Component: engine Victor Vieux 2013-07-17 20:39:36 +00:00
  • 2b2f5cce76 Merge pull request #1194 from crosbymichael/build-verbose Guillaume J. Charmes 2013-07-17 12:53:06 -07:00
  • a44b5f6d5b change rm usage in docs Upstream-commit: 9cf2b41c053d557af6c563311b4953c4b9bab6d6 Component: engine Victor Vieux 2013-07-17 19:24:54 +00:00
  • aa3ed33e67 Merge 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
  • 926b49f016 Changed date on changelog Upstream-commit: ac14c463d55494fdab88d36ea74a4ecef8ab48dc Component: engine Solomon Hykes 2013-07-17 11:51:26 -07:00
  • 59f9a15c00 Merge pull request #1212 from dotcloud/merge_v_b_options Guillaume J. Charmes 2013-07-17 11:43:47 -07:00
  • 7e19e5b9cc Merge pull request #1222 from lopter/master Victor Vieux 2013-07-17 11:40:33 -07:00
  • 76eb7762ab Small changes in changelog wording Upstream-commit: 8af945f353379a96eb036d67fb24d489c5e16808 Component: engine Solomon Hykes 2013-07-17 11:39:38 -07:00
  • 28398dc429 updated with notes from @vieux Upstream-commit: d0e8ca1257f7f969a035d3d78b55e08c067e8a20 Component: engine Ken Cochrane 2013-07-17 13:46:11 -04:00
  • 7d6b6db98e fix docker rmi via id Upstream-commit: 5a934fc923af316a6e82b9dd11169484b3b744f6 Component: engine Victor Vieux 2013-07-17 15:48:53 +00:00
  • be8eb02780 Always 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
  • 2953a9d955 Update repository information. Upstream-commit: 0356081c0ad2f1d95fb435f9a491f7a7a63cbf33 Component: engine Andy Rothfusz 2013-07-16 17:04:41 -07:00
  • 73fd748fb2 Testing, issue #1217: Add coverage testing into docker-ci Upstream-commit: 6e8bfc8d12ca062dc4c311d528784c1dec27079d Component: engine Daniel Mizyrycki 2013-07-16 13:45:43 -07:00
  • a4a2ab57ce Update docs Upstream-commit: 18e91d5f85a008ef48d724db964330ddaa1bbf10 Component: engine Guillaume J. Charmes 2013-07-16 10:14:21 -07:00
  • edde9aeb1c Add CompareConfig test Upstream-commit: 48a892bee5270feea3d0e7b64963acb38dbd634b Component: engine Victor Vieux 2013-07-16 15:58:23 +00:00
  • e7c82564d0 add server.ContainerTop, server.poolAdd and ser.poolRemove tests Upstream-commit: fb005a3da813ba855b6597c146b66842846df3d8 Component: engine Victor Vieux 2013-07-16 14:38:18 +00:00
  • ef03a6ab8c Hotfix: make sure ./utils tests pass Upstream-commit: 1004d57b85fc3714b089da4c457228690f254504 Component: engine Guillaume J. Charmes 2013-07-15 17:56:18 -07:00
  • f64f4f840f Merge pull request #1210 from dotcloud/improve_configmerge Nick Stinemates 2013-07-15 18:04:12 -07:00
  • df2dfb45a8 Merge -b and -v options Upstream-commit: eefbadd230d2788b0bdf0daac38ada0d145e3861 Component: engine Guillaume J. Charmes 2013-07-15 17:18:11 -07:00
  • 723f4f9ef0 Bump version to 0.5.0 Upstream-commit: bc21b3ebf0dadc51e47d971217d132e5299831a0 Component: engine Guillaume J. Charmes 2013-07-15 14:55:51 -07:00
  • 9051673e68 Merge pull request #1184 from dotcloud/1176-packaging-release Solomon Hykes 2013-07-15 13:59:55 -07:00
  • f98fac335f Do not overwrite container volumes from config Michael Crosby 2013-07-14 15:26:57 -09:00
  • f15cfa7eb5 Merge pull request #1188 from dotcloud/1174-packaging-binary Solomon Hykes 2013-07-15 13:59:06 -07:00
  • 72d4396796 packaging, issue #1176: Document PPA release step Upstream-commit: 75a0052e64d0b9cc214cd58ba798863c69f6c5d3 Component: engine Daniel Mizyrycki 2013-07-15 12:13:20 -07:00
  • 6a9b073bb8 Merge pull request #1208 from crosbymichael/1201-rw-volumes-from Guillaume J. Charmes 2013-07-15 10:59:51 -07:00
  • ff7fe2dacd Merge pull request #1096 from dotcloud/remove_os_user Guillaume J. Charmes 2013-07-15 10:19:09 -07:00
  • 08204dd54e Add unit test to check wrong uid case Upstream-commit: e41507bde2d87cb9bbb0c328e414a39354dae10e Component: engine Guillaume J. Charmes 2013-07-01 17:08:42 -07:00
  • 80066854b8 store both logs in a same file, as JSON Upstream-commit: 599f85d4e4362f24dc2850c71a689671122c456b Component: engine Victor Vieux 2013-07-15 16:17:58 +00:00
  • cb4f99ad54 Merge branch 'master' into new_logs Upstream-commit: 5756ba9bc48ef428bd73b9b123807097c1519db0 Component: engine Victor Vieux 2013-07-15 13:57:54 +00:00
  • c3b2bff375 improve 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
  • 632014a7bf docker.upstart: use the same start/stop events as sshd Jonas Pfenniger 2013-07-15 11:41:19 +01:00
  • 4b7018962a docker.upstart: avoid spawning a sh process Jonas Pfenniger 2013-07-15 11:36:05 +01:00
  • 6fdf5346ea Copy VolumesRW values when using --volumes-from Michael Crosby 2013-07-14 18:23:20 -09:00
  • f2d0413152 reuse the type Upstream-commit: d639f61ec1c80f8d8d65386ec9331dbb6e218cb0 Component: engine benoitc 2013-07-13 19:19:38 +02:00
  • f58c6a0202 Merge pull request #1200 from ToothlessGear/fix-whitespaces_progessbar Victor Vieux 2013-07-13 08:50:50 -07:00
  • 4e2ad07ebe Merge pull request #1190 from dotcloud/1189-add_debug_error Victor Vieux 2013-07-13 08:15:59 -07:00
  • 89d632a562 Merge pull request #1198 from dotcloud/fix_pull_tag Victor Vieux 2013-07-13 08:14:47 -07:00
  • 913ca03001 useless function. forgot to remove it. Upstream-commit: a3b1a9f01a1c08c63e6c37945414481176817ba6 Component: engine benoitc 2013-07-13 17:04:04 +02:00
  • 2ad516346a useless type Upstream-commit: 507cef8bcea5b56d25d34ca7073c46f608962f19 Component: engine benoitc 2013-07-13 17:03:04 +02:00
  • 48162573ba put the websocket route in the map containing all routes benoitc 2013-07-13 16:59:07 +02:00
  • 1aa0235482 Hack: use helper functions in tests for less copy-pasting Upstream-commit: 080243f0407a90cdacf128dc3b53a802549d7797 Component: engine Solomon Hykes 2013-07-12 17:56:55 -07:00
  • 26198a8a13 Merge pull request #1054 from nickstenning/getimage-by-tag Guillaume J. Charmes 2013-07-12 16:15:04 -07:00
  • 54ca7a355c Reverse priority of tag lookup in TagStore.GetImage Nick Stenning 2013-06-28 17:06:00 +01:00
  • 8b3fabeb5f Merge pull request #1083 from hukeli/debian Daniel Mizyrycki 2013-07-12 15:24:37 -07:00
  • 9da4e15f2e Merge pull request #1203 from dotcloud/1202-packaging-debian Daniel Mizyrycki 2013-07-12 15:11:57 -07:00
  • 969d894058 Packaging, issue #1202: Upgrade vagrantfile go in debian packaging Upstream-commit: c7a48e91d8d31a8b80b46f4cb17d866e36147ddc Component: engine Daniel Mizyrycki 2013-07-12 15:06:02 -07:00
  • 3cd7f4b75d Merge pull request #1195 from dotcloud/tests-cleanup Solomon Hykes 2013-07-12 14:51:59 -07:00
  • 51c31b8a66 *Client: Fix the progressbar, without manipulating other outputs Marcus Farkas 2013-07-12 20:15:25 +02:00
  • 23db3e215b Revert "Client: better progressbar output" Marcus Farkas 2013-07-12 20:08:45 +02:00
  • aa8559ee18 updated the rmi command docs, the had typos Upstream-commit: 364f48d6c7386874ee3fa0696b7a466f76fcf698 Component: engine Ken Cochrane 2013-07-12 14:05:26 -04:00
  • f649b0a057 updated 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
  • 014efc77a7 Remove 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
  • c8bc9a992c Fixed tag option for "docker pull" (the option was ignored) Upstream-commit: cd0fef633c5d871b192146e405ca7c5bebb2f3ba Component: engine Sam Alba 2013-07-12 10:42:54 -07:00
  • 3442b5e984 Add param to api docs for verbose build output Upstream-commit: d0c73c28df5627bc7158fd54860f6751b4dab0f9 Component: engine Michael Crosby 2013-07-12 06:22:56 -09:00
  • 6ed4740f8b Merge pull request #1197 from crosbymichael/buildfile-doc-ordering Victor Vieux 2013-07-12 05:27:47 -07:00
  • 5d09c440fb Merge pull request #977 from dotcloud/966-improve_docker_login_parameters-feature Victor Vieux 2013-07-12 05:07:25 -07:00
  • e7310096d4 Merge pull request #1102 from dotcloud/1098-store_hostconfig_tmp Victor Vieux 2013-07-12 05:04:10 -07:00
  • a1035172cd Merge pull request #1192 from dotcloud/docker_port-fix Victor Vieux 2013-07-12 04:57:53 -07:00
  • 318bacb03a Merge pull request #1055 from dotcloud/list_container_processes-feature Victor Vieux 2013-07-12 04:56:12 -07:00
  • ac70e7d7db fix tests regarding the new test image Upstream-commit: a8a6848ce0c3c54d00cfcd85727546e54a4dcf7e Component: engine Victor Vieux 2013-07-12 11:54:53 +00:00
  • c22c23bfc2 Merge branch 'master' into list_container_processes-feature Upstream-commit: 9232d1ef62b6be8979052599625af8a71227662c Component: engine Victor Vieux 2013-07-12 11:47:27 +00:00
  • 18c42253ef use http://get.docker.io/latest Upstream-commit: e9011122fbc4c65afe235a75ca8197ce4fd23753 Component: engine Victor Vieux 2013-07-12 11:45:40 +00:00
  • 6a215f8175 Fix Docker Builder documentation numbering Upstream-commit: 90483dc9123d6cb9eb1aa1bf4ba4e851d751784e Component: engine Michael Crosby 2013-07-11 16:41:19 -09:00
  • 6c9e32ae32 Simplify unit tests code with mkRuntime() Upstream-commit: 6bdb6f226b13d5fdd47f3665c9fb753207bf473b Component: engine Solomon Hykes 2013-07-11 17:59:25 -07:00
  • b91cb2c854 Don't leave broken, commented out tests lying around. Upstream-commit: 2ac11419806ce39c57d5caf6b41a66e5ddf45bc8 Component: engine Solomon Hykes 2013-07-11 17:58:45 -07:00
  • 89646a08c9 Revert changes from PR 1030 Michael Crosby 2013-07-11 15:52:08 -09:00
  • 7bf5a45cfe Fix buildfile tests after rebase Upstream-commit: 49044a96089487b9df075fa972e83e4c05c7fae8 Component: engine Michael Crosby 2013-07-11 15:37:26 -09:00
  • 725d76d0d9 Hotfix: check the length of entrypoint before comparing. Upstream-commit: 71d2ff494694d7f18310c7994daa34dce33af98b Component: engine Guillaume J. Charmes 2013-07-11 17:31:07 -07:00
  • 015f243412 Add verbose output to docker build Michael Crosby 2013-07-11 15:12:25 -09:00
  • 900f657bd8 Merge pull request #1124 from crosbymichael/buildfile-volumes Guillaume J. Charmes 2013-07-11 17:16:57 -07:00
  • 5d58cdd260 change output Upstream-commit: 976428f505b64a51efbd97f71acff5db2f4f5ed0 Component: engine Victor Vieux 2013-07-11 20:30:08 +02:00
  • ba109b6d9a fix broken docker port Upstream-commit: affe7caf78288a638df3db37d5cebb4dc7f9ff72 Component: engine Victor Vieux 2013-07-11 19:27:19 +02:00
  • 750c01d0af wip Upstream-commit: 941e3e2ef09092306a7a287ce62b6fb518af9c56 Component: engine Victor Vieux 2013-07-11 17:18:28 +00:00
  • de5cf1eef5 add debug for error in the server Upstream-commit: b7937e268fcbc529a168164fc242edc56d51094c Component: engine Victor Vieux 2013-07-11 12:21:43 +00:00
  • cafbcadc85 Make the TestAllocate{UDP,TCP}PortLocalhost more reliable Louis Opter 2013-07-10 18:02:41 -07:00
  • 1aa2442604 Packaging, issue #1174: Add pure binary to docker release Upstream-commit: bf26ae03cfe38fc0fdd6f7dedd53041204df0767 Component: engine Daniel Mizyrycki 2013-07-10 17:39:00 -07:00
  • 720f595c48 Merge pull request #1178 from dotcloud/fix-dev-environment Andy Rothfusz 2013-07-10 16:53:22 -07:00
  • a7f78c9225 Merge pull request #1183 from dotcloud/960-packaging-PPA Daniel Mizyrycki 2013-07-10 16:16:31 -07:00
  • 646603a285 Packaging, issue #960: Document PUBLISH_PPA for staging/production release Upstream-commit: f83c31e18834d57ec56e1249b80174fbe0a0f8c9 Component: engine Daniel Mizyrycki 2013-07-10 16:00:35 -07:00
  • 26ac911253 Raise the timeouts for the TCP/UDP localhost proxy tests Louis Opter 2013-07-10 16:05:14 -07:00
  • ebb59e49d1 reduce the number of string copy operations. Upstream-commit: 73e79a3310f3976b61a295f45e12aead9af41962 Component: engine Nan Monnand Deng 2013-07-01 17:57:56 -04:00