tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-28 08:04:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,174 Commits 21 Branches 282 Tags
Commit Graph

4174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aanand Prasad
e115eaf6fc Fix error message for unrecognised TLS version 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 11:57:23 -07:00
Joffrey F
1bf0cd07de Merge pull request #3772 from docker/bump-1.8.0-rc3 
Bump 1.8.0-rc3
 2016-07-27 11:50:24 -07:00
Joffrey F
647f260b0a Merge pull request #3774 from aanand/fix-tls-version-error-message 
Fix error message for unrecognised TLS version
 2016-07-27 10:35:21 -07:00
Aanand Prasad
ec825af3d3 Fix error message for unrecognised TLS version 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 18:26:40 +01:00
Aanand Prasad
cefa239c2e Bump 1.8.0-rc3 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 17:46:13 +01:00
Aanand Prasad
6f3e4bbc6c Remove note about .dsb 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad
87b6b3c139 Add note about missing volume mount support 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad
1fb5c4b15a Fix example image hash 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad
35ed189981 Copy experimental bundle docs into Compose docs so URL is stable 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad
c392acc56b Show a warning when engine is in swarm mode 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Ben Firshman
cd267d5121 Add user agent to API calls 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-07-27 16:27:05 +01:00
Ben Firshman
cb076a57b9 Suggest to run Docker for Mac if it isn't running 
Instead of suggesting docker-machine.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-07-27 16:27:05 +01:00
Daniel Nephin
6246a2592e Add reference docs for push and bundle. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-27 16:27:05 +01:00
Joffrey F
606358cfb7 Update docker-py requirement to the latest release 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad
0488dd3709 Rename --fetch-digests to --push-images and remove auto-pull 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad
b72f911ccf Fix timeout value in error message 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad
f9c5816ab8 Stop checking the deprecated DOCKER_CLIENT_TIMEOUT variable 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad
2ecbf25445 Fix bugs with entrypoint/command in docker-compose run 
- When no command is passed but `--entrypoint` is, set Cmd to `[]`
- When command is a single empty string, set Cmd to `[""]`

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad
8f842d55d7 Reorder/clarify args docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Jarrod Pooler
ad19ff6c67 Updating arg docs in the proper place 
Signed-off-by: Jarrod Pooler <jarrod.pooler@homesite.com>
 2016-07-27 16:27:05 +01:00
Aanand Prasad
4fb7033d9c Clarify environment and env_file docs 
Add note to say that environment variables will not be automatically
made available at build time, and point to the `args` documentation.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:27:05 +01:00
Tomas Tomecek
e1b7510e4a service: detailed error messages for create and start 
Fixes: #3355

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2016-07-27 16:27:05 +01:00
Harald Albers
f7853a30bd bash completion for docker-compose bundle --fetch-digests 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-07-27 16:27:05 +01:00
Aanand Prasad
6633f1962c Shell completion for --push-images 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-27 16:00:53 +01:00
Aanand Prasad
3b4a53c959 Merge remote-tracking branch 'release/release' into bump-1.8.0-rc3 2016-07-27 15:53:08 +01:00
Aanand Prasad
e9d62e8404 Merge pull request #3676 from aanand/warn-for-swarm-mode 
Show a warning when engine is in swarm mode
 2016-07-27 15:38:09 +01:00
Aanand Prasad
ef4ad93d1e Merge pull request #3760 from bfirsh/useragent 
Add user agent to API calls
 2016-07-27 14:55:18 +01:00
Aanand Prasad
69b91ef6ba Merge pull request #3636 from dnephin/add_missing_ref_docs 
Add missing reference docs for push and bundle
 2016-07-27 14:30:17 +01:00
Ben Firshman
1877a41b92
Add user agent to API calls 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-07-27 14:26:15 +01:00
Aanand Prasad
5f0186e008 Merge pull request #3769 from shin-/upgrade-dockerpy-1.9.0 
Update to docker-py 1.9.0
 2016-07-27 11:56:13 +01:00
Joffrey F
7f3375c2ce Update docker-py requirement to the latest release 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-07-26 13:07:38 -07:00
Daniel Nephin
2fec6966d4 Add reference docs for push and bundle. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-07-26 15:18:09 -04:00
Ben Firshman
4a8b88bc2e Merge pull request #3763 from aanand/remove-experimental-networking-doc 
Remove doc on experimental networking support
 2016-07-26 14:24:04 +01:00
Aanand Prasad
8ffbe8e083 Remove note about .dsb 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-26 11:59:04 +01:00
Aanand Prasad
28e6508f4a Add note about missing volume mount support 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-26 11:51:30 +01:00
Aanand Prasad
8924f6c05c Fix example image hash 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-26 11:51:16 +01:00
Aanand Prasad
4598dfc79f Merge pull request #3762 from aanand/pull-flag-on-bundle 
Rename --fetch-digests to --push-images and remove auto-pull
 2016-07-26 11:01:32 +01:00
Aanand Prasad
887ed8d1b6 Rename --fetch-digests to --push-images and remove auto-pull 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-25 17:36:24 +01:00
Aanand Prasad
583bbb4635 Copy experimental bundle docs into Compose docs so URL is stable 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-25 13:46:56 +01:00
Aanand Prasad
2c9e46f60f Show a warning when engine is in swarm mode 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-25 13:46:56 +01:00
Aanand Prasad
07e2426d89 Remove doc on experimental networking support 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-07-25 13:38:04 +01:00
Nikola Kovacs
958758ff6d Remove anonymous volumes when using run --rm. 
Named volumes will not be removed.
This is consistent with the behavior of docker run --rm.

Fixes #2419, #3611

Signed-off-by: Nikola Kovacs <nikola.kovacs@gmail.com>
 2016-07-25 11:43:30 +02:00
Daniel Nephin
619bf4c4df Merge pull request #3705 from aanand/fix-timeout-message 
Fix timeout value in error message
 2016-07-22 10:57:41 -04:00
Daniel Nephin
10749e187c Merge pull request #3718 from aanand/fix-run-entrypoint 
Fix bugs with entrypoint/command in docker-compose run
 2016-07-22 10:55:25 -04:00
Aanand Prasad
7f65caa97b Merge pull request #3747 from aanand/clarify-env-docs 
Clarify environment, env_file and build.args docs
 2016-07-21 16:14:26 +01:00
Daniel Nephin
a9b5e5abe0 Merge pull request #3751 from ijc25/master 
Tidy up remaining lingering docker.client.Client objects in test suite
 2016-07-21 11:13:29 -04:00
Ian Campbell
d6f70dddc7 Call the superclass tearDown in VolumeTest 
Currently it doesn't actually seem to make any practical difference that this
is missing, but it seems like good practice to do so anyway, to be robust
against future test case changes which might require cleanup done in the super
class.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-07-21 13:17:53 +01:00
Ian Campbell
3124fec01a tearDown tmp_volumes array itself in VolumeTest 
Each volume in the array holds a reference to a docker.client.Client object and
therefore a connection pool which leaves fds open once the test has completed.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-07-21 13:17:53 +01:00
Ian Campbell
5cdf30fc12 Teardown project and db in ResilienceTest 
These hold a reference to a docker.client.Client object and therefore a
connection pool which leaves fds open once the test has completed.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2016-07-21 13:17:53 +01:00
Aanand Prasad
26b819ca67 Merge pull request #3748 from ijc25/master 
tearDown the project override at the end of each test case
 2016-07-20 16:28:45 +01:00