Commit Graph

1988 Commits

Author SHA1 Message Date
Daniel Nephin 605d7f26e7 Merge pull request #2027 from dnephin/bump-1.4.1
Bump 1.4.1
2015-09-15 17:47:09 -04:00
Christophe Labouisse 39786d4da7 Add new --pull option in build.
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
2015-09-15 20:19:17 +02:00
moxiegirl f49fc1867c Merge pull request #1959 from charleswhchan/patch-1
Touch up documentation for Docker Compose.
2015-09-15 10:17:49 -07:00
Aanand Prasad 1dabf1c366 Merge pull request #1878 from mnowster/change-default-log-driver-value
Change default `log_driver` value
2015-09-15 17:23:00 +01:00
Aanand Prasad 041a1ff08c Merge pull request #2000 from mnowster/do-not-allow-booleans-in-environment
Disallow booleans in environment
2015-09-15 16:24:59 +01:00
Mazz Mosley fb96ed113a Stop sending json-file by default
By doing this we were over-riding any of the daemon's defaults.
Instead we can send an empty string which docker-py sends on
and the daemon interprets as, 'json-file' as a default if it
hasn't got any other daemon level config options.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-15 15:47:39 +01:00
Mazz Mosley 2f45649611 Handle invalid log_driver
Now docker-py isn't hardcoding a list of valid log_drivers, we
can expect an APIError in response rather than a ValueError
if we send an invalid log_driver.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-15 15:47:39 +01:00
Mazz Mosley 4b2fd7699b Relax constraints on key naming for environment
One of the use cases is swarm requires at least : character, so going
from conservative to relaxed.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-15 15:33:30 +01:00
Mazz Mosley 8caeffe27e Log a warning when boolean is found in `environment`
We're going to warn people that allowing a boolean in the environment is
being deprecated, so in a future release we can disallow it. This is to
ensure boolean variables are quoted in strings to ensure they don't get
mis-parsed by YML.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-15 15:33:30 +01:00
Mazz Mosley a594a2ccc2 Disallow booleans in environment
When users were putting true/false/yes/no in the environment key,
the YML parser was converting them into True/False, rather than leaving
them as a string.

This change will force people to put them in quotes, thus ensuring
that the value gets passed through as intended.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-15 15:33:30 +01:00
mnowster e33ab0cdd8 Merge pull request #2031 from aanand/docker-py-1.4.0
Update docker-py to 1.4.0
2015-09-15 15:31:52 +01:00
Aanand Prasad 1bef5cd166 Merge pull request #2014 from mnowster/improve-validation-messaging
Improve oneOf schema validation messaging
2015-09-15 15:29:11 +01:00
Mazz Mosley 1007ad0f86 Refactor to simplify _parse_valid_types
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-15 14:29:00 +01:00
Mazz Mosley cf7b595385 Improve error messages from oneOf schema errors
oneOf schema ValidationError takes a little more work to parse and
pull out more detail so we can give a better error message back to
the user.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-15 14:29:00 +01:00
Tomas Tomecek 0bdbb33447 include logo in README
Resolves #2024

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2015-09-15 09:17:00 +02:00
Daniel Nephin b24ca75914 Bump 1.4.1
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-14 18:18:01 -04:00
Mazz Mosley 418ec5336b Improved messaging for simple type validator
English language is a tricky old thing and I've pulled out the validator type
parsing so that we can prefix our validator types with the correct article,
'an' or 'a'.

Doing a bit of extra hard work to ensure the error message is clear and
well constructed english.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-14 17:23:58 +01:00
Mazz Mosley 32cd404c8c Remove redundant oneOf definitions
For simple definitions where a field can be multiple types, we can
specify the allowed types in an array. It's simpler and clearer.

This is only applicable to *simple* definitions, like number, string, list,
object without any other constraints.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-14 17:23:58 +01:00
Charles Chan a95ac0f0e0 Touch up documentation for Docker Compose.
index.md:
* clarify Python & Flask
* minor edits & reformatting

install.md:
* merge the elevated installation instructions with `sudo -i` discussed by @asveepay and @aanand in PR #1201; fixes #1081 (not sure what happened to the merge, but it's not showing up on the master branch or website)
* minor edits

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-09-13 20:00:55 -07:00
Aanand Prasad d1dd06a7e2 Update docker-py to 1.4.0
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-11 15:42:20 -07:00
Aanand Prasad dbc68ca747 Merge pull request #2018 from dnephin/fix_scale_test
Handle unexpected errors, but don't ignore background threads
2015-09-11 15:42:01 -07:00
Luiz Geron 1fcacae1fe Fix schema.json MANIFEST.in entry
docker-compose up doesn't run after install without this.

Signed-off-by: Luiz Geron <luiz@geron.me>
2015-09-11 19:14:51 -03:00
Daniel Nephin 61415cd8bc Fixes #1955 - Handle unexpected errors, but don't ignore background threads.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-11 17:41:10 -04:00
Daniel Nephin 2b75741e5a Fix cherry-pick errors.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-11 14:22:35 -04:00
Aanand Prasad e9871b084e Merge pull request #2020 from dnephin/fix_compose_with_logs_none
Fix compose up with other log drivers
2015-09-11 11:22:12 -07:00
Aanand Prasad 60701a71dc Merge pull request #2026 from ggtools/validation
Fix type for `tty` & `stdin_open`
2015-09-11 11:14:47 -07:00
Daniel Nephin 7d8ae9aa6d Refactor LogPrinter to make it immutable and remove logic from the constructor.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-11 12:56:56 -04:00
Daniel Nephin 413b76e228 Fix warning message when a container uses a non-json log driver
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-11 12:54:27 -04:00
Daniel Nephin 4641d40526 Document limitation of other log drivers.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-11 12:54:27 -04:00
Aanand Prasad b25a300895 Merge pull request #1966 from dnephin/docs_update
Expose the CLI reference pages a bit better from the index
2015-09-10 17:00:41 -07:00
Aanand Prasad 87a50317ad Merge pull request #1954 from nhumrich/master
Allow for user relative paths on EXTEND
2015-09-10 16:35:40 -07:00
Daniel Nephin 7ff8c2b224 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-09-10 19:32:30 -04:00
Daniel Nephin db31adc208 Extract link names into a function.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-10 19:32:30 -04:00
Daniel Nephin 805f6a7683 Refactor network_mode logic out of Service.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-10 19:32:30 -04:00
Daniel Nephin d92f323e6d Fixes #1757 - include all service properties in the config_dict()
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
Daniel Nephin cf2dbf55b8 Cleanup some project logic.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
Daniel Nephin 8d4c724c2d Sort config keys
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
Daniel Nephin 9cb2770da4 Make external_links a regular service.option so that it's part of the config hash
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
Daniel Nephin 6a23491fa9 Resolves #1856, fix regression in #1645. Includes some refactoring to make testing easier.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
Mazz Mosley 294b9742be 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-09-10 19:32:30 -04:00
Aanand Prasad a9b1f15f92 Fix volume path warning
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-10 19:32:29 -04:00
Christophe Labouisse e80f0bdf86 Fix type for `tty` & `stdin_open`
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
2015-09-10 23:49:07 +02:00
Daniel Nephin 1eb925ee31 Link between pages in the CLI reference section
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 13:53:26 -04:00
Daniel Nephin 4bdf57ead8 Add a where to go next section to the main index page for compose
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 13:53:26 -04:00
Daniel Nephin 860b304f4a Add COMPOSE_API_VERSION to the docs
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-10 13:53:19 -04:00
Lachlan Pease 851129de6c Added documentation for IPC config
Signed-off-by: Lachlan Pease <predatory.kangaroo@gmail.com>
2015-09-10 23:34:07 +10:00
Nick H 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
Aanand Prasad 9ce30e75df Merge pull request #2016 from mnowster/remove-unique-constraint-for-command
Remove uniqueness constraint for command
2015-09-09 10:05:41 -07:00
Daniel Nephin 469a709a37 Merge pull request #2017 from mnowster/remove-detach-field
Remove mistaken field
2015-09-09 12:52:44 -04:00
Mazz Mosley 4bed5de291 Remove item unique constraint for command
The command value can be a list, which would be a Unix command-line
invocation broken up into individual values, thus needing the ability to
have non unique values.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-09 16:39:06 +01:00