Skip to content

Commit

Permalink
Merge pull request docker#3778 from shin-/1.8.0-release-master-changes
Browse files Browse the repository at this point in the history
1.8.0 release master changes
  • Loading branch information
dnephin authored Jul 27, 2016
2 parents d5765b7 + 6ab0607 commit dec2c83
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 5 deletions.
62 changes: 62 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,68 @@
Change log
==========

1.8.0 (2016-06-14)
-----------------

**Breaking Changes**

- As announced in 1.7.0, `docker-compose rm` now removes containers
created by `docker-compose run` by default.

- Setting `entrypoint` on a service now empties out any default
command that was set on the image (i.e. any `CMD` instruction in the
Dockerfile used to build it). This makes it consistent with
the `--entrypoint` flag to `docker run`.

New Features

- Added `docker-compose bundle`, a command that builds a bundle file
to be consumed by the new *Docker Stack* commands in Docker 1.12.

- Added `docker-compose push`, a command that pushes service images
to a registry.

- Compose now supports specifying a custom TLS version for
interaction with the Docker Engine using the `COMPOSE_TLS_VERSION`
environment variable.

Bug Fixes

- Fixed a bug where Compose would erroneously try to read `.env`
at the project's root when it is a directory.

- `docker-compose run -e VAR` now passes `VAR` through from the shell
to the container, as with `docker run -e VAR`.

- Improved config merging when multiple compose files are involved
for several service sub-keys.

- Fixed a bug where volume mappings containing Windows drives would
sometimes be parsed incorrectly.

- Fixed a bug in Windows environment where volume mappings of the
host's root directory would be parsed incorrectly.

- Fixed a bug where `docker-compose config` would ouput an invalid
Compose file if external networks were specified.

- Fixed an issue where unset buildargs would be assigned a string
containing `'None'` instead of the expected empty value.

- Fixed a bug where yes/no prompts on Windows would not show before
receiving input.

- Fixed a bug where trying to `docker-compose exec` on Windows
without the `-d` option would exit with a stacktrace. This will
still fail for the time being, but should do so gracefully.

- Fixed a bug where errors during `docker-compose up` would show
an unrelated stacktrace at the end of the process.

- `docker-compose create` and `docker-compose start` show more
descriptive error messages when something goes wrong.


1.7.1 (2016-05-04)
-----------------

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

__version__ = '1.8.0dev'
__version__ = '1.9.0dev'
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.7.1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
curl -L https://github.com/docker/compose/releases/download/1.8.0/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.7.1
docker-compose version: 1.8.0


## 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.7.1/run.sh > /usr/local/bin/docker-compose
$ curl -L https://github.com/docker/compose/releases/download/1.8.0/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/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

set -e

VERSION="1.7.0"
VERSION="1.8.0"
IMAGE="docker/compose:$VERSION"


Expand Down

0 comments on commit dec2c83

Please sign in to comment.