Merge pull request #21 from simonklb/issue-20

Add support for login to private registry servers

Author: Charles Butler

charms/docker/docker.py

@@ -61,7 +61,7 @@ def run(self, image, options=[], commands=[], arg=[]):
         except subprocess.CalledProcessError as expect:
             print("Error: ", expect.returncode, expect.output)
 
-    def login(self, user, password, email):
+    def login(self, user, password, email, registry=None):
         '''
         Docker login exposed as a method.
 
@@ -70,6 +70,8 @@ def login(self, user, password, email):
         :param email: - Email address on account (dockerhub)
         '''
         cmd = ['docker', 'login', '-u', user, '-p', password, '-e', email]
+        if registry:
+            cmd.append(registry)
         subprocess.check_call(cmd)
 
     def logs(self, container_id, raise_on_failure=False):

tests/test_docker.py

@@ -51,6 +51,14 @@ def test_login(self, docker):
             spmock.assert_called_with(['docker', 'login', '-u', 'cloudguru',
                                        '-p', 'XXX', '-e', 'obrien@ds9.org'])
 
+    def test_login_registry(self, docker):
+        with patch('subprocess.check_call') as spmock:
+            docker.login('cloudguru', 'XXX', 'obrien@ds9.org',
+                         registry='test:1234')
+            spmock.assert_called_with(['docker', 'login', '-u', 'cloudguru',
+                                       '-p', 'XXX', '-e', 'obrien@ds9.org',
+                                       'test:1234'])
+
     def test_pull(self, docker):
         with patch('subprocess.check_output') as spmock:
             docker.pull('tester/testing')