tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,319 Commits 20 Branches 267 Tags 56 MiB
Commit Graph

3319 Commits

Author SHA1 Message Date
Joffrey F c9fe8920c9 Merge pull request #3457 from dnephin/fix_versions_script 
Skip invalid git tags in versions.py
 2016-05-12 13:52:20 -07:00
Daniel Nephin 4bf5271ae2 Skip invalid git tags in versions.py 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-12 14:41:40 -04:00
Aanand Prasad 72f6a5c8d3 Merge pull request #3433 from anton44eg/issue_3432 
add msg attribute to ProjectError class
 2016-05-12 16:55:11 +01:00
Joffrey F dc88e54010 Merge pull request #3399 from yorkedork/fix/env-file-validation 
Adds additional validation to 'env_vars_from_file'.
 2016-05-12 08:53:25 -07:00
Anton Simernia 4b01f6dcd6 add msg attribute to ProjectError class 
Signed-off-by: Anton Simernia <anton.simernya@gmail.com>
 2016-05-09 18:26:20 +07:00
Sven Dowideit f1603a3ee2 Merge pull request #3092 from wenchma/service_image 
Update image format for service conf reference
 2016-05-09 10:16:37 +10:00
Sven Dowideit 5fa81c4044 Merge pull request #3417 from spectralsun/patch-1 
Small typo
 2016-05-09 10:15:56 +10:00
Joffrey F 6c29830127 Merge pull request #3418 from shin-/bump-1.7.1 
Bump 1.7.1
 2016-05-04 13:03:11 -07:00
Joffrey F 0a9ab358bf Bump 1.7.1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-04 11:52:57 -07:00
Joffrey F 3c424b709e Properly handle APIError failures in Project.up 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-04 11:52:57 -07:00
Joffrey F 47a40d42c7 Require latest docker-py version 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-04 11:52:57 -07:00
Aaron Nall f316b448c2 Add missing log event filter when using docker-compose logs. 
Signed-off-by: Aaron Nall <aronahl@hotmail.com>
 2016-05-04 11:52:57 -07:00
André R 6bfdde6855 Clarify env-file doc that .env is read from cwd 
Closes #3381

Signed-off-by: André R <ar@ez.no>
 2016-05-04 11:52:57 -07:00
Joffrey F 2a08d4731e Skip event objects that don't contain a status field 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-04 11:52:57 -07:00
Joffrey F 11d8093fc8 Support combination of shorthand flag and equal sign for host option 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-04 11:52:57 -07:00
Daniel Nephin d0b46ca9b2 Upgade pip to latest 
Hopefully fixes our builds.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-04 11:52:56 -07:00
Joffrey F b7f9fc4b28 Define WindowsError on non-win32 platforms 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-04 11:52:56 -07:00
Ben Firshman 70a605acac 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-05-04 11:52:56 -07:00
Ben Firshman 85b85bc675 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-05-04 11:52:56 -07:00
Patrice FERLET b334b6f059 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-05-04 11:52:56 -07:00
Joffrey F 0c1c338a02 Force docker-py 1.8.0 or above 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-04 11:52:56 -07:00
johnharris85 f655a8af95 Account for aliased links Fix failing tests Signed-off-by: John Harris <john@johnharris.io> 2016-05-04 11:52:56 -07:00
johnharris85 f7cd94d4a9 Adding tests Signed-off-by: John Harris <john@johnharris.io> 2016-05-04 11:52:56 -07:00
johnharris85 e4d2d7ed8a Config now catches undefined service links Fixes issue #2922 Signed-off-by: John Harris <john@johnharris.io> 2016-05-04 11:52:56 -07:00
Daniel Nephin 2a8c2c8ad6 Unit test for skipping network disconnect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-04 11:52:56 -07:00
Daniel Nephin 5852db4d72 Set networking_config when creating a container. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-04 11:52:56 -07:00
Daniel Nephin 250a7a530b Only disconnect if we don't already have the short id alias. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-05-04 11:52:56 -07:00
johnharris85 4e8b017283 Fix CLI docstring to reflect Docopt behaviour. 
Signed-off-by: John Harris <john@johnharris.io>
 2016-05-04 11:52:56 -07:00
Vladimir Lagunov a86a195c50 Fix #3248: Accidental config_hash change 
Signed-off-by: Vladimir Lagunov <lagunov.vladimir@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon 3368887a29 Updated StringIO import to support io module 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon e5f1429ce1 Updated cli_test.py to validate against the updated help command conditions 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon 65b0e5973b updated cli_test.py to no longer expect raised SystemExit exceptions 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-05-04 11:52:56 -07:00
Tony Witherspoon 9cf483e224 Added code to output the top level command options if docker-compose help with no command options provided 
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
 2016-05-04 11:52:56 -07:00
Aanand Prasad 1e164ca802 Fix format of 'restart' option in 'config' output 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Aanand Prasad a2ded237e4 Fix output of 'config' for v1 files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
Aanand Prasad 8a9ab69a1c Check full error message in test_up_with_net_is_invalid 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-04 11:52:56 -07:00
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