Merge pull request #5610 from docker/bump-1.19.0-rc2

Bump 1.19.0 rc2

.circleci/config.yml

@@ -32,10 +32,10 @@ jobs:
       - store_artifacts:
           path: dist/docker-compose-Darwin-x86_64
           destination: docker-compose-Darwin-x86_64
-      - deploy:
+      # - deploy:
-          name: Deploy binary to bintray
+      #     name: Deploy binary to bintray
-          command: |
+      #     command: |
-            OS_NAME=Darwin PKG_NAME=osx ./script/circle/bintray-deploy.sh
+      #       OS_NAME=Darwin PKG_NAME=osx ./script/circle/bintray-deploy.sh
 
 
   build-linux-binary:
@@ -53,6 +53,30 @@ jobs:
           name: Deploy binary to bintray
           command: |
             OS_NAME=Linux PKG_NAME=linux ./script/circle/bintray-deploy.sh
+
+  trigger-osx-binary-deploy:
+    # We use a separate repo to build OSX binaries meant for distribution
+    # with support for OSSX 10.11 (xcode 7). This job triggers a build on
+    # that repo.
+    docker:
+      - image: alpine:3.6
+
+    steps:
+      - run:
+          name: install curl
+          command: apk update && apk add curl
+
+      - run:
+          name: API trigger
+          command: |
+            curl -X POST -H "Content-Type: application/json" -d "{\
+              \"build_parameters\": {\
+                \"COMPOSE_BRANCH\": \"${CIRCLE_BRANCH}\"\
+              }\
+            }" https://circleci.com/api/v1.1/project/github/docker/compose-osx-release?circle-token=${OSX_RELEASE_TOKEN} \
+            > /dev/null
+
+
 workflows:
   version: 2
   all:
@@ -60,3 +84,9 @@ workflows:
       - test
       - build-linux-binary
       - build-osx-binary
+      - trigger-osx-binary-deploy:
+          filters:
+            branches:
+              only:
+                - master
+                - /bump-.*/

CHANGELOG.md

@@ -72,6 +72,9 @@ Change log
 - Fixed a bug where the recreation of a service would break if the image
   associated with the previous container had been removed
 
+- Fixed a bug where updating a mount's target would break Compose when
+  trying to recreate the associated service
+
 - Fixed a bug where `tmpfs` volumes declared using the extended syntax in
   Compose files using version 3.2 would be erroneously created as anonymous
   volumes instead

compose/__init__.py

@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-__version__ = '1.19.0-rc1'
+__version__ = '1.19.0-rc2'

contrib/completion/bash/docker-compose

@@ -550,7 +550,7 @@ _docker_compose_up() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--abort-on-container-exit --build -d --exit-code-from --force-recreate --help --no-build --no-color --no-deps --no-recreate --no-start --remove-orphans --scale --timeout -t" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--abort-on-container-exit --always-recreate-deps --build -d --exit-code-from --force-recreate --help --no-build --no-color --no-deps --no-recreate --no-start --renew-anon-volumes -V --remove-orphans --scale --timeout -t" -- "$cur" ) )
 			;;
 		*)
 			__docker_compose_services_all

script/run/run.sh

@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.19.0-rc1"
+VERSION="1.19.0-rc2"
 IMAGE="docker/compose:$VERSION"