Compare commits

...

4 Commits
1.6.1 ... 1.6.2

Author SHA1 Message Date
Aanand Prasad
4d720279a0 Bump 1.6.2
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-23 15:52:13 -08:00
Joffrey F
796dc91eb1 Update docker-py version in requirements to 1.7.2
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-23 15:52:13 -08:00
Aanand Prasad
a7da06d920 Merge remote-tracking branch 'release/release' into bump-1.6.2 2016-02-23 15:49:21 -08:00
Daniel Nephin
c1b7d6c6ad Merge pull request #3006 from dnephin/bump-1.6.1
WIP: Bump 1.6.1
2016-02-23 12:37:12 -08:00
5 changed files with 12 additions and 6 deletions

View File

@@ -1,6 +1,12 @@
Change log
==========
1.6.2 (2016-02-23)
------------------
- Fixed a bug where connecting to a TLS-enabled Docker Engine would fail with
a certificate verification error.
1.6.1 (2016-02-23)
------------------

View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import unicode_literals
__version__ = '1.6.1'
__version__ = '1.6.2'

View File

@@ -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.1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
curl -L https://github.com/docker/compose/releases/download/1.6.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).
@@ -54,7 +54,7 @@ which the release page specifies, in your terminal.
7. Test the installation.
$ docker-compose --version
docker-compose version: 1.6.1
docker-compose version: 1.6.2
## 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.1/run.sh > /usr/local/bin/docker-compose
$ curl -L https://github.com/docker/compose/releases/download/1.6.2/run.sh > /usr/local/bin/docker-compose
$ chmod +x /usr/local/bin/docker-compose
## Master builds

View File

@@ -1,6 +1,6 @@
PyYAML==3.11
cached-property==1.2.0
docker-py==1.7.1
docker-py==1.7.2
dockerpty==0.4.1
docopt==0.6.1
enum34==1.0.4

View File

@@ -15,7 +15,7 @@
set -e
VERSION="1.6.1"
VERSION="1.6.2"
IMAGE="docker/compose:$VERSION"