2b75741e5a
Fix cherry-pick errors.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-11 14:22:35 -04:00
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
60701a71dc
Merge pull request #2026 from ggtools/validation
...
Fix type for `tty` & `stdin_open`
2015-09-11 11:14:47 -07:00
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
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
4641d40526
Document limitation of other log drivers.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-11 12:54:27 -04:00
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
87a50317ad
Merge pull request #1954 from nhumrich/master
...
Allow for user relative paths on EXTEND
2015-09-10 16:35:40 -07:00
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
db31adc208
Extract link names into a function.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-10 19:32:30 -04:00
805f6a7683
Refactor network_mode logic out of Service.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-10 19:32:30 -04:00
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
cf2dbf55b8
Cleanup some project logic.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
8d4c724c2d
Sort config keys
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-10 19:32:30 -04:00
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
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
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
a9b1f15f92
Fix volume path warning
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-10 19:32:29 -04:00
e80f0bdf86
Fix type for `tty` & `stdin_open`
...
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
2015-09-10 23:49:07 +02:00
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
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
860b304f4a
Add COMPOSE_API_VERSION to the docs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-10 13:53:19 -04:00
851129de6c
Added documentation for IPC config
...
Signed-off-by: Lachlan Pease <predatory.kangaroo@gmail.com>
2015-09-10 23:34:07 +10:00
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
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
469a709a37
Merge pull request #2017 from mnowster/remove-detach-field
...
Remove mistaken field
2015-09-09 12:52:44 -04:00
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
7223d5cee0
Remove mistaken field
...
detach is a run param, not a config param. Oops, sorry!
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-09 16:23:54 +01:00
2273e2bd3a
Merge pull request #2011 from dnephin/add_extra_labels
...
Add more github label areas
2015-09-08 17:24:21 -07:00
ad46757baf
Add more github label areas.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-08 19:44:25 -04:00
85709d85d2
Merge pull request #1862 from mrfuxi/costom-container-name-in-logs
...
Use custom container name in logs
2015-09-08 14:36:28 -07:00
f7d86d3194
Merge pull request #1944 from funkyfuture/issue-1921
...
Adds pause- and unpause-command to docopt's TLC
2015-09-08 14:05:27 -07:00
1c73ff33fe
Merge pull request #1990 from shin-/1975-fix
...
Remove or space out suspension dots after service name
2015-09-08 12:27:39 -07:00
abb0ab3f9d
Merge pull request #2001 from mnowster/entrypoint-allow-as-a-string
...
Allow entrypoint to be a list or string
2015-09-08 12:08:40 -07:00
b33dd3bc01
Fix error message and class name from Boot2Docker to DockerMachine
...
Signed-off-by: Lucas N. Munhoz <ln.munhoz@gmail.com>
2015-09-08 10:08:38 -03:00
866979c57b
Allow entrypoint to be a list or string
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-07 17:26:38 +01:00
d83d6306c9
Use custom container name in logs. Fixes #1851
...
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
2015-09-07 14:03:00 +01:00
67957318ed
Added IPC spec to fields_schema.json
...
Signed-off-by: Lachlan Pease <predatory.kangaroo@gmail.com>
2015-09-06 12:16:12 +10:00
2468235472
Added support for IPC namespaces, fixes GH-1689
...
Signed-off-by: Lachlan Pease <predatory.kangaroo@gmail.com>
2015-09-06 12:09:24 +10:00
6da7a9194c
Remove or space out suspension dots after service name for easier copy-pasting
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-04 17:43:12 -07:00
9da2bf3973
Merge pull request #1978 from aanand/use-docker-1.8.2-rc1
...
Test against Docker 1.8.2 RC1
2015-09-04 16:21:58 -07:00
10cb0c921a
Merge pull request #1963 from shin-/1923-catch-timeout
...
Exit gracefully when requests encounter a ReadTimeout exception.
2015-09-04 16:14:32 -07:00
536638aaae
Merge pull request #1962 from dnephin/use_enum_for_enum
...
Create a ConvergenceStrategy enum
2015-09-04 15:05:09 -07:00
d84ee667ad
Merge pull request #1983 from mnowster/update-testing-docs
...
Running a single test command updated
2015-09-04 12:28:08 -04:00
31e8137452
Running a single test command updated
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-04 17:23:22 +01:00
ff427e68ee
Merge pull request #1982 from mnowster/fix-trailing-white-space
...
Remove trailing white space from docs/index.md
2015-09-04 12:20:29 -04:00
0f60c783fa
Remove trailing white space
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-04 17:01:44 +01:00
0484e22a84
Add enum34 and use it to create a ConvergenceStrategy enum.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-04 10:45:53 -04:00
d4372bc98f
Merge pull request #1967 from charleswhchan/issue-1958
...
Fix #1958 . Remove release notes for old version of Docker Compose.
2015-09-04 11:44:33 +01:00
000bf1c16a
Fix #1958 . Remove release notes for old version of Docker Compose.
...
Replace by link to the latest CHANGELOG in GitHub.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-09-03 21:18:26 -07:00
Daniel Nephin
Aanand Prasad
Daniel Nephin
Mazz Mosley
Christophe Labouisse
Lachlan Pease
Nick H
Lucas N. Munhoz
Karol Duleba
Joffrey F
mnowster
Charles Chan