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
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
52733f6996
Merge pull request #1833 from aanand/deprecate-relative-volumes-without-dot
...
Show a warning when a relative path is specified without "./"
2015-08-11 11:21:17 +01:00
b7baa899e2
Merge pull request #1829 from vlajos/typofixes-vlajos-20150807
...
typofix - https://github.com/vlajos/misspell_fixer
2015-08-10 22:13:30 +01:00
afc9629c59
Merge pull request #1832 from aanand/use-docker-1.8.0-rc3
...
Test against Docker 1.8.0 RC3
2015-08-10 20:53:01 +01:00
46e8e4322a
Show a warning when a relative path is specified without "./"
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-10 19:56:36 +01:00
4e12ce39b3
Merge pull request #1835 from aanand/fix-crash-when-container-has-no-name
...
Ignore containers that don't have a name
2015-08-10 18:50:00 +01:00
197d332620
Merge pull request #1836 from aanand/use-overlay-driver-in-tests
...
Use overlay driver in tests
2015-08-10 18:47:29 +01:00
7f90e9592a
Use overlay driver in tests
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-10 18:05:09 +01:00
dfa4bf4452
Ignore containers that don't have a name
...
If a container is in the process of being removed, or removal has
failed, it can sometimes appear in the output of GET /containers/json
but not have a 'Name' key. In that case, rather than crashing, we can
ignore it.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-10 16:29:12 +01:00
6cb8e512f2
Merge pull request #1812 from moxiegirl/install-update-for-1811
...
Closes #1811 for Toolbox
2015-08-10 12:48:25 +01:00
4390362366
Test against Docker 1.8.0 RC3
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-10 12:01:51 +01:00
7c128b46a1
- Closes #1811 for Toolbox
...
- Updating with comments
Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-09 10:51:39 -07:00
11adca9324
typofix - https://github.com/vlajos/misspell_fixer
...
Signed-off-by: Veres Lajos <vlajos@gmail.com>
2015-08-07 22:34:24 +01:00
22b7ee42de
Merge pull request #1817 from aanand/update-volume-tests
...
Update volume tests for clarity
2015-08-06 18:09:58 +01:00
fdaa5f2cde
Update volume tests for clarity
...
- Better method names.
- Environment variable syntax in volume paths, even when a driver is
specified, now *will* be processed (the test wasn't testing it
properly). However, `~` will still *not* expand to the user's home
directory.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-06 16:14:37 +01:00
f7b9daf927
Merge pull request #1815 from aanand/abort-if-daemon-cant-start
...
Abort tests if daemon fails to start
2015-08-06 15:29:55 +01:00
44f1207931
Merge pull request #1765 from aanand/interpolate-environment-variables
...
Interpolate environment variables
2015-08-06 15:13:30 +01:00
4f14298694
Abort tests if daemon fails to start
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-06 14:45:35 +01:00
ee6ff294a2
Show a warning when a variable is unset
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-06 14:24:11 +01:00
8b5bd945d0
Interpolate environment variables
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-06 11:18:57 +01:00
31ac3ce22a
Split out compose.config.errors
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-05 15:50:22 +01:00
92ef1f5702
Make compose.config a proper module
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-05 15:50:22 +01:00
a248cfd65a
Merge pull request #1692 from bfirsh/coverage
...
Add test coverage support
2015-08-05 11:32:33 +01:00
8ddf37c4b3
Merge pull request #1778 from aanand/remove-script-docs
...
Remove custom docs script
2015-08-02 07:36:49 -07:00
41b9df7639
Merge pull request #1800 from aanand/volume-driver-support
...
Support volume_driver
2015-07-31 16:28:46 +01:00
b25f05bed4
Merge pull request #1799 from d2bit/clean-rails-quickstart-guide-db-config
...
Remove useless postgres 'port' configuration
2015-07-31 07:27:45 -07:00
a68ee0d9c2
Support volume_driver in compose
...
* Add support for volume_driver parameter in compose yml
* Don't expand volume host paths if a volume_driver is specified
(i.e., disable compose feature "relative to absolute path
transformation" when volume drivers are in use, since volume drivers
can use name where host path is normally specified; this is a
heuristic)
Signed-off-by: Luke Marsden <luke@clusterhq.com>
2015-07-31 15:23:15 +01:00
1a9ddf645d
Remove useless postgres 'port' configuration
...
Signed-off-by: David BF <burretfresket@gmail.com>
2015-07-31 14:40:29 +02:00
ea7276031c
Merge pull request #1794 from aanand/add-test-for-trailing-slash-volume-copy
...
Add test for trailing slash volume copying bug
2015-07-30 07:18:57 -07:00
27bd987f28
Add test for trailing slash volume copying bug
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-30 10:31:54 +01:00
dc7bdd10d4
Merge pull request #1787 from aanand/fix-duplicate-volume-bind
...
Fix "Duplicate volume mount" error when config has trailing slashes
2015-07-30 09:59:08 +01:00
b47bb84ea1
Merge pull request #1754 from aanand/wait-for-all-containers-to-exit
...
Wait for all containers to exit
2015-07-30 09:58:49 +01:00
80d90a745a
Make sure an exception in any iterator gets raised in the main thread
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Conflicts:
compose/cli/multiplexer.py
2015-07-29 19:42:33 +01:00
a9942b512a
Wait for all containers to exit when running 'up' interactively
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 19:42:33 +01:00
27378704df
Isolate STOP logic in multiplexer module
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 19:42:33 +01:00
03c3d4c768
generator -> iterator
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 19:42:33 +01:00
9768872507
Fix "Duplicate volume mount" error when config has trailing slashes
...
When an image declares a volume such as `/var/lib/mysql`, and a Compose
file has a line like `./data:/var/lib/mysql/` (note the trailing slash),
Compose creates duplicate volume binds when *recreating* the container.
(The first container is created without a hitch, but contains multiple
entries in its "Volumes" config.)
Fixed by normalizing all paths in volumes config.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 18:42:08 +01:00
276e369c31
Merge pull request #1777 from aanand/update-api-version
...
Update API version to 1.19
2015-07-29 16:59:42 +01:00
118a389646
Update API version to 1.19
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 15:44:21 +01:00
2759ab5ab6
Merge pull request #1780 from gheart/specify_api_version_via_env
...
Allow API version specification via env var
2015-07-29 15:42:57 +01:00
1496734cbb
Merge pull request #1779 from aanand/mac-binary-error-hint
...
Add hint about OS X binary compatibility
2015-07-29 15:06:55 +01:00
fc203d643a
Allow API version specification via env var
...
Hard-coding the API version to '1.18' with the docker-py constructor will
cause the docker-py logic at
https://github.com/docker/docker-py/blob/master/docker/client.py#L143-L146
to always fail, which will cause authentication issues if you're using a
remote daemon using API version 1.19 - regardless of the API version of
the registry.
Allow the user to set the API version via an environment variable. If
the variable is not present, it will still default to '1.18' like it
does today.
Signed-off-by: Reilly Herrewig-Pope <reilly.herrewigpope@mandiant.com>
2015-07-29 08:44:47 -04:00
b08e23d351
Add hint about OS X binary compatibility
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 10:44:38 +01:00
430ba8cda3
Remove custom docs script
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-28 16:59:37 +01:00
487eae3b7b
Merge pull request #1774 from moxiegirl/test-entire-build
...
Contributors can build public docs with compose docs in context
2015-07-28 15:03:46 +01:00
7eabc06df5
Updating build so that contributors can build public docs
...
Changed base image
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-27 09:43:16 -07:00
e832e86f09
Merge pull request #1762 from aanand/update-changelog-and-install
...
Update CHANGES.md and install.md for latest stable version
2015-07-23 16:37:02 +01:00
33a108f9bb
Merge pull request #1760 from alunduil/add-completion-to-sdist
...
add all completions to sdist
2015-07-23 07:34:30 -07:00
65cc84140a
Merge pull request #1736 from aanand/deprecate-allow-insecure-ssl
...
Deprecate --allow-insecure-ssl
2015-07-23 14:09:17 +01:00
Aanand Prasad
Mazz Mosley
Ben Firshman
Mary Anthony
Veres Lajos
Daniel Nephin
Luke Marsden
David BF
Reilly Herrewig-Pope