Merge pull request #101 from clearbit/allow-private-base-image

feat(registry): Allow FROM to refer to the off-cluster docker registry.

Author: Matthew Fisher

rootfs/deploy.py

@@ -6,7 +6,7 @@
 import subprocess
 
 DEBUG = os.environ.get('DEIS_DEBUG') in ('true', '1')
-regsitryLocation = os.getenv('DEIS_REGISTRY_LOCATION', 'on-cluster')
+registryLocation = os.getenv('DEIS_REGISTRY_LOCATION', 'on-cluster')
 
 
 def log_output(stream, decode):
@@ -39,7 +39,7 @@ def log(msg):
 def get_registry_name():
     hostname = os.getenv('DEIS_REGISTRY_HOSTNAME', "")
     hostname = hostname.replace("https://", "").replace("http://", "")
-    if regsitryLocation == "off-cluster":
+    if registryLocation == "off-cluster":
         organization = os.getenv('DEIS_REGISTRY_ORGANIZATION')
         regName = ""
         # empty hostname means dockerhub and hence no need to prefix the image
@@ -50,27 +50,14 @@ def get_registry_name():
         if organization != "":
             regName = regName + organization
         return regName
-    elif regsitryLocation == "ecr":
+    elif registryLocation == "ecr":
         return hostname
-    elif regsitryLocation == "gcr":
+    elif registryLocation == "gcr":
         return hostname + "/" + os.getenv('DEIS_REGISTRY_GCS_PROJ_ID')
     else:
         return os.getenv("DEIS_REGISTRY_SERVICE_HOST") + ":" + os.getenv("DEIS_REGISTRY_SERVICE_PORT")  # noqa: E501
 
 
-def docker_push(client, repo, tag):
-    if regsitryLocation != "on-cluster":
-        hostname = os.getenv('DEIS_REGISTRY_HOSTNAME', 'https://index.docker.io/v1/')
-        auth_config = {
-            'username': os.getenv('DEIS_REGISTRY_USERNAME'),
-            'password': os.getenv('DEIS_REGISTRY_PASSWORD'),
-            'serveraddress': hostname,
-        }
-        return client.push(repo, tag=tag, stream=True, auth_config=auth_config)
-    else:
-        return client.push(repo, tag=tag, stream=True)
-
-
 def download_file(tar_path):
     os.putenv('BUCKET_FILE', "/var/run/secrets/deis/objectstore/creds/builder-bucket")
     if os.getenv('BUILDER_STORAGE') == "minio":
@@ -104,11 +91,16 @@ def download_file(tar_path):
     tar.extractall("/app/")
 log("extracting tar file complete")
 client = docker.Client(version='auto')
+if registryLocation != "on-cluster":
+    registry = os.getenv('DEIS_REGISTRY_HOSTNAME', 'https://index.docker.io/v1/')
+    username = os.getenv('DEIS_REGISTRY_USERNAME')
+    password = os.getenv('DEIS_REGISTRY_PASSWORD')
+    client.login(username=username, password=password, registry=registry)
 registry = get_registry_name()
 imageName, imageTag = os.getenv('IMG_NAME').split(":", 1)
 repo = registry + "/" + os.getenv('IMG_NAME')
 stream = client.build(tag=repo, stream=True, decode=True, rm=True, path='/app')
 log_output(stream, True)
 print("Pushing to registry")
-stream = docker_push(client, registry+'/'+imageName, imageTag)
+stream = client.push(registry+'/'+imageName, tag=imageTag, stream=True)
 log_output(stream, False)