Ver código fonte

Merge pull request #3777 from docker/bump-1.8.0

Bump 1.8.0
Joffrey F 9 anos atrás
pai
commit
94f7016fb7
4 arquivos alterados com 7 adições e 6 exclusões
  1. 1 1
      compose/__init__.py
  2. 2 1
      compose/cli/command.py
  3. 3 3
      docs/install.md
  4. 1 1
      script/run/run.sh

+ 1 - 1
compose/__init__.py

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

+ 2 - 1
compose/cli/command.py

@@ -65,8 +65,9 @@ def get_tls_version(environment):
     tls_attr_name = "PROTOCOL_{}".format(compose_tls_version)
     if not hasattr(ssl, tls_attr_name):
         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).'
+            .format(compose_tls_version)
         )
         return None
 

+ 3 - 3
docs/install.md

@@ -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.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
      [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.8.0-rc3
+        docker-compose version: 1.8.0
 
 
 ## 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.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
 
 ## Master builds

+ 1 - 1
script/run/run.sh

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