From 0f41e07a5c004f975ca3c67d9c4d901301eb147b Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Wed, 24 Jan 2018 23:07:27 +0100 Subject: [PATCH 1/5] Add bash completion for `up {--always-recreate-deps,--renew-anon-volumes}` Signed-off-by: Harald Albers --- contrib/completion/bash/docker-compose | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/bash/docker-compose b/contrib/completion/bash/docker-compose index 017b0192f..faa537cb3 100644 --- a/contrib/completion/bash/docker-compose +++ b/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 From 70ad55cd885afa2ac8bfba1e5b26799d6219d9e8 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Thu, 25 Jan 2018 17:50:20 -0800 Subject: [PATCH 2/5] Trigger remote build for OSX 10.11 Signed-off-by: Joffrey F --- .circleci/config.yml | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 11239e25f..748cbdd0d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,10 +32,10 @@ jobs: - store_artifacts: path: dist/docker-compose-Darwin-x86_64 destination: docker-compose-Darwin-x86_64 - - deploy: - name: Deploy binary to bintray - command: | - OS_NAME=Darwin PKG_NAME=osx ./script/circle/bintray-deploy.sh + # - deploy: + # name: Deploy binary to bintray + # command: | + # 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" \ + -u ${OSX_RELEASE_TOKEN} -d "{\ + \"build_parameters\": {\ + \"COMPOSE_BRANCH\": \"${CIRCLE_BRANCH}\"\ + }\ + }" https://circleci.com/api/v1.1/project/github/docker/compose-osx-release + + 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-.*/ From 14485b306cdbe7b90d732ca1f411d7079f9b3d50 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Thu, 25 Jan 2018 18:10:56 -0800 Subject: [PATCH 3/5] Don't leak circle API auth info Signed-off-by: Joffrey F --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 748cbdd0d..4be1557b0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,7 +74,7 @@ jobs: \"build_parameters\": {\ \"COMPOSE_BRANCH\": \"${CIRCLE_BRANCH}\"\ }\ - }" https://circleci.com/api/v1.1/project/github/docker/compose-osx-release + }" https://circleci.com/api/v1.1/project/github/docker/compose-osx-release > /dev/null workflows: From cc2f0237473e0ab898a5febef91a69f616971449 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Thu, 25 Jan 2018 18:13:49 -0800 Subject: [PATCH 4/5] Circle token Signed-off-by: Joffrey F --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4be1557b0..4ac6d4135 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -69,12 +69,12 @@ jobs: - run: name: API trigger command: | - curl -X POST -H "Content-Type: application/json" \ - -u ${OSX_RELEASE_TOKEN} -d "{\ + 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 > /dev/null + }" https://circleci.com/api/v1.1/project/github/docker/compose-osx-release?circle-token=${OSX_RELEASE_TOKEN} \ + > /dev/null workflows: From a186c3142b80d99c62995f6f36e64867ed883701 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Thu, 25 Jan 2018 18:24:39 -0800 Subject: [PATCH 5/5] Bump 1.19.0-rc2 Signed-off-by: Joffrey F --- CHANGELOG.md | 3 +++ compose/__init__.py | 2 +- script/run/run.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6217fdcd..3c3595d97 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/compose/__init__.py b/compose/__init__.py index 7e19bd462..bc5cff575 100644 --- a/compose/__init__.py +++ b/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' diff --git a/script/run/run.sh b/script/run/run.sh index 8cf59fc33..e45067b3c 100755 --- a/script/run/run.sh +++ b/script/run/run.sh @@ -15,7 +15,7 @@ set -e -VERSION="1.19.0-rc1" +VERSION="1.19.0-rc2" IMAGE="docker/compose:$VERSION"