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

3594 Commits

Author SHA1 Message Date
Joffrey F e7a8b2fed5 Update TLS version configuration code. Tests. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-03 11:45:22 -07:00
Sven Dowideit 17b219454f Merge pull request #3522 from SvenDowideit/fix-links 
Fix links
 2016-05-31 16:36:29 -07:00
Sven Dowideit dd3590180d more fixes 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-31 21:18:42 +00:00
Andrey Devyatkin a67ba5536d Fix #3281: Unexpected result when using build args with default values 
Fix the issue when build arg is set to None instead of empty string. Usecase:

cat docker-compose.yml
  .... args:
  - http_proxy
  - https_proxy
  - no_proxy

If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy,
https_proxy, no_proxy build args will be set to string None which breaks all downloads

With this change undefined build args will be set to empty string instead of string None

Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
 2016-05-28 11:39:41 +02:00
Sven Dowideit 90fba58df9 Fix links 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-27 21:29:47 +00:00
Andrey Devyatkin c148849f0e Fix #3281: Unexpected result when using build args with default values 
Fix the issue when build arg is set to None instead of empty string. Usecase:

cat docker-compose.yml
.... args:
- http_proxy
- https_proxy
- no_proxy

If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy,
https_proxy, no_proxy build args will be set to string None which breaks all downloads

With this change undefined build args will be set to empty string instead of string None

Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
 2016-05-27 20:16:52 +02:00
Denis Makogon 1298b9aa5d Issue-3503: Improve timestamp validation in tests 
CLITestCase.test_events_human_readable fails due to
 wrong assumption that host where tests were launched
 will have the same date time as Docker daemon.

 This fix introduces internal method for validating
 timestamp in Docker logs

Signed-off-by: Denys Makogon <lildee1991@gmail.com>
 2016-05-27 14:50:13 +03:00
Andrey Devyatkin e3e8a619cc Fix #3281: Unexpected result when using build args with default values 
Fix the issue when build arg is set to None instead of empty string.
Usecase:

cat docker-compose.yml
....
args:
- http_proxy
- https_proxy
- no_proxy

If http_proxy, https_proxy, no_proxy environment variables are not defined
then http_proxy, https_proxy, no_proxy build args will be set to string None which breaks all downloads

With this change build args will not passed to docker engine if they are equal to string None

Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
 2016-05-27 07:48:13 +02:00
Harald Albers c46737ed02 remove command completion for `docker-compose rm --a` 
As `--all|-a` is deprecated, there's no use to suggest it any
more in command completion.

Signed-off-by: Harald Albers <github@albersweb.de>
 2016-05-26 12:48:53 -07:00
Aanand Prasad 86b5ed1a84 Merge pull request #3473 from shin-/3461-merge-port-mappings 
Eliminate duplicates when merging port mappings from config files
 2016-05-26 16:57:43 +01:00
Joffrey F 4bb80c25d3 Merge pull request #3483 from aanand/env-disambiguation 
Add "disambiguation" page for environment variables
 2016-05-24 13:29:22 -07:00
Joffrey F 048360d1ed Merge pull request #3489 from aanand/update-openssl-mac 
Use latest OpenSSL version when building Mac binary on Travis
 2016-05-23 13:52:51 -07:00
Aanand Prasad a34cd5ed54 Add "disambiguation" page for environment variables 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-23 15:03:25 +01:00
Joffrey F c4229b469a Improve merging for several service config attributes 
All uniqueItems lists in the config now receive the same treatment removing
duplicates.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-20 15:29:04 -07:00
Joffrey F 842e372258 Eliminate duplicates when merging port mappings from config files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-20 15:28:35 -07:00
Aanand Prasad 33bed5c706 Use latest OpenSSL version (1.0.2h) when building Mac binary on Travis 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-20 12:04:37 +01:00
Aanand Prasad 7763122ecb Merge pull request #3459 from shin-/2487-split-volume-path 
Always use the Windows version of splitdrive when parsing volume mappings
 2016-05-20 11:42:43 +01:00
Joffrey F 2b5b665d3a Add test for path mapping with Windows containers 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-19 14:53:37 -07:00
Joffrey F 9a39208741 Merge pull request #3482 from aanand/fix-prompt-buffering 
Fix bug where confirmation prompt doesn't show due to line buffering
 2016-05-19 08:52:34 -07:00
Aanand Prasad ce8df9e789 Merge pull request #3466 from shin-/3330-rm-all-default 
Update rm command to always remove one-off containers.
 2016-05-19 16:46:31 +01:00
Aanand Prasad 0c8aeb9e05 Fix bug where confirmation prompt doesn't show due to line buffering 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-05-19 15:44:17 +01:00
Joffrey F db0a6cf2bb Always use the Windows version of splitdrive when parsing volume mappings 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-17 16:33:59 -07:00
Joffrey F 844b7d463f Update rm command to always remove one-off containers. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-16 14:59:33 -07:00
Joffrey F ca3aef0c84 Merge pull request #3436 from shin-/3374-exec-windows 
Fail gracefully when -d is not provided for exec command on Win32
 2016-05-12 15:14:15 -07:00
Joffrey F e5645595e3 Fail gracefully when -d is not provided for exec command on Win32 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-05-12 14:00:54 -07:00
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