compose

jyapayne/compose

Fork 0

Commit graph

36757cde1c Validate extended service against our schema Mazz Mosley 2015-08-25 17:54:06 +01:00
37bf8235b7 Get extended config path Mazz Mosley 2015-08-24 16:00:47 +01:00
538a501eec Refactor validating extends file path Mazz Mosley 2015-08-24 15:58:17 +01:00
02c52ae673 Move resolve_environment within __init__ Mazz Mosley 2015-08-24 12:23:45 +01:00
8a6061bfb9 __init__ takes service name and dict Mazz Mosley 2015-08-21 17:07:37 +01:00
1344533b24 filename is not optional Mazz Mosley 2015-08-21 17:04:10 +01:00
c907f35e74 Raise if working_dir is None Mazz Mosley 2015-08-20 15:05:33 +01:00
3bee62e4c5 Merge pull request #1956 from bfirsh/link-to-zenhub Aanand Prasad 2015-09-01 17:31:45 -07:00
6969829a70 Link to ZenHub instead of Waffle Ben Firshman 2015-09-01 17:23:39 -07:00
c63ae64ca6 Merge pull request #1920 from dnephin/use_pytest Aanand Prasad 2015-09-01 15:29:24 -07:00
c1ed1efde8 Use py.test as the test runner Daniel Nephin 2015-09-01 16:24:07 -04:00
6ac617bae1 Split requirements-build.txt from requirements-dev.txt to support a leaner tox.ini Daniel Nephin 2015-09-01 16:23:04 -04:00
8479108ee8 Merge pull request #1945 from dnephin/issue_triage_doc Aanand Prasad 2015-09-01 13:25:37 -07:00
74782a56b5 Fix script/test by just calling script/test-versions directly instead of launching another container. Daniel Nephin 2015-08-25 10:57:21 -04:00
5a5f28228a Document installing of pre-commit hooks. Daniel Nephin 2015-08-25 10:53:31 -04:00
83c514f838 Merge pull request #1933 from dnephin/fix_scale_test_flakes Aanand Prasad 2015-08-31 13:52:33 -07:00
235fe21fd0 Prevent flaky test by changing container names. Daniel Nephin 2015-08-26 18:55:22 -04:00
17bd11c334 Merge pull request #1940 from hermanjunge/patch-1 mnowster 2015-08-31 10:43:30 +01:00
8f310767a6 Add ISSUE-TRIAGE.md doc Daniel Nephin 2015-08-28 14:01:02 -04:00
a4bab13aee Adds pause- and unpause-command to docopt's TLC Frank Sachsenheim 2015-08-28 19:05:19 +02:00
9543cb341b Fix doc install.md Herman Junge 2015-08-27 19:41:17 -03:00
0074d74d7a Merge pull request #1914 from bbirand/patch-1 mnowster 2015-08-28 12:13:42 +01:00
f5d73fee57 Merge pull request #1932 from mrfuxi/image-dockerfile-validation mnowster 2015-08-28 10:12:54 +01:00
d264c2e33a Resolves #1804 Daniel Nephin 2015-08-27 17:42:26 -04:00
477d4f491d Do not allow to specify both image and dockerfile in configuration. Closes #1908 Karol Duleba 2015-08-26 22:03:45 +01:00
21c16a787a Merge pull request #1928 from albers/completion-timeout Daniel Nephin 2015-08-27 12:37:55 -04:00
d45f00df13 Merge pull request #1935 from aanand/normalise-ignore-files Daniel Nephin 2015-08-27 10:39:24 -04:00
e777d08854 Merge pull request #1924 from dnephin/python3_fix_for_logs Aanand Prasad 2015-08-27 14:19:42 +01:00
b39e549c87 Normalise ignore files Aanand Prasad 2015-08-27 13:35:45 +01:00
7c8c23e0c7 Merge pull request #1917 from sdurrheimer/master Aanand Prasad 2015-08-27 13:17:19 +01:00
4602ceca18 Merge pull request #1931 from dnephin/fix_regression_in_up Aanand Prasad 2015-08-27 13:00:59 +01:00
5865df3633 Merge pull request #1934 from aanand/fix-release-process-typo mnowster 2015-08-27 10:38:20 +01:00
acca22206a Fix typo Aanand Prasad 2015-08-27 10:36:12 +01:00
0286d282f9 Merge pull request #1916 from aanand/improve-release-docs mnowster 2015-08-27 10:34:32 +01:00
3a0153859a Resolves #1856, fix regression in #1645. Includes some refactoring to make testing easier. Daniel Nephin 2015-08-26 16:21:31 -04:00
ecd1cc31dc Merge pull request #1930 from dnephin/name_one_off_containers Aanand Prasad 2015-08-26 19:03:00 +01:00
d2718bed99 Allow setting a one-off container name Daniel Nephin 2015-08-26 13:33:03 -04:00
bdec7e6b52 Cleanup some test case, remove unused mock return values, and use standard single underscore for unused variable Daniel Nephin 2015-08-26 13:32:21 -04:00
ae64f306f8 Merge pull request #1929 from dnephin/remove_flake8_ignores Aanand Prasad 2015-08-26 18:19:20 +01:00
54973e8200 Remove flake8 ignores and wrap the longest lines to 140 char. Daniel Nephin 2015-08-26 12:53:11 -04:00
2cfda01ff4 Use consistent argument order in bash completion Harald Albers 2015-08-26 18:16:36 +02:00
b03a2f7910 Add completion for scale --timeout Harald Albers 2015-08-26 17:57:04 +02:00
7e22719090 Fix suppressed blank in completion of scale --help Harald Albers 2015-08-26 17:48:51 +02:00
34249fad5d Improve release docs Aanand Prasad 2015-08-25 14:26:33 +01:00
9d9550c5b6 Fix log printing for python3 by converting everything to unicode. Daniel Nephin 2015-08-25 17:17:12 -04:00
a348993d2c Remove two unused functions from cli/utils.py Daniel Nephin 2015-08-25 16:55:29 -04:00
2b589606da Move log_printer_test into correct testing module for naming convention. Daniel Nephin 2015-08-25 16:49:49 -04:00
196f0afe8d Update zsh completion with last changes Steve Durrheimer 2015-08-25 16:52:10 +02:00
fc63454c99 Merge pull request #440 from dnephin/python3 Aanand Prasad 2015-08-25 18:22:40 +01:00
1451a6e188 Python3 requires a locale Daniel Nephin 2015-08-24 18:54:59 -04:00
bd7c032a00 Fix service integration tests. Daniel Nephin 2015-08-24 14:49:51 -04:00
71ff872e8e Update unit tests for stream_output to match the behaviour of a docker-py response. Daniel Nephin 2015-08-24 13:16:13 -04:00
7e4c3142d7 Have log_printer use utf8 stream. Daniel Nephin 2015-08-24 12:43:08 -04:00
feaa4a5f1a Unit tests passing again. Daniel Nephin 2015-08-24 11:51:38 -04:00
2943ac6812 Cleanup requirements.txt so we don't have to maintain separate copies for py2 and py3. Daniel Nephin 2015-07-02 22:35:20 -04:00
9aa61e596e Run tests against Python 2.6, 2.7, 3.3, 3.4 and PyPy2 funkyfuture 2015-03-26 23:28:02 +01:00
809443d6d0 Support python 3 Daniel Nephin 2014-08-19 17:36:46 -04:00
17682c58db Merge pull request #1915 from dnephin/add_pre_commit_hooks Aanand Prasad 2015-08-25 13:49:33 +01:00
59d4f304ee Run pre-commit on all files Daniel Nephin 2015-08-24 15:25:25 -04:00
fae6454661 Add pre-commit hooks Daniel Nephin 2015-08-24 15:15:08 -04:00
a57ce1b1ba Export COMPOSE_FILE Berk Birand 2015-08-24 15:10:00 -04:00
2da8b7e511 Merge pull request #1911 from aanand/test-against-docker-1.8.1 Aanand Prasad 2015-08-24 16:23:33 +01:00
60ff4549c9 Merge pull request #1766 from funkyfuture/pause_unpause Aanand Prasad 2015-08-24 16:10:22 +01:00
1212193c02 Merge pull request #1898 from aanand/verbose-debug Daniel Nephin 2015-08-24 07:55:10 -07:00
dd738b380b Makes Service.config_hash a property Frank Sachsenheim 2015-07-25 22:48:55 +02:00
227584b864 Adds pause and unpause-commands Frank Sachsenheim 2015-07-25 22:20:58 +02:00
59d024f4f2 Merge pull request #1897 from qzio/log-opt/address-to-syslog-address mnowster 2015-08-21 10:43:02 +01:00
8caaee9eac schema.json: remove specific log_opt properties Joel Hansson 2015-08-21 08:36:03 +02:00
c699876617 Set log level to DEBUG when --verbose is passed Aanand Prasad 2015-08-20 16:09:28 +01:00
61936f6b88 log_opt: change address to syslog-address Joel Hansson 2015-08-20 16:38:43 +02:00
a806d9e77b Merge pull request #1855 from mnowster/number-is-a-valid-service-name Aanand Prasad 2015-08-20 12:02:58 +01:00
340eaf44fa Merge pull request #1889 from mrfuxi/1670-images-digest mnowster 2015-08-20 10:55:00 +01:00
56f03bc20a Allow to specify image by digest. Fixes #1670 Karol Duleba 2015-08-18 21:46:05 +01:00
5028e38261 Merge pull request #1170 from benhamill/fix_bash_completion mnowster 2015-08-19 14:54:30 +01:00
8ff208babc Merge pull request #1847 from aanand/rename-changes.md-to-changelog.md mnowster 2015-08-19 14:25:27 +01:00
30b64e65cd Merge pull request #1859 from mrfuxi/extend-unexisting-service mnowster 2015-08-19 14:23:28 +01:00
71ffa89890 Merge pull request #1870 from aanand/fix-volume-path-warning mnowster 2015-08-19 14:21:19 +01:00
6edc673aad Merge pull request #1881 from mhor/patch-1 Aanand Prasad 2015-08-18 12:12:46 +01:00
18a474211d remove extra ``` Maxime Horcholle 2015-08-18 09:07:15 +02:00
0ad4725e7e Merge pull request #1879 from mnowster/improve-handling-of-parallelise-exceptions Aanand Prasad 2015-08-17 17:04:45 +01:00
f4a8fda283 Handle all exceptions Mazz Mosley 2015-08-17 16:31:57 +01:00
65afce526a Test against Docker 1.8.1 Aanand Prasad 2015-08-14 12:42:33 +01:00
478054af47 Rename CHANGES.md to CHANGELOG.md Aanand Prasad 2015-08-11 15:01:11 +01:00
530d20db6d Fix volume path warning Aanand Prasad 2015-08-14 11:15:22 +01:00
67995ab9e3 Pre-process validation steps Mazz Mosley 2015-08-12 17:09:48 +01:00
b87c09b9fc Merge pull request #1824 from mrfuxi/run-with-ports Daniel Nephin 2015-08-13 08:29:25 -07:00
2ddce83c8a Merge pull request #1854 from aanand/document-release-process Aanand Prasad 2015-08-13 10:46:12 +01:00
2e7f08c2ef Raise configuration error when trying to extend service that does not exist. Fixes #1826 Karol Duleba 2015-08-10 23:16:55 +01:00
ff87ceabbd Allow manual port mapping when using "run" command. Fixes #1709 Karol Duleba 2015-08-07 13:42:37 +01:00
7d5e26bd37 Merge pull request #1857 from mnowster/mem-limit-validation Aanand Prasad 2015-08-12 17:48:55 +01:00
440099754d memory values can be strings or numbers Mazz Mosley 2015-08-12 17:29:33 +01:00
711b0b4daf Merge pull request #1853 from aanand/only-use-overlay-in-ci Aanand Prasad 2015-08-12 17:05:59 +01:00
f1eef7b416 Fill out release process documentation Aanand Prasad 2015-08-12 16:31:37 +01:00
c443e95f07 Merge pull request #1825 from aanand/dedupe-unset-env-warnings mnowster 2015-08-12 15:57:04 +01:00
4c65891db1 Avoid duplicate warnings if an unset env variable is used multiple times Aanand Prasad 2015-08-07 15:04:30 +01:00
bcb977425b Only use overlay driver in CI Aanand Prasad 2015-08-12 15:36:10 +01:00
2134800cad Merge pull request #1852 from mnowster/fix-testsuite-post-some-merges Aanand Prasad 2015-08-12 15:31:59 +01:00
5e2ecff8a1 Fix ports validation Mazz Mosley 2015-08-12 15:19:28 +01:00
eea3b1cd6f Merge pull request #1850 from aanand/bump-1.5.0dev Aanand Prasad 2015-08-12 11:18:37 +01:00
ed31673069 Merge pull request #1827 from mnowster/port-ranges Aanand Prasad 2015-08-12 11:17:22 +01:00