Ver código fonte

Release script fixes

Signed-off-by: Joffrey F <[email protected]>
Joffrey F 7 anos atrás
pai
commit
709ba0975d

+ 2 - 2
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 $*

+ 3 - 1
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(

+ 1 - 1
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)