Berk Birand
a57ce1b1ba
Export COMPOSE_FILE
...
The environment variable is not used by `docker-compose` without the `export` line..
Signed-off-by: Berk Birand <berk@berkbirand.com>
2015-08-24 15:48:14 -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
Aanand Prasad
711b0b4daf
Merge pull request #1853 from aanand/only-use-overlay-in-ci
...
Only use overlay driver in CI
2015-08-12 17:05:59 +01:00
Aanand Prasad
f1eef7b416
Fill out release process documentation
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-12 16:31:37 +01:00
mnowster
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
Aanand Prasad
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
Aanand Prasad
bcb977425b
Only use overlay driver in CI
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-12 15:36:10 +01:00
Aanand Prasad
2134800cad
Merge pull request #1852 from mnowster/fix-testsuite-post-some-merges
...
Fix ports validation
2015-08-12 15:31:59 +01:00
Mazz Mosley
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
Aanand Prasad
eea3b1cd6f
Merge pull request #1850 from aanand/bump-1.5.0dev
...
Bump 1.5.0dev
2015-08-12 11:18:37 +01:00
Aanand Prasad
ed31673069
Merge pull request #1827 from mnowster/port-ranges
...
Port ranges
2015-08-12 11:17:22 +01:00
Aanand Prasad
fb4c9fbb8b
Merge pull request #1808 from mnowster/129-validate-compose-yml
...
129 validate compose yml
2015-08-12 11:15:47 +01:00
Aanand Prasad
192dda4140
Bump 1.5.0dev
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-11 18:41:21 +01:00
Aanand Prasad
3e505e850f
Merge pull request #1849 from moxiegirl/final-link-check
...
Fixing links after crawl
2015-08-11 18:14:01 +01:00
Mary Anthony
d454a584da
Fixing links after crawl
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-11 09:38:49 -07:00
Mazz Mosley
810bb70249
Include schema in manifest
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-08-11 16:31:56 +01:00
Aanand Prasad
93cc7e3751
Merge pull request #1846 from aanand/fix-mem-limit-options
...
Fix mem_limit and memswap_limit regression
2015-08-11 15:59:08 +01:00
Aanand Prasad
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
Mazz Mosley
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
Mazz Mosley
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
Mazz Mosley
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