Commit graph

  • 7781f62ddf Attempt to fix flaky logs test Aanand Prasad 2016-04-12 12:03:16 +01:00
  • 3d3f331404 Merge pull request #3303 from aanand/clarify-rm-and-down Aanand Prasad 2016-04-12 11:31:22 +01:00
  • ea2d526246 Bump 1.7.0-rc2 1.7.0-rc2 Daniel Nephin 2016-04-08 15:48:36 -04:00
  • 2160c787e3 Fix race condition Aanand Prasad 2016-04-11 17:05:52 +01:00
  • ebae76bee8 Rename a couple of functions in parallel.py Aanand Prasad 2016-04-11 13:03:35 +01:00
  • 720dc893e2 Document parallel helper functions Aanand Prasad 2016-04-11 12:49:04 +01:00
  • d03f4e4b32 Small refactor to feed_queue() Aanand Prasad 2016-04-11 12:37:00 +01:00
  • d05feb1a4d Merge pull request #3302 from aanand/feed-queue-refactor Daniel Nephin 2016-04-11 12:58:11 -04:00
  • 7cfb5e7bc9 Fix race condition Aanand Prasad 2016-04-11 17:05:52 +01:00
  • 3722bb38c6 Clarify behaviour of rm and down Aanand Prasad 2016-04-11 14:26:45 +01:00
  • 15c5bc2e6c Rename a couple of functions in parallel.py Aanand Prasad 2016-04-11 13:03:35 +01:00
  • 0671b8b8c3 Document parallel helper functions Aanand Prasad 2016-04-11 12:49:04 +01:00
  • 0e3db185cf Small refactor to feed_queue() Aanand Prasad 2016-04-11 12:37:00 +01:00
  • 97467c7dec Merge pull request #3295 from londoncalling/docs-format-followup-PR3275 Victoria 2016-04-08 16:56:57 -07:00
  • 4192a009da added some formatting on the Wordress steps, and made heading levels in these sample app topics consistent Victoria Bialas 2016-04-08 16:40:07 -07:00
  • 80614cff9b Merge pull request #3275 from activatedgeek/patch-1 Victoria 2016-04-08 16:12:44 -07:00
  • d4e9a3b6b1 Updated Wordpress tutorial Sanyam Kapoor 2016-04-06 23:05:40 +05:30
  • 275b54641a Remove extra ensure_image_exists() which causes duplicate builds. Daniel Nephin 2016-04-08 11:59:06 -04:00
  • 68b4ef6cf2 Reduce queue timeout Aanand Prasad 2016-04-08 19:07:40 +01:00
  • de6496c6c9 Hold state in an object Aanand Prasad 2016-04-08 19:06:07 +01:00
  • 79edda6804 Refactor so there's only one queue Aanand Prasad 2016-04-08 18:54:02 +01:00
  • a81b9dc6a0 Test events coming out of parallel_execute_stream in error case Aanand Prasad 2016-04-08 18:53:16 +01:00
  • 868133e881 Extract get_deps test helper Aanand Prasad 2016-04-08 18:48:07 +01:00
  • d3899418b7 Move queue logic out of parallel_execute() Aanand Prasad 2016-04-08 18:30:28 +01:00
  • 09e359fc8d Abort operations if their dependencies fail Aanand Prasad 2016-04-08 17:46:13 +01:00
  • cdef2b5e3b Refactor setup_queue() Aanand Prasad 2016-04-08 12:58:19 +01:00
  • b865f35f17 Use docker-py 1.8.0 Joffrey F 2016-04-06 13:28:45 -07:00
  • 73d57a1acb Prevent unnecessary inspection of containers when created from an inspect. Daniel Nephin 2016-04-05 11:26:23 -04:00
  • 1dea8abe69 Include docker-py requirements fix Joffrey F 2016-03-30 11:58:28 -07:00
  • 7dd29e8239 Re-enabling assert_hostname when instantiating docker_client from the environment. Joffrey F 2016-03-30 11:11:19 -07:00
  • 98d7a1e9dd Remove obsolete assert_hostname tests Joffrey F 2016-03-29 18:05:37 -07:00
  • a2adf31caa Update docker-py version to include match_hostname fix Removed unnecessary assert_hostname computation in tls_config_from_options Joffrey F 2016-03-29 18:01:27 -07:00
  • 44715f18bd Fix assert_hostname logic in tls_config_from_options Joffrey F 2016-03-28 17:39:20 -07:00
  • bd0f6d8d7b Add zsh completion for 'docker-compose run -w --workdir' Steve Durrheimer 2016-03-25 19:25:33 +01:00
  • d434098b94 Add zsh completion for 'docker-compose up --build' Steve Durrheimer 2016-03-25 19:15:34 +01:00
  • e863894e2d Add zsh completion for 'docker-compose logs -f --follow --tail -t --timestamps' Steve Durrheimer 2016-03-25 19:09:53 +01:00
  • 94afcfaf9d Add zsh completion for 'docker-compose exec' command Steve Durrheimer 2016-03-25 19:03:36 +01:00
  • c6c1afd568 Add zsh completion for 'docker-compose rm -a --all' Steve Durrheimer 2016-03-25 18:52:28 +01:00
  • 3ca8858897 Merge pull request #3292 from dnephin/fix_up_build Daniel Nephin 2016-04-08 15:45:37 -04:00
  • 83df95d511 Remove extra ensure_image_exists() which causes duplicate builds. Daniel Nephin 2016-04-08 11:59:06 -04:00
  • e5443717fb Merge pull request #3291 from aanand/parallel-execute-refactor Daniel Nephin 2016-04-08 15:15:41 -04:00
  • 91a545813a Merge pull request #3276 from shin-/bump_docker_py Daniel Nephin 2016-04-08 15:15:01 -04:00
  • be27e266da Reduce queue timeout Aanand Prasad 2016-04-08 19:07:40 +01:00
  • 5450a67c2d Hold state in an object Aanand Prasad 2016-04-08 19:06:07 +01:00
  • 54b6fc4219 Refactor so there's only one queue Aanand Prasad 2016-04-08 18:54:02 +01:00
  • ffab27c049 Test events coming out of parallel_execute_stream in error case Aanand Prasad 2016-04-08 18:53:16 +01:00
  • 3720b50c3b Extract get_deps test helper Aanand Prasad 2016-04-08 18:48:07 +01:00
  • af9526fb82 Move queue logic out of parallel_execute() Aanand Prasad 2016-04-08 18:30:28 +01:00
  • 141b96bb31 Abort operations if their dependencies fail Aanand Prasad 2016-04-08 17:46:13 +01:00
  • bcdf541c8c Refactor setup_queue() Aanand Prasad 2016-04-08 12:58:19 +01:00
  • f5b80640fe Merge branch '3191_2_help_cli_feature' of https://github.com/twitherspoon/compose into 3191_2_help_cli_feature Tony Witherspoon 2016-04-07 12:46:27 -04:00
  • 9f47e43b5c Merge branch 'master' into 3191_2_help_cli_feature twitherspoon 2016-04-07 12:43:34 -04:00
  • 5d0aab4a8e updated cli_test.py to no longer expect raised SystemExit exceptions Tony Witherspoon 2016-04-07 12:42:14 -04:00
  • 3ef6b17bfc Use docker-py 1.8.0 Joffrey F 2016-04-06 13:28:45 -07:00
  • 958f96c78a Merge pull request #3269 from dnephin/fix_logs_and_scale_down Daniel Nephin 2016-04-06 12:45:46 -04:00
  • b33d7b3dd8 Prevent unnecessary inspection of containers when created from an inspect. Daniel Nephin 2016-04-05 11:26:23 -04:00
  • 129fb5b356 Added code to output the top level command options if docker-compose help with no command options provided Tony Witherspoon 2016-04-04 13:15:28 -04:00
  • 86530287d6 Merge pull request #2627 from bfirsh/update-roadmap Aanand Prasad 2016-04-04 12:52:54 +01:00
  • c1026e815a Update roadmap Ben Firshman 2016-01-10 12:50:38 +00:00
  • c72d62f96d Merge pull request #3187 from bfirsh/update-wordpress-example-to-use-official-images Ben Firshman 2016-04-01 20:53:37 +01:00
  • a63a05964b Merge pull request #3249 from aanand/better-env-substitution-example Daniel Nephin 2016-04-01 15:12:18 -04:00
  • 9509508f3e Merge pull request #3226 from shin-/3210-assert-hostname Joffrey F 2016-04-01 10:32:13 -07:00
  • 1a7a65f84d Include docker-py requirements fix Joffrey F 2016-03-30 11:58:28 -07:00
  • 3034803258 Better variable substitution example Aanand Prasad 2016-03-31 15:45:14 +01:00
  • 78a8be07ad Re-enabling assert_hostname when instantiating docker_client from the environment. Joffrey F 2016-03-30 11:11:19 -07:00
  • d27b82207c Remove obsolete assert_hostname tests Joffrey F 2016-03-29 18:05:37 -07:00
  • 71c86acaa4 Update docker-py version to include match_hostname fix Removed unnecessary assert_hostname computation in tls_config_from_options Joffrey F 2016-03-29 18:01:27 -07:00
  • 85e2fb63b3 Merge pull request #3218 from sdurrheimer/zsh-completion-run-workdir Aanand Prasad 2016-03-29 16:50:12 +01:00
  • 024a810617 Merge pull request #3217 from sdurrheimer/zsh-completion-up-build Aanand Prasad 2016-03-29 16:49:49 +01:00
  • 668d45c7cc Merge pull request #3216 from sdurrheimer/zsh-completion-logs Aanand Prasad 2016-03-29 16:49:36 +01:00
  • 09ea74245d Merge pull request #3215 from sdurrheimer/zsh-completion-exec-command Aanand Prasad 2016-03-29 16:49:15 +01:00
  • 386edd892c Merge pull request #3214 from sdurrheimer/zsh-completion-rm-all Aanand Prasad 2016-03-29 16:48:53 +01:00
  • 7116aefe43 Fix assert_hostname logic in tls_config_from_options Joffrey F 2016-03-28 17:39:20 -07:00
  • 93901ec480 Rails Docs: Add nodejs to apt-get install command Jon Lemmon 2016-03-28 13:29:01 +13:00
  • 8ae8f7ed4b Add zsh completion for 'docker-compose run -w --workdir' Steve Durrheimer 2016-03-25 19:25:33 +01:00
  • 9729c0d3c7 Add zsh completion for 'docker-compose up --build' Steve Durrheimer 2016-03-25 19:15:34 +01:00
  • 9d58b19ecc Add zsh completion for 'docker-compose logs -f --follow --tail -t --timestamps' Steve Durrheimer 2016-03-25 19:09:53 +01:00
  • 63b448120a Add zsh completion for 'docker-compose exec' command Steve Durrheimer 2016-03-25 19:03:36 +01:00
  • 0f1fb42326 Add zsh completion for 'docker-compose rm -a --all' Steve Durrheimer 2016-03-25 18:52:28 +01:00
  • 1ad88662c0 Bump 1.7.0 1.7.0-rc1 Daniel Nephin 2016-03-23 22:05:23 -04:00
  • 827573a594 Merge remote-tracking branch 'docker/release' into bump-1.7.0 Daniel Nephin 2016-03-24 14:31:17 -04:00
  • aa50023507 Merge pull request #3057 from shin-/2636-env-file Daniel Nephin 2016-03-24 14:26:03 -04:00
  • 12ad3ff301 Injecting os.environ in Environment instance happens outside of init method Joffrey F 2016-03-22 15:42:30 -07:00
  • 1506f997de Better windows support for Environment class Joffrey F 2016-03-22 11:43:03 -07:00
  • b99037b4a6 Add support for DOCKER_* variables in .env file Joffrey F 2016-03-21 18:32:13 -07:00
  • c7afe16419 Account for case-insensitive env on windows platform Joffrey F 2016-03-21 16:33:58 -07:00
  • 36f1b4589c Limit occurrences of creating an environment object. .env file is always read from the project_dir Joffrey F 2016-03-21 16:08:07 -07:00
  • 0ff53d9668 Less verbose environment invocation Joffrey F 2016-03-14 13:02:55 -07:00
  • dcdcf4869b Mention environment file in envvars.md Joffrey F 2016-03-10 17:29:01 -08:00
  • 21aa7a0448 Documentation for .env file Joffrey F 2016-03-08 17:48:23 -08:00
  • f48da96e8b Test get_project_name from env file Joffrey F 2016-03-08 17:18:04 -08:00
  • d55fc85fea Added default env file test. Joffrey F 2016-03-08 16:55:05 -08:00
  • 1801f83bb8 Environment class cleanup Joffrey F 2016-03-08 16:54:14 -08:00
  • fd020ed2cf Tests use updated get_config_paths_from_options signature Joffrey F 2016-03-07 17:46:55 -08:00
  • 5831b869e8 Update tests for new environment handling Joffrey F 2016-03-07 17:18:19 -08:00
  • b9ca5188a2 Remove Environment singleton, instead carry instance during config processing Joffrey F 2016-03-07 17:16:25 -08:00
  • bf8e501b5e Fix pre-commit config Joffrey F 2016-03-07 14:42:17 -08:00
  • c69d8a3bd2 Implement environment singleton to be accessed throughout the code Joffrey F 2016-03-01 15:49:42 -08:00
  • d1d8df7f72 Merge pull request #3192 from shin-/use-dockerpy-1.8 Daniel Nephin 2016-03-24 13:55:59 -04:00
  • d78b013bb0 Merge pull request #3204 from albers/completion-rm--all Joffrey F 2016-03-24 10:44:36 -07:00