tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,561 Commits 25 Branches 265 Tags 68 MiB
Commit Graph

1561 Commits

Author SHA1 Message Date
Aanand Prasad b39e549c87 Normalise ignore files 
- Consistent order and contents (where possible)
- Prepend .gitignore paths with slashes where appropriate

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-27 13:51:51 +01:00
mnowster 0286d282f9 Merge pull request #1916 from aanand/improve-release-docs 
Improve release docs
 2015-08-27 10:34:32 +01:00
Aanand Prasad ecd1cc31dc Merge pull request #1930 from dnephin/name_one_off_containers 
Allow setting a one-off container name
 2015-08-26 19:03:00 +01:00
Daniel Nephin d2718bed99 Allow setting a one-off container name 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-26 13:33:03 -04:00
Daniel Nephin bdec7e6b52 Cleanup some test case, remove unused mock return values, and use standard single underscore for unused variable 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-26 13:32:49 -04:00
Aanand Prasad ae64f306f8 Merge pull request #1929 from dnephin/remove_flake8_ignores 
Remove flake8 ignores and wrap the longest lines to 140 char
 2015-08-26 18:19:20 +01:00
Daniel Nephin 54973e8200 Remove flake8 ignores and wrap the longest lines to 140 char. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-26 12:53:11 -04:00
Aanand Prasad 34249fad5d Improve release docs 
Incorporating questions from
https://gist.github.com/aanand/e567bd8d6a5d8e28c829

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-26 17:06:10 +01:00
Aanand Prasad fc63454c99 Merge pull request #440 from dnephin/python3 
Support python 3
 2015-08-25 18:22:40 +01:00
Daniel Nephin 1451a6e188 Python3 requires a locale 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 11:10:02 -04:00
Daniel Nephin bd7c032a00 Fix service integration tests. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:48:48 -04:00
Daniel Nephin 71ff872e8e Update unit tests for stream_output to match the behaviour of a docker-py response. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:48:48 -04:00
Daniel Nephin 7e4c3142d7 Have log_printer use utf8 stream. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:47:06 -04:00
Daniel Nephin feaa4a5f1a Unit tests passing again. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:47:06 -04:00
Daniel Nephin 2943ac6812 Cleanup requirements.txt so we don't have to maintain separate copies for py2 and py3. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:46:08 -04:00
funkyfuture 9aa61e596e Run tests against Python 2.6, 2.7, 3.3, 3.4 and PyPy2 
In particular it includes:
- some extension of CONTRIBUTING.md
- one fix for Python 2.6 in tests/integration/cli_test.py
- one fix for Python 3.3 in tests/integration/service_test.py
- removal of unused imports

Make stream_output Python 3-compatible

Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2015-08-25 10:41:09 -04:00
Daniel Nephin 809443d6d0 Support python 3 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-25 10:37:29 -04:00
Aanand Prasad 17682c58db Merge pull request #1915 from dnephin/add_pre_commit_hooks 
Add pre commit hooks
 2015-08-25 13:49:33 +01:00
Daniel Nephin 59d4f304ee Run pre-commit on all files 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-24 17:04:50 -04:00
Daniel Nephin fae6454661 Add pre-commit hooks 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-08-24 17:04:45 -04:00
Aanand Prasad 2da8b7e511 Merge pull request #1911 from aanand/test-against-docker-1.8.1 
Test against Docker 1.8.1
 2015-08-24 16:23:33 +01:00
Aanand Prasad 60ff4549c9 Merge pull request #1766 from funkyfuture/pause_unpause 
Adds pause and unpause-commands
 2015-08-24 16:10:22 +01:00
Daniel Nephin 1212193c02 Merge pull request #1898 from aanand/verbose-debug 
Set log level to DEBUG when `--verbose` is passed
 2015-08-24 07:55:10 -07:00
Frank Sachsenheim dd738b380b Makes Service.config_hash a property 
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2015-08-21 12:43:13 +02:00
Frank Sachsenheim 227584b864 Adds pause and unpause-commands 
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
 2015-08-21 12:43:13 +02:00
mnowster 59d024f4f2 Merge pull request #1897 from qzio/log-opt/address-to-syslog-address 
log_opt: change address to syslog-address
 2015-08-21 10:43:02 +01:00
Joel Hansson 8caaee9eac schema.json: remove specific log_opt properties 
Signed-off-by: Joel Hansson <joel.hansson@ecraft.com>
 2015-08-21 08:41:45 +02:00
Aanand Prasad c699876617 Set log level to DEBUG when `--verbose` is passed 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-20 16:09:28 +01:00
Joel Hansson 61936f6b88 log_opt: change address to syslog-address 
Signed-off-by: Joel Hansson <joel.hansson@ecraft.com>
 2015-08-20 16:46:06 +02:00
Aanand Prasad a806d9e77b Merge pull request #1855 from mnowster/number-is-a-valid-service-name 
A number is a valid service name
 2015-08-20 12:02:58 +01:00
mnowster 340eaf44fa Merge pull request #1889 from mrfuxi/1670-images-digest 
Allow to specify image by digest. Fixes #1670
 2015-08-20 10:55:00 +01:00
Karol Duleba 56f03bc20a Allow to specify image by digest. Fixes #1670 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-08-19 21:13:34 +01:00
mnowster 5028e38261 Merge pull request #1170 from benhamill/fix_bash_completion 
Fix Bash Completion
 2015-08-19 14:54:30 +01:00
mnowster 8ff208babc Merge pull request #1847 from aanand/rename-changes.md-to-changelog.md 
Rename CHANGES.md to CHANGELOG.md
 2015-08-19 14:25:27 +01:00
mnowster 30b64e65cd Merge pull request #1859 from mrfuxi/extend-unexisting-service 
Raise configuration error when trying to extend service that does not exist
 2015-08-19 14:23:28 +01:00
mnowster 71ffa89890 Merge pull request #1870 from aanand/fix-volume-path-warning 
Fix volume path warning
 2015-08-19 14:21:19 +01:00
Aanand Prasad 6edc673aad Merge pull request #1881 from mhor/patch-1 
remove extra ```
 2015-08-18 12:12:46 +01:00
Maxime Horcholle 18a474211d remove extra ``` 
Signed-off-by: mhor <maxime.horcholle@gmail.com>
 2015-08-18 09:09:37 +02:00
Aanand Prasad 0ad4725e7e Merge pull request #1879 from mnowster/improve-handling-of-parallelise-exceptions 
Handle all exceptions from API
 2015-08-17 17:04:45 +01:00
Mazz Mosley f4a8fda283 Handle all exceptions 
If we get back an error that wasn't an APIError, it was causing the
thread to hang. This catch all, while I appreciate feels risky to
have a catch all, is better than not catching and silently failing,
with a never ending thread.

If something worse than an APIError has gone wrong, we want to stop
the incredible journey of what we're doing.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-17 16:31:57 +01:00
Aanand Prasad 65afce526a Test against Docker 1.8.1 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-14 12:42:33 +01:00
Aanand Prasad 478054af47 Rename CHANGES.md to CHANGELOG.md 
To align with the docker/docker repo.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-14 11:27:27 +01:00
Aanand Prasad 530d20db6d Fix volume path warning 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-08-14 11:15:22 +01:00
Mazz Mosley 67995ab9e3 Pre-process validation steps 
In order to validate a service name that has been specified as an
integer we need to run that as a pre-process validation step
*before* we pass the config to be validated against the schema.

It is not possible to validate it *in* the schema, it causes a
type error. Even though a number is a valid service name, it
must be a cast as a string within the yaml to avoid type error.

Taken this opportunity to move the code design in a direction
towards:

1. pre-process
2. validate
3. construct

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-13 16:32:20 +01:00
Daniel Nephin b87c09b9fc Merge pull request #1824 from mrfuxi/run-with-ports 
Allow manual port mapping when using "run" command
 2015-08-13 08:29:25 -07:00
Aanand Prasad 2ddce83c8a Merge pull request #1854 from aanand/document-release-process 
Fill out release process documentation
 2015-08-13 10:46:12 +01:00
Karol Duleba 2e7f08c2ef Raise configuration error when trying to extend service that does not exist. Fixes #1826 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-08-12 22:34:25 +01:00
Karol Duleba ff87ceabbd Allow manual port mapping when using "run" command. Fixes #1709 
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
 2015-08-12 18:54:42 +01:00
Aanand Prasad 7d5e26bd37 Merge pull request #1857 from mnowster/mem-limit-validation 
memory values can be strings or numbers
 2015-08-12 17:48:55 +01:00
Mazz Mosley 440099754d memory values can be strings or numbers 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-08-12 17:29:33 +01:00