Commit graph

  • ca3aef0c84 Merge pull request #3436 from shin-/3374-exec-windows Joffrey F 2016-05-12 15:14:15 -07:00
  • e5645595e3 Fail gracefully when -d is not provided for exec command on Win32 Joffrey F 2016-05-09 16:29:27 -07:00
  • c9fe8920c9 Merge pull request #3457 from dnephin/fix_versions_script Joffrey F 2016-05-12 13:52:20 -07:00
  • 4bf5271ae2 Skip invalid git tags in versions.py Daniel Nephin 2016-05-12 14:41:40 -04:00
  • 72f6a5c8d3 Merge pull request #3433 from anton44eg/issue_3432 Aanand Prasad 2016-05-12 16:55:11 +01:00
  • dc88e54010 Merge pull request #3399 from yorkedork/fix/env-file-validation Joffrey F 2016-05-12 08:53:25 -07:00
  • 4b01f6dcd6 add msg attribute to ProjectError class Anton Simernia 2016-05-09 18:15:32 +07:00
  • f1603a3ee2 Merge pull request #3092 from wenchma/service_image Sven Dowideit 2016-05-09 10:16:37 +10:00
  • 5fa81c4044 Merge pull request #3417 from spectralsun/patch-1 Sven Dowideit 2016-05-09 10:15:56 +10:00
  • 6c29830127 Merge pull request #3418 from shin-/bump-1.7.1 1.7.1 Joffrey F 2016-05-04 13:03:11 -07:00
  • 0a9ab358bf Bump 1.7.1 Joffrey F 2016-05-04 11:50:15 -07:00
  • 3c424b709e Properly handle APIError failures in Project.up Joffrey F 2016-04-29 19:42:07 -07:00
  • 47a40d42c7 Require latest docker-py version Joffrey F 2016-04-29 16:37:26 -07:00
  • f316b448c2 Add missing log event filter when using docker-compose logs. Aaron Nall 2016-04-27 22:44:28 +00:00
  • 6bfdde6855 Clarify env-file doc that .env is read from cwd André R 2016-04-27 13:45:59 +02:00
  • 2a08d4731e Skip event objects that don't contain a status field Joffrey F 2016-04-26 15:52:25 -07:00
  • 11d8093fc8 Support combination of shorthand flag and equal sign for host option Joffrey F 2016-04-26 12:21:47 -07:00
  • d0b46ca9b2 Upgade pip to latest Daniel Nephin 2016-04-26 11:58:41 -04:00
  • b7f9fc4b28 Define WindowsError on non-win32 platforms Joffrey F 2016-04-25 17:58:20 -07:00
  • 70a605acac Explain the explanation about file versions Ben Firshman 2016-04-20 16:35:22 -07:00
  • 85b85bc675 Make validation error less robotic Ben Firshman 2016-04-20 16:22:24 -07:00
  • b334b6f059 Fix the tests from jenkins Patrice FERLET 2016-04-20 13:23:37 +02:00
  • 0c1c338a02 Force docker-py 1.8.0 or above Joffrey F 2016-04-19 17:39:29 -07:00
  • f655a8af95 Account for aliased links Fix failing tests Signed-off-by: John Harris <john@johnharris.io> johnharris85 2016-04-17 15:25:06 -04:00
  • f7cd94d4a9 Adding tests Signed-off-by: John Harris <john@johnharris.io> johnharris85 2016-04-17 14:01:06 -04:00
  • e4d2d7ed8a Config now catches undefined service links Fixes issue #2922 Signed-off-by: John Harris <john@johnharris.io> johnharris85 2016-04-17 14:00:07 -04:00
  • 2a8c2c8ad6 Unit test for skipping network disconnect. Daniel Nephin 2016-04-15 15:42:36 -04:00
  • 5852db4d72 Set networking_config when creating a container. Daniel Nephin 2016-04-11 13:22:37 -04:00
  • 250a7a530b Only disconnect if we don't already have the short id alias. Daniel Nephin 2016-04-08 15:45:03 -04:00
  • 4e8b017283 Fix CLI docstring to reflect Docopt behaviour. johnharris85 2016-04-15 13:30:13 +01:00
  • a86a195c50 Fix #3248: Accidental config_hash change Vladimir Lagunov 2016-04-15 15:11:50 +03:00
  • 3368887a29 Updated StringIO import to support io module Tony Witherspoon 2016-04-12 12:29:59 -04:00
  • e5f1429ce1 Updated cli_test.py to validate against the updated help command conditions Tony Witherspoon 2016-04-12 11:47:15 -04:00
  • 65b0e5973b updated cli_test.py to no longer expect raised SystemExit exceptions Tony Witherspoon 2016-04-07 12:42:14 -04:00
  • 9cf483e224 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
  • 1e164ca802 Fix format of 'restart' option in 'config' output Aanand Prasad 2016-04-26 17:30:04 +01:00
  • a2ded237e4 Fix output of 'config' for v1 files Aanand Prasad 2016-03-18 13:14:33 +00:00
  • 8a9ab69a1c Check full error message in test_up_with_net_is_invalid Aanand Prasad 2016-03-18 13:01:35 +00:00
  • 9cfbfd55c4 Remove v2_only decorators on config tests Aanand Prasad 2016-03-18 13:00:55 +00:00
  • d41e6e00fa Merge remote-tracking branch 'source/release' into bump-1.7.1 Joffrey F 2016-05-04 11:49:05 -07:00
  • 3b7191f246 Small typo Garrett Seward 2016-05-04 10:45:04 -07:00
  • 3bf75b7330 Merge pull request #3398 from shin-/docker-py-1.8.1 Daniel Nephin 2016-05-03 15:47:47 -04:00
  • c1c8c70800 Merge pull request #3392 from SvenDowideit/use-docs-base-oss Sven Dowideit 2016-05-03 10:47:00 +10:00
  • 94bcbd1fb6 Merge pull request #3388 from andrerom/patch-1 Joffrey F 2016-05-02 16:04:03 -07:00
  • 3e11a95056 Merge pull request #3400 from shin-/3333-raise-up-errors Joffrey F 2016-05-02 14:34:12 -07:00
  • 310b3d9441 Properly handle APIError failures in Project.up Joffrey F 2016-04-29 19:42:07 -07:00
  • 28fb91b344 Adds additional validation to 'env_vars_from_file'. Thom Linton 2016-04-29 16:31:19 -07:00
  • c41f30c3ff Merge pull request #3385 from shin-/3316-skip-statusless-events Joffrey F 2016-04-29 17:50:32 -07:00
  • fe17e0f948 Skip event objects that don't contain a status field Joffrey F 2016-04-26 15:52:25 -07:00
  • bd7ec24e25 Merge pull request #3384 from shin-/3264-shorthand-host-support Joffrey F 2016-04-29 16:39:16 -07:00
  • e4bb678875 Require latest docker-py version Joffrey F 2016-04-29 16:37:26 -07:00
  • 84aa39e978 Clarify env-file doc that .env is read from cwd André R 2016-04-27 13:45:59 +02:00
  • 8cc7d68a00 Merge pull request #3390 from aronahl/master Joffrey F 2016-04-28 12:53:04 -07:00
  • 0b24883cef Support combination of shorthand flag and equal sign for host option Joffrey F 2016-04-26 12:21:47 -07:00
  • 2efcec776c Add missing log event filter when using docker-compose logs. Aaron Nall 2016-04-27 22:44:28 +00:00
  • 61794ba97c Merge pull request #3377 from shin-/3372-windowserror Daniel Nephin 2016-04-28 10:33:18 -04:00
  • 87ee38ed2c convert docs Dockerfiles to use docs/base:oss Sven Dowideit 2016-04-28 12:57:02 +00:00
  • 7ad7eb71ca Merge pull request #3164 from aanand/fix-config-v1 Aanand Prasad 2016-04-26 20:34:18 +01:00
  • d3e645488a Define WindowsError on non-win32 platforms Joffrey F 2016-04-25 17:58:20 -07:00
  • 756ef14edc Fix format of 'restart' option in 'config' output Aanand Prasad 2016-04-26 17:30:04 +01:00
  • 6064d200f9 Fix output of 'config' for v1 files Aanand Prasad 2016-03-18 13:14:33 +00:00
  • 84a3e2fe79 Check full error message in test_up_with_net_is_invalid Aanand Prasad 2016-03-18 13:01:35 +00:00
  • a4d3dd6197 Remove v2_only decorators on config tests Aanand Prasad 2016-03-18 13:00:55 +00:00
  • 0cd35913c3 Merge pull request #3382 from dnephin/upgrade_pip Joffrey F 2016-04-26 09:38:12 -07:00
  • 26fe8213aa Upgade pip to latest Daniel Nephin 2016-04-26 11:58:41 -04:00
  • ac82597ac1 Merge pull request #3360 from bfirsh/better-validation-error-messages Daniel Nephin 2016-04-21 11:32:23 -04:00
  • 1988dfeaf0 Merge pull request #3359 from bfirsh/clarify-compose-file-networks-documentation Daniel Nephin 2016-04-21 11:19:32 -04:00
  • da1d603463 Merge pull request #3351 from shin-/3342-setup-requirements Joffrey F 2016-04-20 17:40:51 -07:00
  • 75bcc382d9 Force docker-py 1.8.0 or above Joffrey F 2016-04-19 17:39:29 -07:00
  • b67f110620 Explain the explanation about file versions Ben Firshman 2016-04-20 16:35:22 -07:00
  • 27628f8655 Make validation error less robotic Ben Firshman 2016-04-20 16:22:24 -07:00
  • 55fcd1c3e3 Clarify service networks documentation Ben Firshman 2016-04-20 15:58:12 -07:00
  • a0aea42f75 Merge pull request #3326 from CRogers/patch-1 Ben Firshman 2016-04-20 23:06:35 +01:00
  • 6ff3c47630 Merge pull request #3222 from jonlemmon/patch-1 Ben Firshman 2016-04-20 22:57:50 +01:00
  • 8a34ee0eaa Merge pull request #3356 from metal3d/fix-help-acceptance-test Daniel Nephin 2016-04-20 12:18:20 -04:00
  • ba10f1cd55 Fix the tests from jenkins Patrice FERLET 2016-04-20 13:23:37 +02:00
  • cafe1315b2 Merge pull request #3334 from werehuman/fix-config-hash-change Aanand Prasad 2016-04-19 12:42:19 +01:00
  • 984f839d33 Merge pull request #3263 from twitherspoon/3191_2_help_cli_feature Aanand Prasad 2016-04-19 12:14:24 +01:00
  • d21e1c5a30 Merge pull request #3335 from johnharris85/master Aanand Prasad 2016-04-19 12:13:20 +01:00
  • 52fa010ac7 Merge pull request #3337 from dnephin/check_for_short_id_alias Aanand Prasad 2016-04-19 12:12:43 +01:00
  • d4bebbb1ba Merge pull request #3340 from johnharris85/2922-config-does-not-catch-missing-links Daniel Nephin 2016-04-18 10:13:47 -04:00
  • 6d2805917c Account for aliased links Fix failing tests Signed-off-by: John Harris <john@johnharris.io> johnharris85 2016-04-17 15:25:06 -04:00
  • 377be5aa1f Adding tests Signed-off-by: John Harris <john@johnharris.io> johnharris85 2016-04-17 14:01:06 -04:00
  • 68272b0216 Config now catches undefined service links Fixes issue #2922 Signed-off-by: John Harris <john@johnharris.io> johnharris85 2016-04-17 14:00:07 -04:00
  • 56c6e29819 Unit test for skipping network disconnect. Daniel Nephin 2016-04-15 15:42:36 -04:00
  • 4702703615 Fix #3248: Accidental config_hash change Vladimir Lagunov 2016-04-15 15:11:50 +03:00
  • ad306f0479 Fix CLI docstring to reflect Docopt behaviour. johnharris85 2016-04-15 13:30:13 +01:00
  • e1356e1f6f Set networking_config when creating a container. Daniel Nephin 2016-04-11 13:22:37 -04:00
  • abb5ae7fe4 Only disconnect if we don't already have the short id alias. Daniel Nephin 2016-04-08 15:45:03 -04:00
  • e71c62b8d1 Readme should use new docker compose format instead of the old one Callum Rogers 2016-04-14 10:49:10 +01:00
  • e2cb7b0237 Merge pull request #3299 from dannyprout/2096-only-show-port-clash-warning-when-starting-multiple-containers Aanand Prasad 2016-04-14 10:40:02 +01:00
  • aebb3d5d0a Merge pull request #3320 from dnephin/make_it_dev_again Aanand Prasad 2016-04-14 10:22:01 +01:00
  • 50287722f2 Update release notes and set version to 1.8.0dev Daniel Nephin 2016-04-13 12:57:22 -04:00
  • 1126e2a57a Merge branch 'release' of github.com:docker/compose into docs Daniel Nephin 2016-04-13 13:22:42 -04:00
  • e8da6cb631 Merge pull request #3319 from docker/bump-1.7.0 Daniel Nephin 2016-04-13 13:20:02 -04:00
  • 0d7bf73446 Bump 1.7.0 1.7.0 Daniel Nephin 2016-04-13 11:37:49 -04:00
  • 339ebc0483 Fixes #2096: Only show multiple port clash warning if multiple containers are about to be started. Danyal Prout 2016-04-10 15:53:42 +01:00
  • ae46bf8907 Updated StringIO import to support io module Tony Witherspoon 2016-04-12 12:29:59 -04:00
  • 276738f733 Updated cli_test.py to validate against the updated help command conditions Tony Witherspoon 2016-04-12 11:47:15 -04:00
  • f10bc8072e Merge pull request #3310 from aanand/fix-logs-test Daniel Nephin 2016-04-12 10:44:04 -04:00