diff --git a/CHANGELOG.md b/CHANGELOG.md index 0251d6691..d115f05d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,9 +19,9 @@ Major Features: - Support for networking has exited experimental status and is the recommended way to enable communication between containers. - If you use the new file format, your app will use networking. If you want to - keep using links, just leave your Compose file as it is and it'll continue - to work just the same. + If you use the new file format, your app will use networking. If you aren't + ready yet, just leave your Compose file as it is and it'll continue to work + just the same. By default, you don't have to configure any networks. In fact, using networking with Compose involves even less configuration than using links. @@ -48,6 +48,10 @@ Major Features: building tools on top of Compose for performing actions when particular things happen, such as containers starting and stopping. +- There's a new `depends_on` option for specifying dependencies between + services. This enforces the order of startup, and ensures that when you run + `docker-compose up SERVICE` on a service with dependencies, those are started + as well. New Features: @@ -108,6 +112,11 @@ Bug Fixes: - Fixed a bug where a container would be reported as "Up" when it was in the restarting state. +- Fixed a confusing error message when DOCKER_CERT_PATH was not set properly. + +- Fixed a bug where attaching to a container would fail if it was using a + non-standard logging driver (or none at all). + 1.5.2 (2015-12-03) ------------------ diff --git a/compose/__init__.py b/compose/__init__.py index 52d0e7bfe..3c52ff7df 100644 --- a/compose/__init__.py +++ b/compose/__init__.py @@ -1,4 +1,4 @@ from __future__ import absolute_import from __future__ import unicode_literals -__version__ = '1.6.0rc1' +__version__ = '1.6.0rc2' diff --git a/docs/install.md b/docs/install.md index 944e9190a..c1dd9a491 100644 --- a/docs/install.md +++ b/docs/install.md @@ -39,7 +39,7 @@ which the release page specifies, in your terminal. The following is an example command illustrating the format: - curl -L https://github.com/docker/compose/releases/download/1.6.0rc1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose + curl -L https://github.com/docker/compose/releases/download/1.6.0rc2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose If you have problems installing with `curl`, see [Alternative Install Options](#alternative-install-options). @@ -54,7 +54,7 @@ which the release page specifies, in your terminal. 7. Test the installation. $ docker-compose --version - docker-compose version: 1.6.0rc1 + docker-compose version: 1.6.0rc2 ## Alternative install options @@ -77,7 +77,7 @@ to get started. Compose can also be run inside a container, from a small bash script wrapper. To install compose as a container run: - $ curl -L https://github.com/docker/compose/releases/download/1.6.0rc1/run.sh > /usr/local/bin/docker-compose + $ curl -L https://github.com/docker/compose/releases/download/1.6.0rc2/run.sh > /usr/local/bin/docker-compose $ chmod +x /usr/local/bin/docker-compose ## Master builds diff --git a/script/run.sh b/script/run.sh index 3fbc60e00..89655053d 100755 --- a/script/run.sh +++ b/script/run.sh @@ -15,7 +15,7 @@ set -e -VERSION="1.6.0rc1" +VERSION="1.6.0rc2" IMAGE="docker/compose:$VERSION"