tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-27 23:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3777 from docker/bump-1.8.0

Browse Source 
Bump 1.8.0
This commit is contained in:
Joffrey F 2016-07-27 12:40:07 -07:00 committed by GitHub
commit 94f7016fb7
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/__init__.py
View File

@ -1,4 +1,4 @@
from __future__ import absolute_import from __future__ import absolute_import
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '1.8.0-rc3' __version__ = '1.8.0'

3
compose/cli/command.py
View File

@ -65,8 +65,9 @@ def get_tls_version(environment):
tls_attr_name = "PROTOCOL_{}".format(compose_tls_version) tls_attr_name = "PROTOCOL_{}".format(compose_tls_version)
if not hasattr(ssl, tls_attr_name): if not hasattr(ssl, tls_attr_name):
log.warn( log.warn(
'The {} protocol is unavailable. You may need to update your ' 'The "{}" protocol is unavailable. You may need to update your '
'version of Python or OpenSSL. Falling back to TLSv1 (default).' 'version of Python or OpenSSL. Falling back to TLSv1 (default).'
.format(compose_tls_version)
) )
return None return None

6
docs/install.md
View File

@ -39,7 +39,7 @@ which the release page specifies, in your terminal.
The following is an example command illustrating the format: The following is an example command illustrating the format:
curl -L https://github.com/docker/compose/releases/download/1.8.0-rc3/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 If you have problems installing with `curl`, see
[Alternative Install Options](#alternative-install-options). [Alternative Install Options](#alternative-install-options).
@ -54,7 +54,7 @@ which the release page specifies, in your terminal.
7. Test the installation. 7. Test the installation.
$ docker-compose --version $ docker-compose --version
docker-compose version: 1.8.0-rc3 docker-compose version: 1.8.0
## Alternative install options ## Alternative install options
@ -77,7 +77,7 @@ to get started.
Compose can also be run inside a container, from a small bash script wrapper. Compose can also be run inside a container, from a small bash script wrapper.
To install compose as a container run: To install compose as a container run:
$ curl -L https://github.com/docker/compose/releases/download/1.8.0-rc3/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 $ chmod +x /usr/local/bin/docker-compose
## Master builds ## Master builds

2
script/run/run.sh
View File

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