From ca1970a2f496592d500e0a09a8b0801113b63d8e Mon Sep 17 00:00:00 2001 From: jakedt Date: Tue, 1 Apr 2014 19:00:11 -0400 Subject: [PATCH] Use the real registry endpoint in the login command. --- data/model/legacy.py | 2 +- workers/dockerfilebuild.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/model/legacy.py b/data/model/legacy.py index 9ddda72e1..a2cac1d26 100644 --- a/data/model/legacy.py +++ b/data/model/legacy.py @@ -1471,7 +1471,7 @@ def get_pull_credentials(trigger): return { 'username': trigger.pull_user.username, '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): diff --git a/workers/dockerfilebuild.py b/workers/dockerfilebuild.py index ea165060e..6e8be1f4d 100644 --- a/workers/dockerfilebuild.py +++ b/workers/dockerfilebuild.py @@ -143,7 +143,8 @@ class DockerfileBuildContext(object): def build(self): # Login with the specified credentials (if any). 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'], registry=self._pull_credentials['registry'], reauth=True)