Commit graph

  • ac14642d94 Typo fixed Manuel Kaufmann 2016-02-10 18:58:01 -05:00
  • ab40d389d0 Fix sorting of DOCKER_START_KEYS. Spencer Rinehart 2016-02-05 11:46:15 -06:00
  • 5e6dc3521c Add support for shm_size. Fixes #2823. Spencer Rinehart 2016-02-05 10:47:14 -06:00
  • 37564a73c3 Merge build.args when merging services. Daniel Nephin 2016-02-10 13:54:40 -05:00
  • 7b5bad6050 Merge pull request #2851 from cr7pt0gr4ph7/2839-fix-networks-merging Aanand Prasad 2016-02-10 17:51:01 +00:00
  • c43b25b0cf Merge pull request #2827 from loic/patch-1 Aanand Prasad 2016-02-10 15:58:54 +00:00
  • ab9d82b400 Merge pull request #2842 from michael-k/links Aanand Prasad 2016-02-10 15:58:39 +00:00
  • 88b11afde2 Merge pull request #2858 from dnephin/fix_upgrading_url_in_changelog Aanand Prasad 2016-02-10 15:58:02 +00:00
  • 28689a57a7 Merge pull request #2871 from yograterol/patch-1 Aanand Prasad 2016-02-10 15:57:45 +00:00
  • ab6e07da7d Fix version in install guide Aanand Prasad 2016-02-10 15:56:50 +00:00
  • 59a2920758 Typo into the doc with networks in yaml Yohan Graterol 2016-02-09 18:40:44 -05:00
  • 6f06b3bd30 Merge pull request #2853 from dnephin/fix_short_id_alias Daniel Nephin 2016-02-09 14:56:24 -05:00
  • 481caa8e48 Used absolute links in readme Michael Käufl 2016-02-06 22:10:22 +01:00
  • 63870fbccd Fix upgrading url. Daniel Nephin 2016-02-08 18:15:21 -05:00
  • 582de19a5a Simplify unit tests in config/config_test.py by using class variables instead of methods for parametrizing tests. cr7pt0gr4ph7 2016-02-08 21:57:15 +01:00
  • 859cc2348c Merge pull request #2744 from aanand/pytest-ini Daniel Nephin 2016-02-08 14:19:40 -05:00
  • fdf4a2e89e Merge pull request #2734 from jrabbit/empty-env-var-2359 Joffrey F 2016-02-08 11:17:54 -08:00
  • 421981e7d2 Use 12 characters for the short id to match docker and fix backwards compatibility. Daniel Nephin 2016-02-08 12:18:48 -05:00
  • 5bd88f634f Handle the 'network_mode' key when merging multiple compose files. Lukas Waslowski 2016-02-08 15:33:26 +01:00
  • 5a3a10d43b Correctly merge the 'services/<service>/networks' key in the case of multiple compose files. Lukas Waslowski 2016-02-08 15:17:21 +01:00
  • e929086c49 Separate MergePortsTest from MergeListsTest and add MergeNetworksTest. Lukas Waslowski 2016-02-08 14:29:03 +01:00
  • 677c50650c Change special case from '_', None to () jrabbit 2016-02-06 02:54:06 -05:00
  • 8acb5e17e8 Add pytest section to tox.ini Aanand Prasad 2016-01-25 14:32:43 +00:00
  • b635647105 Fixed typo in compose-file.md Loïc Bistuer 2016-02-05 09:42:59 +07:00
  • 57fc85b457 Wrap long lines and restrict lines to 105 characters. Daniel Nephin 2015-11-10 15:26:04 -05:00
  • 28e652daec Merge pull request #2826 from aanand/bump-1.7.0dev Daniel Nephin 2016-02-04 18:56:27 -05:00
  • 869e815213 Bump 1.7.0dev Aanand Prasad 2016-02-04 23:46:41 +00:00
  • 9503aa2b5f Merge pull request #2821 from aanand/bump-1.6.0 Aanand Prasad 2016-02-04 20:20:58 +00:00
  • d99cad60e7 Bump 1.6.0 1.6.0 Aanand Prasad 2016-01-27 13:30:41 +00:00
  • 8199c4a6e1 Improve names in Compose file 2 example Ben Firshman 2016-02-03 17:42:57 -08:00
  • 422ff623b4 Merge pull request #2819 from bfirsh/improve-names-in-compose-file-2-example Aanand Prasad 2016-02-04 19:42:22 +00:00
  • 19ae76a442 Update docker-py and dockerpty Aanand Prasad 2016-02-04 16:01:11 +00:00
  • c2db1a24bf Merge pull request #2822 from aanand/update-docker-py-and-dockerpty Aanand Prasad 2016-02-04 19:40:41 +00:00
  • be236d8801 Update docker-py and dockerpty Aanand Prasad 2016-02-04 16:01:11 +00:00
  • a55210413c Update docs for version being a string. Daniel Nephin 2016-02-04 12:17:20 -05:00
  • 93426cec4c Merge pull request #2824 from dnephin/docs_version_is_a_string Aanand Prasad 2016-02-04 17:20:32 +00:00
  • a7c2987991 Update docs for version being a string. Daniel Nephin 2016-02-04 12:17:20 -05:00
  • 6caa188730 Fix example formatting for depends_on. Spencer Rinehart 2016-02-03 14:34:36 -06:00
  • 386974f831 Merge pull request #2814 from nubs/patch-1 Aanand Prasad 2016-02-04 15:56:27 +00:00
  • 413a55aa71 Connect container to networks before starting it Aanand Prasad 2016-02-02 19:31:49 +00:00
  • 80d02e84e2 Merge pull request #2808 from aanand/connect-before-start Daniel Nephin 2016-02-03 23:49:56 -05:00
  • bdddbe3a73 Improve names in Compose file 2 example Ben Firshman 2016-02-03 17:42:57 -08:00
  • f612bc98d9 Fix example formatting for depends_on. Spencer Rinehart 2016-02-03 14:34:36 -06:00
  • 64336615cf Falling back to default project name when COMPOSE_PROJECT_NAME is set to empty Dimitar Bonev 2016-01-29 14:15:38 +02:00
  • a59982eb11 Fixing duplicate identifiers Mary Anthony 2016-02-02 12:04:13 -08:00
  • 46f33f12b0 Update merge docs with depends_on, and correction about how links and volumes_from are merged. Daniel Nephin 2016-02-01 14:04:53 -05:00
  • dc718eae65 Make links unique-by-alias when merging Daniel Nephin 2016-02-01 13:47:13 -05:00
  • aa5ff05463 Fix merging of lists with multiple files. Daniel Nephin 2016-01-29 13:36:51 -05:00
  • 3b7471ae84 Add depends_on to ALLOWED_KEYS Ryan Taylor Long 2016-01-28 06:19:03 +00:00
  • 7f009aeeb9 Move command reference to overview. Daniel Nephin 2016-02-01 12:10:21 -05:00
  • 44c7d080bd Rename the old environment variable page to link environment variables. Daniel Nephin 2016-01-29 13:00:43 -05:00
  • 32bd760526 Cleanup command-line reference docs by renaming overview to envvars. Daniel Nephin 2016-01-28 19:17:18 -05:00
  • 009dbbe971 Use the same capitalization for all menu items in the docs. Daniel Nephin 2016-01-28 18:53:40 -05:00
  • 6b59ba0c31 Re-order compose docs so that quickstart guides come before other documentation. Daniel Nephin 2016-01-28 18:50:05 -05:00
  • 61d00ebee4 Extract volume init and removal from project. Daniel Nephin 2016-01-29 17:31:27 -05:00
  • 3b1276bd44 Include networks in the config_hash. Daniel Nephin 2016-01-29 16:30:24 -05:00
  • 3e8a4a5dc3 Don't initialize networks that aren't used by any services. Daniel Nephin 2016-01-29 16:00:50 -05:00
  • 0c87e0b18f Refactor project network initlization. Daniel Nephin 2016-01-29 14:41:18 -05:00
  • 8024f2f09e Tweak and test warning shown when version is a dict Aanand Prasad 2016-01-29 16:38:23 +00:00
  • f081376067 Improve error messages for invalid versions Aanand Prasad 2016-01-29 16:15:16 +00:00
  • ce0d469c18 Make 'version' a string Aanand Prasad 2016-01-29 15:58:38 +00:00
  • b2ee08f439 Remove redundant check - self.config should never be None Aanand Prasad 2016-01-28 16:26:25 +00:00
  • e9ba06ed4b Normalise/fix config field designators in validation messages Aanand Prasad 2016-01-28 15:20:46 +00:00
  • 9e9b36460c Convert validation error tests to pytest style Aanand Prasad 2016-01-28 14:44:51 +00:00
  • 89c5b800e6 Merge pull request #2782 from dbonev/2772-compose-project-name-empty Daniel Nephin 2016-02-02 20:37:38 -05:00
  • bd1c8973ab Merge pull request #2809 from moxiegirl/fixing-dup-identifier Sven Dowideit 2016-02-02 15:43:09 -08:00
  • a713447e0b Fixing duplicate identifiers Mary Anthony 2016-02-02 12:04:13 -08:00
  • 2651c00f0c Connect container to networks before starting it Aanand Prasad 2016-02-02 19:31:49 +00:00
  • 4c4e94bc19 Merge pull request #2785 from dnephin/depends_on_with_extends Daniel Nephin 2016-02-02 13:36:46 -05:00
  • 1cb67b781c Merge pull request #2777 from dnephin/reorder_docs Daniel Nephin 2016-02-02 11:26:26 -05:00
  • c290e560cb Merge pull request #2786 from dnephin/refactor_project Daniel Nephin 2016-02-02 11:19:34 -05:00
  • 7a197e5a69 Merge pull request #2802 from dnephin/appveyor_to_bintray_deploy Aanand Prasad 2016-02-02 16:13:07 +00:00
  • c81cc24e72 Merge pull request #2806 from aanand/run-tests-with-tty Daniel Nephin 2016-02-02 10:56:21 -05:00
  • 3d3388d59b Extract volume init and removal from project. Daniel Nephin 2016-01-29 17:31:27 -05:00
  • e551988616 Include networks in the config_hash. Daniel Nephin 2016-01-29 16:30:24 -05:00
  • 0810eeba10 Don't initialize networks that aren't used by any services. Daniel Nephin 2016-01-29 16:00:50 -05:00
  • 8e838968fe Refactor project network initlization. Daniel Nephin 2016-01-29 14:41:18 -05:00
  • 3ec87adccc Update merge docs with depends_on, and correction about how links and volumes_from are merged. Daniel Nephin 2016-02-01 14:04:53 -05:00
  • e32863f89e Make links unique-by-alias when merging Daniel Nephin 2016-02-01 13:47:13 -05:00
  • bf6a5d3e49 Fix merging of lists with multiple files. Daniel Nephin 2016-01-29 13:36:51 -05:00
  • c70c72f49a Add depends_on to ALLOWED_KEYS Ryan Taylor Long 2016-01-28 06:19:03 +00:00
  • 7b03de7d01 Move command reference to overview. Daniel Nephin 2016-02-01 12:10:21 -05:00
  • cf24c36c55 Rename the old environment variable page to link environment variables. Daniel Nephin 2016-01-29 13:00:43 -05:00
  • 2df5593e8f Cleanup command-line reference docs by renaming overview to envvars. Daniel Nephin 2016-01-28 19:17:18 -05:00
  • 5e30f089e3 Use the same capitalization for all menu items in the docs. Daniel Nephin 2016-01-28 18:53:40 -05:00
  • 4f92004d9a Re-order compose docs so that quickstart guides come before other documentation. Daniel Nephin 2016-01-28 18:50:05 -05:00
  • 60a5b39f6f Merge pull request #2783 from aanand/fix-validation-v2 Aanand Prasad 2016-02-02 15:19:50 +00:00
  • 1152c5b25b Tweak and test warning shown when version is a dict Aanand Prasad 2016-01-29 16:38:23 +00:00
  • ef8db3650a Improve error messages for invalid versions Aanand Prasad 2016-01-29 16:15:16 +00:00
  • aeef61fcd8 Make 'version' a string Aanand Prasad 2016-01-29 15:58:38 +00:00
  • a8de582425 Remove redundant check - self.config should never be None Aanand Prasad 2016-01-28 16:26:25 +00:00
  • 4ac004059a Normalise/fix config field designators in validation messages Aanand Prasad 2016-01-28 15:20:46 +00:00
  • d40bc6e4a0 Convert validation error tests to pytest style Aanand Prasad 2016-01-28 14:44:51 +00:00
  • e8756905ba Run test containers in TTY mode Aanand Prasad 2016-02-02 13:31:28 +00:00
  • 6928c24323 Deploying to bintray from appveyor using the new bintray support. Daniel Nephin 2016-02-01 16:30:39 -05:00
  • 9c6c50c607 Merge pull request #2796 from mustafau/patch-1 Daniel Nephin 2016-02-01 11:24:18 -05:00
  • 25df0d8147 bash completion for docker-compose create Harald Albers 2016-01-25 10:15:14 +01:00
  • c98c617c30 Add zsh completion for 'docker-compose create' Steve Durrheimer 2016-01-25 10:27:21 +01:00
  • d3cd9213c1 Fix rebase-bump-commit script Aanand Prasad 2016-01-26 17:41:26 +00:00
  • bbaae11a0f Fix race condition with up and setting signal handlers. Daniel Nephin 2016-01-29 12:50:52 -05:00