tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,333 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

3333 Commits

Author SHA1 Message Date
Aanand Prasad 9cfbfd55c4 Remove v2_only decorators on config tests 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Joffrey F d41e6e00fa Merge remote-tracking branch 'source/release' into bump-1.7.1 2016-05-04 11:49:05 -07:00
Garrett Seward 3b7191f246 Small typo 
Signed-off-by: spectralsun <garrett@spectralsun.com>
 2016-05-04 10:47:01 -07:00
Daniel Nephin 3bf75b7330 Merge pull request #3398 from shin-/docker-py-1.8.1 
Require latest docker-py version
 2016-05-03 15:47:47 -04:00
Sven Dowideit c1c8c70800 Merge pull request #3392 from SvenDowideit/use-docs-base-oss 
convert docs Dockerfiles to use docs/base:oss
 2016-05-03 10:47:00 +10:00
Joffrey F 94bcbd1fb6 Merge pull request #3388 from andrerom/patch-1 
Clarify env-file doc that .env is read from cwd
 2016-05-02 16:04:03 -07:00
Joffrey F 3e11a95056 Merge pull request #3400 from shin-/3333-raise-up-errors 
Properly handle APIError failures in Project.up
 2016-05-02 14:34:12 -07:00
Joffrey F 310b3d9441 Properly handle APIError failures in Project.up 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-02 13:42:05 -07:00
Thom Linton 28fb91b344 Adds additional validation to 'env_vars_from_file'. 
The 'env_file' directive and feature precludes the use of the name
'.env' in the path shared with 'docker-config.yml', regardless of
whether or not it is enabled.

This change adds an additional validation to allow the use of this
path provided it is not a file.

Signed-off-by: Thom Linton <thom.linton@gmail.com>
 2016-04-29 17:53:31 -07:00
Joffrey F c41f30c3ff Merge pull request #3385 from shin-/3316-skip-statusless-events 
Skip event objects that don't contain a status field
 2016-04-29 17:50:32 -07:00
Joffrey F fe17e0f948 Skip event objects that don't contain a status field 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-29 16:39:42 -07:00
Joffrey F bd7ec24e25 Merge pull request #3384 from shin-/3264-shorthand-host-support 
Support combination of shorthand flag and equal sign for host option
 2016-04-29 16:39:16 -07:00
Joffrey F e4bb678875 Require latest docker-py version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-29 16:37:26 -07:00
André R 84aa39e978 Clarify env-file doc that .env is read from cwd 
Closes #3381

Signed-off-by: André R <ar@ez.no>
 2016-04-28 23:14:06 +02:00
Joffrey F 8cc7d68a00 Merge pull request #3390 from aronahl/master 
Add missing log event filter when using docker-compose logs.
 2016-04-28 12:53:04 -07:00
Joffrey F 0b24883cef Support combination of shorthand flag and equal sign for host option 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-28 12:52:00 -07:00
Aaron Nall 2efcec776c Add missing log event filter when using docker-compose logs. 
Signed-off-by: Aaron Nall <aronahl@hotmail.com>
 2016-04-28 15:14:44 +00:00
Daniel Nephin 61794ba97c Merge pull request #3377 from shin-/3372-windowserror 
Define WindowsError on non-win32 platforms
 2016-04-28 10:33:18 -04:00
Sven Dowideit 87ee38ed2c convert docs Dockerfiles to use docs/base:oss 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-04-28 12:57:02 +00:00
Aanand Prasad 7ad7eb71ca Merge pull request #3164 from aanand/fix-config-v1 
WIP: Fix output of 'config' for v1 files
 2016-04-26 20:34:18 +01:00
Joffrey F d3e645488a Define WindowsError on non-win32 platforms 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-26 11:40:31 -07:00
Aanand Prasad 756ef14edc Fix format of 'restart' option in 'config' output 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-26 19:21:03 +01:00
Aanand Prasad 6064d200f9 Fix output of 'config' for v1 files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-26 19:21:03 +01:00
Aanand Prasad 84a3e2fe79 Check full error message in test_up_with_net_is_invalid 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-26 19:21:03 +01:00
Aanand Prasad a4d3dd6197 Remove v2_only decorators on config tests 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-26 19:21:03 +01:00
Joffrey F 0cd35913c3 Merge pull request #3382 from dnephin/upgrade_pip 
Upgade pip to latest - attempt to fix jenkins builds
 2016-04-26 09:38:12 -07:00
Daniel Nephin 26fe8213aa Upgade pip to latest 
Hopefully fixes our builds.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-26 11:58:41 -04:00
Daniel Nephin ac82597ac1 Merge pull request #3360 from bfirsh/better-validation-error-messages 
Make validation errors less robotic
 2016-04-21 11:32:23 -04:00
Daniel Nephin 1988dfeaf0 Merge pull request #3359 from bfirsh/clarify-compose-file-networks-documentation 
Clarify service networks documentation
 2016-04-21 11:19:32 -04:00
Joffrey F da1d603463 Merge pull request #3351 from shin-/3342-setup-requirements 
Force docker-py 1.8.0 or above
 2016-04-20 17:40:51 -07:00
Joffrey F 75bcc382d9 Force docker-py 1.8.0 or above 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-04-20 16:56:48 -07:00
Ben Firshman b67f110620 Explain the explanation about file versions 
This explanation looked like it was part of the error. Added an
extra new line and a bit of copy to explain the explanation.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-04-20 16:40:16 -07:00
Ben Firshman 27628f8655 Make validation error less robotic 
"ERROR: Validation failed in file './docker-compose.yml', reason(s):"

is now:

"ERROR: The Compose file './docker-compose.yml' is invalid because:"

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-04-20 16:38:09 -07:00
Ben Firshman 55fcd1c3e3 Clarify service networks documentation 
When jumping straight to this bit of the docs, it's not clear
that these are options under a service rather than the top-level
`networks` key. Added a service to make this super clear.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-04-20 15:58:12 -07:00
Ben Firshman a0aea42f75 Merge pull request #3326 from CRogers/patch-1 
Readme should use new docker compose format instead of the old one
 2016-04-20 23:06:35 +01:00
Ben Firshman 6ff3c47630 Merge pull request #3222 from jonlemmon/patch-1 
Rails Docs: Add nodejs to apt-get install command
 2016-04-20 22:57:50 +01:00
Daniel Nephin 8a34ee0eaa Merge pull request #3356 from metal3d/fix-help-acceptance-test 
Fix the tests from jenkins
 2016-04-20 12:18:20 -04:00
Patrice FERLET ba10f1cd55 Fix the tests from jenkins 
Acceptance tests didn't set "help" command to return "0" EXIT_CODE.

close #3354
related #3263

Signed-off-by: Patrice Ferlet <metal3d@gmail.com>
 2016-04-20 13:23:37 +02:00
Aanand Prasad cafe1315b2 Merge pull request #3334 from werehuman/fix-config-hash-change 
Fix #3248: Accidental config_hash change
 2016-04-19 12:42:19 +01:00
Aanand Prasad 984f839d33 Merge pull request #3263 from twitherspoon/3191_2_help_cli_feature 
Added code to support no argument help command
 2016-04-19 12:14:24 +01:00
Aanand Prasad d21e1c5a30 Merge pull request #3335 from johnharris85/master 
Fix CLI docstring to reflect Docopt behaviour.
 2016-04-19 12:13:20 +01:00
Aanand Prasad 52fa010ac7 Merge pull request #3337 from dnephin/check_for_short_id_alias 
Check for short id alias, and don't disconnect if it already exists
 2016-04-19 12:12:43 +01:00
Daniel Nephin d4bebbb1ba Merge pull request #3340 from johnharris85/2922-config-does-not-catch-missing-links 
Fix #2922: Config does not catch missing links
 2016-04-18 10:13:47 -04:00
johnharris85 6d2805917c Account for aliased links 
Fix failing tests
Signed-off-by: John Harris <john@johnharris.io>
 2016-04-17 15:25:06 -04:00
johnharris85 377be5aa1f Adding tests 
Signed-off-by: John Harris <john@johnharris.io>
 2016-04-17 14:01:06 -04:00
johnharris85 68272b0216 Config now catches undefined service links 
Fixes issue #2922
Signed-off-by: John Harris <john@johnharris.io>
 2016-04-17 14:00:07 -04:00
Daniel Nephin 56c6e29819 Unit test for skipping network disconnect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-15 16:28:59 -04:00
Vladimir Lagunov 4702703615 Fix #3248: Accidental config_hash change 
Signed-off-by: Vladimir Lagunov <lagunov.vladimir@gmail.com>
 2016-04-15 15:34:30 +03:00
johnharris85 ad306f0479 Fix CLI docstring to reflect Docopt behaviour. 
Signed-off-by: John Harris <john@johnharris.io>
 2016-04-15 13:30:13 +01:00
Daniel Nephin e1356e1f6f Set networking_config when creating a container. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-04-14 18:09:06 -04:00