Commit graph

  • 30c9e7323a Fix missing logging on container creation Aanand Prasad 2015-05-21 20:05:55 +01:00
  • 051f56a1e6 Fix bugs with one-off legacy containers Aanand Prasad 2015-05-21 12:12:30 +01:00
  • b5ce23885b Split out fetching of legacy names so we can test it Aanand Prasad 2015-05-21 12:12:02 +01:00
  • 0fdb8bf814 Refactor migration logic Aanand Prasad 2015-05-21 11:25:06 +01:00
  • e538923545 Merge pull request #1442 from aanand/dashes-in-migration-command Aanand Prasad 2015-05-21 18:19:30 +01:00
  • c0f65a9f4c Merge pull request #1445 from aanand/replace-sleep-with-top Daniel Nephin 2015-05-21 11:51:23 -05:00
  • b0cb31c186 Use 'top' instead of 'sleep' as a dummy command Aanand Prasad 2015-05-21 16:19:15 +01:00
  • 3080244c0b Rename migrate_to_labels -> migrate-to-labels Aanand Prasad 2015-05-21 14:54:41 +01:00
  • b183a66db1 Merge pull request #1437 from dnephin/fix_project_containers Aanand Prasad 2015-05-21 10:42:08 +01:00
  • 022f81711e Fixes #1434, Project.containers with service_names. Daniel Nephin 2015-05-20 20:45:48 -04:00
  • 4f40d0c168 Merge pull request #1433 from bfirsh/remove-whitespace-from-json-representation-of-container-config Aanand Prasad 2015-05-20 16:55:02 +01:00
  • f5ac1fa073 Remove whitespace from json hash Ben Firshman 2015-05-20 16:02:08 +01:00
  • f79eb7b9ad Merge pull request #1382 from lsowen/security_opt Ben Firshman 2015-05-20 13:40:42 +01:00
  • b0b6ed31c4 Merge pull request #1430 from albers/fix-1426 Aanand Prasad 2015-05-20 12:31:18 +01:00
  • ea7ee301c0 Add security_opt as a docker-compose.yml option lsowen 2015-04-17 01:34:42 +00:00
  • 41315b32cb Fix #1426 - migrate_to_labels not found Harald Albers 2015-05-19 16:37:50 +02:00
  • 80eaf4cc9f Merge pull request #1399 from aanand/state Aanand Prasad 2015-05-18 19:25:42 +01:00
  • ef4eb66723 Implement smart recreate behind an experimental CLI flag Aanand Prasad 2015-05-12 11:11:36 +01:00
  • 82bc7cd5ba Remove override_options arg from recreate_container(s) Aanand Prasad 2015-05-12 14:35:44 +01:00
  • 3304c68891 Only set AttachStdin/out/err for one-off containers Aanand Prasad 2015-05-12 11:11:36 +01:00
  • 1e6d912fbc Merge pull request #1356 from dnephin/use_labels_instead_of_names Aanand Prasad 2015-05-18 17:38:46 +01:00
  • 4ef3bbcdf2 Merge pull request #1415 from aanand/fix-run-race-condition Aanand Prasad 2015-05-18 16:16:31 +01:00
  • 62059d55e6 Add migration warning and option to migrate to labels. Daniel Nephin 2015-05-09 12:53:59 -04:00
  • ed50a0a3a0 Resolves #1066, use labels to identify containers Daniel Nephin 2015-04-26 17:09:20 -04:00
  • 28d2aff8b8 Fix teardown for integration tests. Daniel Nephin 2015-04-26 21:21:55 -04:00
  • 862971cffa Fix race condition in docker-compose run Aanand Prasad 2015-05-15 12:16:24 +01:00
  • c8022457eb Merge pull request #1413 from aanand/update-dockerpty Daniel Nephin 2015-05-14 21:23:46 -04:00
  • 9bbf1a33d1 Update dockerpty to 0.3.3 Aanand Prasad 2015-05-14 19:59:52 +01:00
  • 0ac8c3cb03 Merge pull request #858 from dnephin/fix_volumes_recreate_on_1.4.1 Aanand Prasad 2015-05-14 16:12:08 +01:00
  • d5c9626040 Merge pull request #1411 from aanand/fix-extends-docs Daniel Nephin 2015-05-14 09:53:38 -04:00
  • ad9c5ad938 Fix typo in extends.md Aanand Prasad 2015-05-14 10:48:35 +01:00
  • 70d2e64dfe Merge pull request #1407 from aanand/update-docker-py Daniel Nephin 2015-05-12 20:22:48 -04:00
  • 1dccd58209 Update docker-py to 1.2.2 Aanand Prasad 2015-05-12 18:51:45 +01:00
  • e0103ac0d4 Merge pull request #1405 from bfirsh/link-to-getting-started-guides-from-each-page Aanand Prasad 2015-05-12 14:40:53 +01:00
  • 4d745ab87a Link to getting started guides from each page Ben Firshman 2015-05-12 12:44:43 +01:00
  • 417d9c2d51 Use individual volumes for recreate instead of volumes_from Daniel Nephin 2015-05-09 19:38:53 -04:00
  • 4997facbb4 Merge pull request #1400 from DanElbert/754-device_option Daniel Nephin 2015-05-11 12:42:48 -04:00
  • df87bd91c8 Added devices configuration option Signed-off-by: Dan Elbert <dan.elbert@gmail.com> delbert@umn.edu 2015-05-08 18:14:32 -05:00
  • 1748b0f81a Merge pull request #1349 from dnephin/rename_instead_of_intermediate Aanand Prasad 2015-05-08 10:33:28 +01:00
  • 6829efd4d3 Resolves #874, Rename instead of use an intermediate. Daniel Nephin 2015-04-24 14:05:17 -04:00
  • 99f2a3a583 Merge pull request #1396 from albers/completion-doc Daniel Nephin 2015-05-07 14:04:16 -04:00
  • 0f2f9db6d8 Merge pull request #1388 from vdemeester/1303-log-driver-support Daniel Nephin 2015-05-07 12:00:42 -04:00
  • d6223371d6 Fix markdown formatting issue Harald Albers 2015-05-07 03:22:11 -07:00
  • 4817d5944c Merge pull request #1391 from albers/completion-extglob Daniel Nephin 2015-05-06 10:46:13 -04:00
  • f626fc5ce8 Add support for log-driver in docker-compose.yml Vincent Demeester 2015-05-06 13:18:58 +02:00
  • 1579a125a3 Ensure that exglob is set in bash completion Harald Albers 2015-05-06 09:33:22 +02:00
  • 7fb9ec29c4 Merge pull request #1335 from chernjie/pid_readonly Daniel Nephin 2015-05-05 20:50:01 -04:00
  • f78e89f265 Merge pull request #1381 from sherter/help-fix Daniel Nephin 2015-05-05 20:48:25 -04:00
  • b06294399a See #1335: Added --read-only CJ 2015-03-29 23:28:57 +08:00
  • b8e0aed21c Show proper command in help text of build subcommand Simon Herter 2015-05-01 18:51:20 -04:00
  • 4bce388b51 Merge pull request #1376 from aanand/fix-build-non-ascii-filename Daniel Nephin 2015-04-30 20:54:21 -04:00
  • 6c95eed781 Merge pull request #1269 from aanand/labels Daniel Nephin 2015-04-30 20:49:11 -04:00
  • 4f366d8355 Make sure the build path we pass to docker-py is a binary string Aanand Prasad 2015-04-30 11:57:46 +01:00
  • 878d90febf Merge pull request #1374 from aanand/close-before-attaching Daniel Nephin 2015-04-29 18:56:03 -04:00
  • 1a77feea3f Close connection before attaching on 'up' and 'run' Aanand Prasad 2015-04-29 17:54:33 +01:00
  • 7e0ab0714f Merge pull request #1344 from dnephin/fix_pull_with_sha Aanand Prasad 2015-04-29 16:46:34 +01:00
  • 2e6bc078fb Implement 'labels' option Aanand Prasad 2015-03-19 16:10:27 -07:00
  • 3dd860f0ba Fix #923, support image with ids instead of names. Daniel Nephin 2015-04-24 11:11:01 -04:00
  • de800dea0f Merge pull request #1370 from aanand/update-docker-version Daniel Nephin 2015-04-29 10:03:13 -04:00
  • fed4377ef6 Merge pull request #1351 from mchasal/1301-alphabetize_usage Aanand Prasad 2015-04-29 14:21:46 +01:00
  • 021bf46557 Update Docker version to 1.6 stable Aanand Prasad 2015-04-27 15:18:00 +01:00
  • b7e5116267 Merge pull request #1352 from bfirsh/add-irccloud-invite-link Aanand Prasad 2015-04-29 13:25:25 +01:00
  • 9532e5a4f2 Merge pull request #1331 from xuxinkun/cpuset20150424 Daniel Nephin 2015-04-28 13:21:00 -04:00
  • e5a118e3ce Use cool new IRCCloud links for IRC channel Ben Firshman 2015-04-24 23:26:56 +01:00
  • 688f82c1cf Add cpuset config. xuxinkun 2015-04-23 09:33:46 +08:00
  • a631c1eddb Merge pull request #1357 from turtlemonvh/1350-extends_parent_build_directory_dne_error Daniel Nephin 2015-04-27 13:49:01 -04:00
  • 855855a0e6 Fix for #1350, nonexisting build path in parent section causes extending section to fail Timothy Van Heest 2015-04-27 08:17:53 -04:00
  • b808674132 Merge pull request #1360 from aanand/remove-wercker Daniel Nephin 2015-04-27 10:17:41 -04:00
  • 7e574fca71 Merge pull request #1358 from aanand/update-readme Ben Firshman 2015-04-27 15:14:06 +01:00
  • 7d617d60bc Remove wercker.yml Aanand Prasad 2015-04-27 15:10:01 +01:00
  • da71e01d30 Merge pull request #1359 from aanand/remove-dco-validation Aanand Prasad 2015-04-27 15:08:51 +01:00
  • a89bc304f6 Merge pull request #1075 from KyleJamesWalker/master Daniel Nephin 2015-04-27 10:06:43 -04:00
  • 240495f07f Remove DCO validation from CI script Aanand Prasad 2015-04-27 15:00:50 +01:00
  • 2e19887bf1 Update README.md with changes to docs/index.md Aanand Prasad 2015-04-27 14:58:20 +01:00
  • a982e516fc Merge pull request #1354 from xwisen/master Daniel Nephin 2015-04-27 09:56:46 -04:00
  • 3af56e1602 Merge pull request #1200 from chanezon/1148-pat-paul Ben Firshman 2015-04-27 14:54:14 +01:00
  • 16f8106149 Merge pull request #1158 from chernjie/addhosts Aanand Prasad 2015-04-27 12:26:29 +01:00
  • 86a08c00f2 See https://github.com/docker/compose/pull/1158#discussion_r29063218 CJ 2015-04-27 14:07:21 +08:00
  • 0ca9fa8b2b modified the release notes section the first[PR #972]to[PR #1088] xwisen 2015-04-26 12:49:27 +08:00
  • 9a44708081 Fix for #1301, Alphabetize Commands Michael Chase-Salerno 2015-04-24 20:45:18 +00:00
  • 89789c54ad Merge pull request #1232 from aleksandr-vin/add-parent-directories-search-for-default-compose-files Daniel Nephin 2015-04-24 13:12:24 -04:00
  • d17c4d27fa Support alternate Dockerfile name. Kyle Walker 2015-03-06 12:33:56 -08:00
  • 25ee3f0033 Remove extra s from --add-host linting... six.string_types list-of-strings in examples disallow extra_hosts support for list-of-dicts A more thorough sets of tests for extra_hosts Provide better examples As per @aanand's [comment](https://github.com/docker/compose/pull/1158/files#r28326312) CJ 2015-03-24 18:25:09 +08:00
  • 8098b65576 Fix when pyyaml has interpreted line as a dictionary Added unit tests in build_extra_hosts + fix Thomas Desvenain 2015-01-21 20:33:51 +01:00
  • fb81c37ca6 added the extra_hosts option to the yml configuration which exposes the --add-host flag from the docker client Sam Wing 2015-01-15 12:58:17 -08:00
  • e6ec76161d Merge pull request #1293 from mchasal/1224 Daniel Nephin 2015-04-21 15:19:11 -04:00
  • b317071cf3 Merge pull request #1205 from josephpage/run-rm-restart Aanand Prasad 2015-04-21 15:48:43 +01:00
  • bb922d63f5 Merge pull request #1318 from aanand/fix-restart-timeout Aanand Prasad 2015-04-21 15:07:07 +01:00
  • 2291fa2d45 Fix --timeout flag on restart, add tests for stop and restart Aanand Prasad 2015-04-21 11:58:44 +01:00
  • 3c6652c101 Merge pull request #1308 from aanand/update-docs-1.2.0 Ben Firshman 2015-04-17 10:35:06 -07:00
  • 43af1684c1 Update docs for 1.2.0 Aanand Prasad 2015-04-17 16:02:57 +01:00
  • 2cdde099fa Merge pull request #1297 from aanand/bump-1.3.0-dev Aanand Prasad 2015-04-16 18:02:59 +01:00
  • 310c7623f9 Bump 1.3.0dev Aanand Prasad 2015-04-16 17:54:18 +01:00
  • 6e64802545 Merge pull request #1296 from aanand/merge-release-1.2.0 Aanand Prasad 2015-04-16 17:52:47 +01:00
  • 8b5015c10f Bump 1.2.0 Aanand Prasad 2015-03-23 10:40:23 -07:00
  • ed549155b3 Merge pull request #1159 from aanand/bump-1.2.0 Aanand Prasad 2015-04-16 17:46:47 +01:00
  • 39ae91c81c Bump 1.2.0 1.2.0 Aanand Prasad 2015-03-23 10:40:23 -07:00
  • b6acb3cd8c Merge pull request #1278 from albers/completion-run-user Daniel Nephin 2015-04-14 11:04:03 -04:00
  • 24a6c240fc Testcase for #1224, check that image or build is specified Michael Chase-Salerno 2015-04-15 21:38:24 +00:00
  • 15b763acdb Fix for #1224, check that image or build is specified Michael Chase-Salerno 2015-04-15 02:03:02 +00:00