From 6817b533a89da4925ac91e6e2c2a96306dc81042 Mon Sep 17 00:00:00 2001
From: Matthieu Nottale <matthieu.nottale@docker.com>
Date: Thu, 5 Jul 2018 15:10:31 +0000
Subject: [PATCH]  "Bump 1.22.0-rc2"

Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
---
 CHANGELOG.md                      |  5 +++++
 compose/__init__.py               |  2 +-
 script/release/release.py         |  7 ++-----
 script/release/release.sh         |  1 +
 script/release/release/bintray.py | 14 +-------------
 script/run/run.sh                 |  2 +-
 6 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5a22aad2..45cba0516 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,11 @@ Change log
 - Fixed an issue that prevented proper parsing of UTF-8 BOM encoded
   Compose files on Windows
 
+- Fixed an issue with handling of the double-wildcard (`**`) pattern in `.dockerignore` files when using `docker-compose build`
+
+- Fixed a bug that caused auth values in legacy `.dockercfg` files to be ignored
+- `docker-compose build` will no longer attempt to create image names starting with an invalid character
+
 1.21.2 (2018-05-03)
 -------------------
 
diff --git a/compose/__init__.py b/compose/__init__.py
index eb7195176..a76ca8177 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.22.0-rc1'
+__version__ = '1.22.0-rc2'
diff --git a/script/release/release.py b/script/release/release.py
index 476adc4c3..d0545a7e6 100755
--- a/script/release/release.py
+++ b/script/release/release.py
@@ -58,11 +58,8 @@ def create_bump_commit(repository, release_branch, bintray_user, bintray_org):
     repository.push_branch_to_remote(release_branch)
 
     bintray_api = BintrayAPI(os.environ['BINTRAY_TOKEN'], bintray_user)
-    if not bintray_api.repository_exists(bintray_org, release_branch.name):
-        print('Creating data repository {} on bintray'.format(release_branch.name))
-        bintray_api.create_repository(bintray_org, release_branch.name, 'generic')
-    else:
-        print('Bintray repository {} already exists. Skipping'.format(release_branch.name))
+    print('Creating data repository {} on bintray'.format(release_branch.name))
+    bintray_api.create_repository(bintray_org, release_branch.name, 'generic')
 
 
 def monitor_pr_status(pr_data):
diff --git a/script/release/release.sh b/script/release/release.sh
index 201182657..eddc315b7 100755
--- a/script/release/release.sh
+++ b/script/release/release.sh
@@ -17,6 +17,7 @@ fi
 
 docker run -e GITHUB_TOKEN=$GITHUB_TOKEN -e BINTRAY_TOKEN=$BINTRAY_TOKEN -e SSH_AUTH_SOCK=$SSH_AUTH_SOCK -it \
     --mount type=bind,source=$(pwd),target=/src \
+    --mount type=bind,source=$(pwd)/.git,target=/src/.git \
     --mount type=bind,source=$HOME/.docker,target=/root/.docker \
     --mount type=bind,source=$HOME/.gitconfig,target=/root/.gitconfig \
     --mount type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock \
diff --git a/script/release/release/bintray.py b/script/release/release/bintray.py
index d9986875d..d99d372c6 100644
--- a/script/release/release/bintray.py
+++ b/script/release/release/bintray.py
@@ -25,19 +25,7 @@ class BintrayAPI(requests.Session):
             'desc': 'Automated release for {}: {}'.format(NAME, repo_name),
             'labels': ['docker-compose', 'docker', 'release-bot'],
         }
-        result = self.post_json(url, data)
-        result.raise_for_status()
-        return result
-
-    def repository_exists(self, subject, repo_name):
-        url = '{base}/repos/{subject}/{repo_name}'.format(
-            base=self.base_url, subject=subject, repo_name=repo_name,
-        )
-        result = self.get(url)
-        if result.status_code == 404:
-            return False
-        result.raise_for_status()
-        return True
+        return self.post_json(url, data)
 
     def delete_repository(self, subject, repo_name):
         url = '{base}/repos/{subject}/{repo_name}'.format(
diff --git a/script/run/run.sh b/script/run/run.sh
index 86679bbec..7f4acb765 100755
--- a/script/run/run.sh
+++ b/script/run/run.sh
@@ -15,7 +15,7 @@
 
 set -e
 
-VERSION="1.22.0-rc1"
+VERSION="1.22.0-rc2"
 IMAGE="docker/compose:$VERSION"