Skip to content

Move registry url to the end of docker command #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
djyou merged 1 commit into from
Dec 14, 2016
Merged

Move registry url to the end of docker command #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/command_modules/azure-cli-acr/azure/cli/command_modules/acr/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ def get_access_key_by_storage_account_name(storage_account_name, resource_group_

return client.list_keys(resource_group_name, storage_account_name).keys[0].value #pylint: disable=no-member

def docker_login_to_registry(registry_url):
def docker_login_to_registry(login_server):
'''Logs in the Docker client to a registry.
:param str registry: the registry to log in to
:param str login_server: The registry login server URL to log in to
'''
profile = Profile()
_, _, tenant = profile.get_login_credentials()
refresh = profile.get_refresh_credentials()
base_endpoint = 'https://' + registry_url.rstrip('/')
base_endpoint = 'https://' + login_server.rstrip('/')

challenge = requests.get(base_endpoint + '/v2/')
if challenge.status_code not in [401] or 'WWW-Authenticate' not in challenge.headers:
Expand Down Expand Up @@ -142,8 +142,10 @@ def docker_login_to_registry(registry_url):

refresh_token = loads(response.content.decode("utf-8"))["refresh_token"]

call(["docker", "login", registry_url, "--username",
"00000000-0000-0000-0000-000000000000", "--password", refresh_token])
call(["docker", "login",
"--username", "00000000-0000-0000-0000-000000000000",
"--password", refresh_token,
login_server])

def arm_deploy_template(resource_group_name,
registry_name,
Expand Down