Commit Graph

1710 Commits

Author SHA1 Message Date
Mike Bailey aac916c73e Alphabetise reference list
Bring in line with Glossary. https://docs.docker.com/reference/glossary/

Alphabetising list makes makes parsing by humans easier.

Signed-off-by: Mike Bailey <mike.bailey@rea-group.com>

Conflicts:
	docs/yml.md
2015-09-18 11:25:59 +01:00
Daniel Nephin aab688d27e Merge pull request #1886 from mnowster/create-host-config-needs-version
Stop using deprecated `create_host_config` from utils
2015-09-17 12:37:22 -04:00
mnowster 1c823597bb Merge pull request #1995 from predakanga/master
Added support for IPC namespaces, fixes GH-1689
2015-09-17 17:14:44 +01:00
Mazz Mosley 39ba2c5a7c Fix leaky tests
It was mocking self.client but relying on the call to
utils.create_host_config which was not mocked. So now that function
has moved to also be on self.client we need to redefine the test
boundary, up to where we would call docker-py, not the result of
docker-py.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-17 17:11:00 +01:00
Mazz Mosley 6f6c04b5c9 Test what we are sending, not what we get
This is a unit test and we are mocking the client. The method to get
the create_config_host now lives on the client, so we mock that too.

So we can test to the boundary that the method is called with the
arguments we expect.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-17 17:11:00 +01:00
Mazz Mosley 42c890796b Use docker.client.create_host_config
create_host_config from docker.utils will be deprecated so that
the new create_host_config has access to the _version so
we can ensure that network_mode only gets set to 'default' by
default if the version is high enough and won't explode.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-17 17:11:00 +01:00
mnowster e7ce4c85fa Merge pull request #2040 from TomasTomecek/2024-add-logo-to-docs
include logo in readme and docs
2015-09-17 16:59:25 +01:00
mnowster d577cd6877 Merge pull request #2059 from ZJaffee/master
Change Wordpress > WordPress in the documentation #2052
2015-09-17 15:40:22 +01:00
Zachary Jaffee fb83b4c6a4 updated wordpress format syntax
Signed-off-by: Zachary Jaffee <zjaffee@us.ibm.com>
2015-09-17 09:56:44 -04:00
Aanand Prasad 718f9bea17 Merge pull request #2055 from dnephin/fix_queue_lock
Fix stacktrace when ctrl-c stops logs
2015-09-17 11:32:23 +01:00
Daniel Nephin c2b8d5863a Merge pull request #2053 from dnephin/update_release_notes
Add 1.4.1 release notes and download instructions
2015-09-16 14:17:40 -04:00
mnowster 25d40bd5f2 Merge pull request #2058 from aanand/fix-docs-typo
Fix typo in docs/index.md
2015-09-16 16:41:37 +01:00
Aanand Prasad 1ed13f401f Merge pull request #2035 from geron/patch-1
Fix schema.json MANIFEST.in entry
2015-09-16 12:43:27 +01:00
Aanand Prasad bbc8765343 Fix typo in docs/index.md
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-16 12:38:59 +01:00
Daniel Nephin bdfb21f017 Fixes #189 - stacktrace when ctrl-c stops logs
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-15 20:46:22 -04:00
Daniel Nephin 7c32fcbcf5 Add 1.4.1 release notes and download instructions.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-15 18:03:17 -04: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
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
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
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