a372275c6e
Allow for user relative paths
...
'~/' in a path currently doesnt work, you get the following error:
[Errno 2] No such file or directory: u'/home/USER/folder/~/some/path/.yml'
Signed-off-by: Nick H <nick.humrich@gmail.com>
2015-09-09 14:54:08 -06:00
83c514f838
Merge pull request #1933 from dnephin/fix_scale_test_flakes
...
Fix flaky test
2015-08-31 13:52:33 -07:00
f5d73fee57
Merge pull request #1932 from mrfuxi/image-dockerfile-validation
...
Do not allow to specify both image and dockerfile in configuration.
2015-08-28 10:12:54 +01:00
d264c2e33a
Resolves #1804
...
Fix mutation of service.options when a label or environment variable is specified in the config.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-27 18:05:21 -04:00
477d4f491d
Do not allow to specify both image and dockerfile in configuration. Closes #1908
...
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
2015-08-27 19:36:39 +01:00
e777d08854
Merge pull request #1924 from dnephin/python3_fix_for_logs
...
Fix `docker-compose logs` on python3
2015-08-27 14:19:42 +01:00
3a0153859a
Resolves #1856 , fix regression in #1645 . Includes some refactoring to make testing easier.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-26 16:21:31 -04:00
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
d2718bed99
Allow setting a one-off container name
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-26 13:33:03 -04:00
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
9d9550c5b6
Fix log printing for python3 by converting everything to unicode.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-26 11:24:48 -04:00
a348993d2c
Remove two unused functions from cli/utils.py
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-25 16:55:29 -04:00
bd7c032a00
Fix service integration tests.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-25 10:48:48 -04:00
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
7e4c3142d7
Have log_printer use utf8 stream.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-25 10:47:06 -04:00
feaa4a5f1a
Unit tests passing again.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-25 10:47:06 -04:00
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
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
809443d6d0
Support python 3
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-25 10:37:29 -04:00
59d4f304ee
Run pre-commit on all files
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-24 17:04:50 -04:00
60ff4549c9
Merge pull request #1766 from funkyfuture/pause_unpause
...
Adds pause and unpause-commands
2015-08-24 16:10:22 +01:00
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
dd738b380b
Makes Service.config_hash a property
...
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2015-08-21 12:43:13 +02:00
227584b864
Adds pause and unpause-commands
...
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2015-08-21 12:43:13 +02:00
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
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
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
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
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
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
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
71ffa89890
Merge pull request #1870 from aanand/fix-volume-path-warning
...
Fix volume path warning
2015-08-19 14:21:19 +01:00
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
530d20db6d
Fix volume path warning
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-14 11:15:22 +01:00
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
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
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
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
440099754d
memory values can be strings or numbers
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-08-12 17:29:33 +01:00
c443e95f07
Merge pull request #1825 from aanand/dedupe-unset-env-warnings
...
Avoid duplicate warnings if an unset env variable is used multiple times
2015-08-12 15:57:04 +01:00
4c65891db1
Avoid duplicate warnings if an unset env variable is used multiple times
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-12 15:39:33 +01:00
5e2ecff8a1
Fix ports validation
...
I had misunderstood the valid formats allowed for ports. They must
always be in a list.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-08-12 15:19:28 +01:00
eea3b1cd6f
Merge pull request #1850 from aanand/bump-1.5.0dev
...
Bump 1.5.0dev
2015-08-12 11:18:37 +01:00
ed31673069
Merge pull request #1827 from mnowster/port-ranges
...
Port ranges
2015-08-12 11:17:22 +01:00
fb4c9fbb8b
Merge pull request #1808 from mnowster/129-validate-compose-yml
...
129 validate compose yml
2015-08-12 11:15:47 +01:00
192dda4140
Bump 1.5.0dev
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-11 18:41:21 +01:00
982a845635
Fix mem_limit and memswap_limit regression
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-11 14:17:30 +01:00
f8efb54c80
Handle $ref defined types errors
...
We use $ref in the schema to allow us to specify multiple type, eg
command, it can be a string or a list of strings.
It required some extra parsing to retrieve a helpful type to display
in our error message rather than 'string or string'. Which while
correct, is not helpful. We value helpful.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-08-11 13:08:12 +01:00
68de84a0bf
Clean up error.path handling
...
Tiny bit of refactoring to make it clearer and only pop service_name
once.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-08-11 12:01:27 +01:00
df14a4384d
Catch non-unique errors
...
When a schema type is set as unique, we should display the validation
error to indicate that non-unique values have been provided for a key.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-08-11 12:01:27 +01:00
Nick H
Aanand Prasad
mnowster
Daniel Nephin
Karol Duleba
funkyfuture
Joel Hansson
Mazz Mosley