tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #900 from aanand/ship-1.1.0-rc2 

Ship 1.1.0-rc2
This commit is contained in:
Aanand Prasad 2015-01-29 18:00:26 -05:00
parent bc1f6c97d8 deb2de3c07
commit e4d6a2c240
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGES.md
View File

@ -1,6 +1,17 @@
Change log Change log
========== ==========
1.1.0-rc2 (2015-01-29)
----------------------
On top of the changelog for 1.1.0-rc1 (see below), the following bugs have been fixed:
- When an environment variables file specified with `env_file` doesn't exist, Compose was showing a stack trace instead of a helpful error.
- Configuration files using the old name (`fig.yml`) were not being read unless explicitly specified with `docker-compose -f`. Compose now reads them and prints a deprecation warning.
- Bash tab completion now reads `fig.yml` if it's present.
1.1.0-rc1 (2015-01-20) 1.1.0-rc1 (2015-01-20)
---------------------- ----------------------
@ -28,6 +39,8 @@ Besides that, there’s a lot of new stuff in this release:
- docker-compose.yml now supports the `dns_search`, `cap_add`, `cap_drop` and `restart` options, analogous to `docker run`’s `--dns-search`, `--cap-add`, `--cap-drop` and `--restart` options. - docker-compose.yml now supports the `dns_search`, `cap_add`, `cap_drop` and `restart` options, analogous to `docker run`’s `--dns-search`, `--cap-add`, `--cap-drop` and `--restart` options.
- Compose now ships with Bash tab completion - see the installation and usage docs at https://github.com/docker/fig/blob/1.1.0-rc1/docs/completion.md
- A number of bugs have been fixed - see the milestone for details: https://github.com/docker/fig/issues?q=milestone%3A1.1.0+ - A number of bugs have been fixed - see the milestone for details: https://github.com/docker/fig/issues?q=milestone%3A1.1.0+
1.0.1 (2014-11-04) 1.0.1 (2014-11-04)

2
compose/__init__.py
View File

@ -1,4 +1,4 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from .service import Service # noqa:flake8 from .service import Service # noqa:flake8
__version__ = '1.1.0-rc1' __version__ = '1.1.0-rc2'

2
docs/completion.md
View File

@ -17,7 +17,7 @@ On a Mac, install with `brew install bash-completion`
Place the completion script in `/etc/bash_completion.d/` (`/usr/local/etc/bash_completion.d/` on a Mac), using e.g. Place the completion script in `/etc/bash_completion.d/` (`/usr/local/etc/bash_completion.d/` on a Mac), using e.g.
curl -L https://raw.githubusercontent.com/docker/docker-compose/master/contrib/completion/bash/docker-compose > /etc/bash_completion.d/docker-compose curl -L https://raw.githubusercontent.com/docker/fig/1.1.0-rc2/contrib/completion/bash/docker-compose > /etc/bash_completion.d/docker-compose
Completion will be available upon next login. Completion will be available upon next login.

2
docs/install.md
View File

@ -18,7 +18,7 @@ There are also guides for [Ubuntu](https://docs.docker.com/installation/ubuntuli
Next, install Compose: Next, install Compose:
curl -L https://github.com/docker/docker-compose/releases/download/1.1.0-rc1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose; chmod +x /usr/local/bin/docker-compose curl -L https://github.com/docker/fig/releases/download/1.1.0-rc2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose; chmod +x /usr/local/bin/docker-compose
Optionally, install [command completion](completion.html) for the bash shell. Optionally, install [command completion](completion.html) for the bash shell.