ee68a51e28
Skip TLS version test if TLSv1_2 is not available on platform
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-14 12:23:04 -07:00
0fe82614a6
Merge pull request #3595 from dnephin/add-push-and-bundle
...
Add docker-compose push and docker-compose bundle
2016-06-14 10:57:32 -07:00
8f8c17bf66
Merge pull request #3549 from shin-/KalleDK-master
...
Add support for COMPOSE_TLS_VERSION config option
2016-06-14 10:57:12 -07:00
9b7bd69cfc
Support entrypoint, labels, and user in the bundle.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-14 13:00:12 -04:00
1ea9dda1d3
Implement 'docker-compose push' and 'docker-compose bundle'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-06-14 12:06:14 -04:00
21f20cbc9b
Merge pull request #3449 from Andrey9kin/ready/3281
...
Fix #3281 : Unexpected result when using build args with default values
2016-06-14 08:05:07 -07:00
68d73183eb
Fix a typo in a test's name.
2016-06-13 23:36:34 -04:00
2123906586
Merge pull request #3577 from sanmai-NL/3576-byte_str_fix
...
Fix byte/str typing error
2016-06-14 01:58:27 +01:00
59e96fea4f
Merge pull request #3588 from shin-/3285-root-mount
...
Fix split_path_mapping behavior when mounting "/"
2016-06-14 01:45:20 +01:00
60f7e021ad
Fix split_path_mapping behavior when mounting "/"
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-13 15:32:10 -07:00
61324ef308
Fix byte/str typing error
...
Signed-off-by: Sander Maijers <S.N.Maijers@gmail.com>
2016-06-10 16:30:46 +02:00
0287486b14
Fix minor YAML typo
...
Signed-off-by: David Beitey <david@davidjb.com>
2016-06-09 17:00:31 +10:00
9ddb7f3c90
Convert readthedocs links for their .org -> .io migration for hosted projects
...
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/ ) ‘Securing subdomains’:
> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.
Test Plan: Manually visited all the links I’ve modified.
Signed-off-by: Adam Chainz <adam@adamj.eu>
2016-06-08 03:52:12 +01:00
e502417df2
Merge pull request #3475 from shin-/3429-networks-config-serialize
...
Output valid config in config command
2016-06-07 18:01:39 +02:00
6e2d1eb80e
Merge pull request #3516 from albers/completion-rm--all
...
remove command completion for `docker-compose rm --a`
2016-06-06 22:23:56 +01:00
ea640f3821
Remove external_name from serialized config output
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-03 12:10:09 -07:00
427ec899df
Merge pull request #3504 from denismakogon/issue-3503
...
Issue-3503: Improve timestamp validation in tests
2016-06-03 11:57:55 -07:00
e7a8b2fed5
Update TLS version configuration code. Tests.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-03 11:45:22 -07:00
17b219454f
Merge pull request #3522 from SvenDowideit/fix-links
...
Fix links
2016-05-31 16:36:29 -07:00
dd3590180d
more fixes
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-05-31 21:18:42 +00:00
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
90fba58df9
Fix links
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-05-27 21:29:47 +00:00
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
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
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
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
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
4bb80c25d3
Merge pull request #3483 from aanand/env-disambiguation
...
Add "disambiguation" page for environment variables
2016-05-24 13:29:22 -07:00
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
a34cd5ed54
Add "disambiguation" page for environment variables
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-05-23 15:03:25 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
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
4bf5271ae2
Skip invalid git tags in versions.py
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-12 14:41:40 -04:00
72f6a5c8d3
Merge pull request #3433 from anton44eg/issue_3432
...
add msg attribute to ProjectError class
2016-05-12 16:55:11 +01:00
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
4b01f6dcd6
add msg attribute to ProjectError class
...
Signed-off-by: Anton Simernia <anton.simernya@gmail.com>
2016-05-09 18:26:20 +07:00
f1603a3ee2
Merge pull request #3092 from wenchma/service_image
...
Update image format for service conf reference
2016-05-09 10:16:37 +10:00
5fa81c4044
Merge pull request #3417 from spectralsun/patch-1
...
Small typo
2016-05-09 10:15:56 +10:00
3b7191f246
Small typo
...
Signed-off-by: spectralsun <garrett@spectralsun.com>
2016-05-04 10:47:01 -07:00
Joffrey F
Joffrey F
Aanand Prasad
Daniel Nephin
alex
Sander Maijers
David Beitey
Adam Chainz
Ben Firshman
Sven Dowideit
Sven Dowideit
Andrey Devyatkin
Denis Makogon
Harald Albers
Anton Simernia
Garrett Seward