parent
195684d79c
commit
c33ae0e896
2 changed files with 2 additions and 2 deletions
|
@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND noninteractive
|
||||||
ENV HOME /root
|
ENV HOME /root
|
||||||
|
|
||||||
# Install the dependencies.
|
# Install the dependencies.
|
||||||
RUN apt-get update # 23OCT2015
|
RUN apt-get update # 26OCT2015
|
||||||
|
|
||||||
# New ubuntu packages should be added as their own apt-get install lines below the existing install commands
|
# New ubuntu packages should be added as their own apt-get install lines below the existing install commands
|
||||||
RUN apt-get install -y git python-virtualenv python-dev libjpeg8 libjpeg62 libjpeg62-dev libevent-2.0.5 libevent-dev gdebi-core g++ libmagic1 phantomjs nodejs npm libldap-2.4-2 libldap2-dev libsasl2-modules libsasl2-dev libpq5 libpq-dev libfreetype6-dev libffi-dev libgpgme11 libgpgme11-dev
|
RUN apt-get install -y git python-virtualenv python-dev libjpeg8 libjpeg62 libjpeg62-dev libevent-2.0.5 libevent-dev gdebi-core g++ libmagic1 phantomjs nodejs npm libldap-2.4-2 libldap2-dev libsasl2-modules libsasl2-dev libpq5 libpq-dev libfreetype6-dev libffi-dev libgpgme11 libgpgme11-dev
|
||||||
|
|
|
@ -267,7 +267,7 @@ class BitbucketBuildTrigger(BuildTriggerHandler):
|
||||||
trigger_uuid = self.trigger.uuid
|
trigger_uuid = self.trigger.uuid
|
||||||
callback_url = '%s/oauth1/bitbucket/callback/trigger/%s' % (get_app_url(), trigger_uuid)
|
callback_url = '%s/oauth1/bitbucket/callback/trigger/%s' % (get_app_url(), trigger_uuid)
|
||||||
|
|
||||||
return BitBucket(key, secret, callback_url, timeout=5)
|
return BitBucket(key, secret, callback_url, timeout=15)
|
||||||
|
|
||||||
def _get_authorized_client(self):
|
def _get_authorized_client(self):
|
||||||
""" Returns an authorized API client. """
|
""" Returns an authorized API client. """
|
||||||
|
|
Reference in a new issue