vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use the real registry endpoint in the login command.

Browse source
This commit is contained in:
jakedt 2014-04-01 19:00:11 -04:00
parent 3525e383df
commit ca1970a2f4
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/model/legacy.py
View file

@ -1471,7 +1471,7 @@ def get_pull_credentials(trigger):
return { return {
'username': trigger.pull_user.username, 'username': trigger.pull_user.username,
'password': login_info.service_ident, 'password': login_info.service_ident,
'registry': app.config['URL_HOST'], 'registry': '%s://%s/v1/' % (app.config['URL_SCHEME'], app.config['URL_HOST']),
} }
def create_webhook(repo, params_obj): def create_webhook(repo, params_obj):

3
workers/dockerfilebuild.py
View file

@ -143,7 +143,8 @@ class DockerfileBuildContext(object):
def build(self): def build(self):
# Login with the specified credentials (if any). # Login with the specified credentials (if any).
if self._pull_credentials: if self._pull_credentials:
logger.debug('Logging in with pull credentials.') logger.debug('Logging in with pull credentials: %s@%s',
self._pull_credentials['username'], self._pull_credentials['registry'])
self._build_cl.login(self._pull_credentials['username'], self._pull_credentials['password'], self._build_cl.login(self._pull_credentials['username'], self._pull_credentials['password'],
registry=self._pull_credentials['registry'], reauth=True) registry=self._pull_credentials['registry'], reauth=True)