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
427ec899df
Merge pull request #3504 from denismakogon/issue-3503
...
Issue-3503: Improve timestamp validation in tests
2016-06-03 11:57:55 -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
90fba58df9
Fix links
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-05-27 21:29:47 +00: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
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
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
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
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
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
310b3d9441
Properly handle APIError failures in Project.up
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-02 13:42:05 -07:00
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
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
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
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
e4bb678875
Require latest docker-py version
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-29 16:37:26 -07:00
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
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
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
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
61794ba97c
Merge pull request #3377 from shin-/3372-windowserror
...
Define WindowsError on non-win32 platforms
2016-04-28 10:33:18 -04:00
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
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
d3e645488a
Define WindowsError on non-win32 platforms
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-26 11:40:31 -07:00
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
Ben Firshman
Joffrey F
Sven Dowideit
Sven Dowideit
Denis Makogon
Harald Albers
Aanand Prasad
Joffrey F
Daniel Nephin
Anton Simernia
Garrett Seward
Daniel Nephin
Thom Linton
André R
Aaron Nall