diff options
| author | Joffrey F <joffrey@docker.com> | 2018-06-21 11:40:32 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2018-06-21 11:40:32 -0700 |
| commit | 709ba0975da55e1367a1bb29f5316db98ea7e0c6 (patch) | |
| tree | 5a1ff252ddbb7e5e16464cab4243df107505dc59 /script | |
| parent | 429b1c8b3c591c39df6b208da5ba52f0e6a53e66 (diff) | |
Release script fixes
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'script')
| -rwxr-xr-x | script/release/release.sh | 4 | ||||
| -rw-r--r-- | script/release/release/bintray.py | 4 | ||||
| -rw-r--r-- | script/release/release/images.py | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/script/release/release.sh b/script/release/release.sh index affbce37..20118265 100755 --- a/script/release/release.sh +++ b/script/release/release.sh @@ -15,12 +15,12 @@ if test -z $BINTRAY_TOKEN; then exit 1 fi -docker run -e GITHUB_TOKEN=$GITHUB_TOKEN -e BINTRAY_TOKEN=$BINTRAY_TOKEN -it \ +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 \ --mount type=bind,source=$HOME/.ssh,target=/root/.ssh \ + --mount type=bind,source=/tmp,target=/tmp \ -v $HOME/.pypirc:/root/.pypirc \ compose/release-tool $* diff --git a/script/release/release/bintray.py b/script/release/release/bintray.py index d99d372c..554611a4 100644 --- a/script/release/release/bintray.py +++ b/script/release/release/bintray.py @@ -25,7 +25,9 @@ class BintrayAPI(requests.Session): 'desc': 'Automated release for {}: {}'.format(NAME, repo_name), 'labels': ['docker-compose', 'docker', 'release-bot'], } - return self.post_json(url, data) + result = self.post_json(url, data) + result.raise_for_status() + return result def delete_repository(self, subject, repo_name): url = '{base}/repos/{subject}/{repo_name}'.format( diff --git a/script/release/release/images.py b/script/release/release/images.py index d238d4d7..24672f2b 100644 --- a/script/release/release/images.py +++ b/script/release/release/images.py @@ -48,7 +48,7 @@ class ImageManager(object): container = docker_client.create_container( 'docker-compose-tests:tmp', entrypoint='tox' ) - docker_client.commit(container, 'docker/compose-tests:latest') + docker_client.commit(container, 'docker/compose-tests', 'latest') docker_client.tag('docker/compose-tests:latest', 'docker/compose-tests:{}'.format(self.version)) docker_client.remove_container(container, force=True) docker_client.remove_image('docker-compose-tests:tmp', force=True) |