From 6e89a5708fab417b54d8b5b498abe38e621afde9 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Thu, 12 Nov 2015 13:23:04 -0500
Subject: [PATCH] cherry-pick release notes from 1.5.1
Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
CHANGELOG.md | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
docs/install.md | 6 +++---
script/run.sh | 2 +-
3 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dde425421..428e5a933 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,59 @@
Change log
==========
+1.5.1 (2015-11-12)
+------------------
+
+- Add the `--force-rm` option to `build`.
+
+- Add the `ulimit` option for services in the Compose file.
+
+- Fixed a bug where `up` would error with "service needs to be built" if
+ a service changed from using `image` to using `build`.
+
+- Fixed a bug that would cause incorrect output of parallel operations
+ on some terminals.
+
+- Fixed a bug that prevented a container from being recreated when the
+ mode of a `volumes_from` was changed.
+
+- Fixed a regression in 1.5.0 where non-utf-8 unicode characters would cause
+ `up` or `logs` to crash.
+
+- Fixed a regression in 1.5.0 where Compose would use a success exit status
+ code when a command fails due to an HTTP timeout communicating with the
+ docker daemon.
+
+- Fixed a regression in 1.5.0 where `name` was being accepted as a valid
+ service option which would override the actual name of the service.
+
+- When using `--x-networking` Compose no longer sets the hostname to the
+ container name.
+
+- When using `--x-networking` Compose will only create the default network
+ if at least one container is using the network.
+
+- When printings logs during `up` or `logs`, flush the output buffer after
+ each line to prevent buffering issues from hideing logs.
+
+- Recreate a container if one of its dependencies is being created.
+ Previously a container was only recreated if it's dependencies already
+ existed, but were being recreated as well.
+
+- Add a warning when a `volume` in the Compose file is being ignored
+ and masked by a container volume from a previous container.
+
+- Improve the output of `pull` when run without a tty.
+
+- When using multiple Compose files, validate each before attempting to merge
+ them together. Previously invalid files would result in not helpful errors.
+
+- Allow dashes in keys in the `environment` service option.
+
+- Improve validation error messages by including the filename as part of the
+ error message.
+
+
1.5.0 (2015-11-03)
------------------
diff --git a/docs/install.md b/docs/install.md
index d394905d0..861954b4b 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/VERSION_NUM/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
+ curl -L https://github.com/docker/compose/releases/download/1.5.1/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.5.0
+ docker-compose version: 1.5.1
## 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.5.0/run.sh > /usr/local/bin/docker-compose
+ $ curl -L https://github.com/docker/compose/releases/download/1.5.1/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 342188e88..9563b2e9c 100755
--- a/script/run.sh
+++ b/script/run.sh
@@ -15,7 +15,7 @@
set -e
-VERSION="1.5.0"
+VERSION="1.5.1"
IMAGE="docker/compose:$VERSION"