Skip to content

Commit

Permalink
Bump 1.5.2
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Nephin <dnephin@docker.com>
  • Loading branch information
dnephin committed Dec 3, 2015
1 parent aaf66e3 commit 7240ff3
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 5 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
Change log
==========

1.5.2 (2015-12-03)
------------------

- Fixed a bug which broke the use of `environment` and `env_file` with
`extends`, and caused environment keys without values to have a `None`
value, instead of a value from the host environment.

- Fixed a regression in 1.5.1 that caused a warning about volumes to be
raised incorrectly when containers were recreated.

- Fixed a bug which prevented building a `Dockerfile` that used `ADD <url>`

- Fixed a bug with `docker-compose restart` which prevented it from
starting stopped containers.

- Fixed handling of SIGTERM and SIGINT to properly stop containers

- Add support for using a url as the value of `build`

- Improved the validation of the `expose` option


1.5.1 (2015-11-12)
------------------

Expand Down
2 changes: 1 addition & 1 deletion compose/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from __future__ import unicode_literals

__version__ = '1.5.1'
__version__ = '1.5.2'
6 changes: 3 additions & 3 deletions docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
curl -L https://github.com/docker/compose/releases/download/1.5.2/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).
Expand All @@ -54,7 +54,7 @@ which the release page specifies, in your terminal.
7. Test the installation.

$ docker-compose --version
docker-compose version: 1.5.1
docker-compose version: 1.5.2


## Alternative install options
Expand All @@ -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.1/run.sh > /usr/local/bin/docker-compose
$ curl -L https://github.com/docker/compose/releases/download/1.5.2/run.sh > /usr/local/bin/docker-compose
$ chmod +x /usr/local/bin/docker-compose

## Master builds
Expand Down
2 changes: 1 addition & 1 deletion script/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

set -e

VERSION="1.5.1"
VERSION="1.5.2"
IMAGE="docker/compose:$VERSION"


Expand Down

0 comments on commit 7240ff3

Please sign in to comment.