Feat: Service deployment with custom OCI image URI flag

cloudlift/__init__.py

@@ -113,11 +113,13 @@ def edit_config(name, environment):
 @_require_name
 @click.option('--version', default=None,
               help='local image version tag')
+@click.option('--image_uri', default=None,
+              help='image uri')
 @click.option("--build-arg", type=(str, str), multiple=True, help="These args are passed to docker build command "
                                                                   "as --build-args. Supports multiple.\
                                                                    Please leave space between name and value" )
-def deploy_service(name, environment, version, build_arg):
-    ServiceUpdater(name, environment, None, version, dict(build_arg)).run()
+def deploy_service(name, environment, version, image_uri, build_arg):
+    ServiceUpdater(name, environment, None, version, image_uri, dict(build_arg)).run()
 
 
 @cli.command()

cloudlift/deployment/service_updater.py

@@ -23,7 +23,7 @@
 
 
 class ServiceUpdater(object):
-    def __init__(self, name, environment, env_sample_file, version=None,
+    def __init__(self, name, environment, env_sample_file, version=None, image_uri=None,
                  build_args=None, working_dir='.'):
         self.name = name
         self.environment = environment
@@ -32,37 +32,47 @@ def __init__(self, name, environment, env_sample_file, version=None,
         else:
             self.env_sample_file = './env.sample'
         self.version = version
+        self.image_uri = image_uri
         self.ecr_client = boto3.session.Session(region_name=self.region).client('ecr')
         self.cluster_name = get_cluster_name(environment)
         self.working_dir = working_dir
         self.build_args = build_args
+
+    def _get_image(self):
+        if self.image_uri:
+           version = None
+           return version, self.image_uri 
 
-    def run(self):
-        log_warning("Deploying to {self.region}".format(**locals()))
-        self.init_stack_info()
-        if not os.path.exists(self.env_sample_file):
-            raise UnrecoverableException('env.sample not found. Exiting.')
         ecr_client = EcrClient(self.name, self.region, self.build_args)
         ecr_client.set_version(self.version)
         log_intent("name: " + self.name + " | environment: " +
                    self.environment + " | version: " + str(ecr_client.version))
         log_bold("Checking image in ECR")
         ecr_client.build_and_upload_image()
         log_bold("Initiating deployment\n")
+        image_url = ecr_client.ecr_image_uri
+        image_url += (':' + ecr_client.version)
+        return ecr_client.version, image_url
+
+    def run(self):
+        log_warning("Deploying to {self.region}".format(**locals()))
+        self.init_stack_info()
+        if not os.path.exists(self.env_sample_file):
+            raise UnrecoverableException('env.sample not found. Exiting.')
+
+        image_version, image_url = self._get_image()
 
         jobs = []
         for index, service_name in enumerate(self.ecs_service_names):
             log_bold("Starting to deploy " + service_name)
             color = DEPLOYMENT_COLORS[index % 3]
-            image_url = ecr_client.ecr_image_uri
-            image_url += (':' + ecr_client.version)
             process = multiprocessing.Process(
                 target=deployer.deploy_new_version,
                 args=(
                     self.region,
                     self.cluster_name,
                     service_name,
-                    ecr_client.version,
+                    image_version,
                     self.name,
                     self.env_sample_file,
                     self.environment,

cloudlift/deployment/task_definition_creator.py

@@ -21,12 +21,13 @@ def _complete_image_url(ecr_client: EcrClient):
 
 
 class TaskDefinitionCreator:
-    def __init__(self, name, environment, version, build_args, region='ap-south-1'):
+    def __init__(self, name, environment, version, image_uri, build_args, region='ap-south-1'):
         self.name = name
         self.environment = environment
         self.build_args = build_args
         self.region = region
         self.version = version
+        self.image_uri = image_uri
         self.client = get_client_for('iam', self.environment)
         self.resource = get_resource_for('iam', self.environment)
         self.env_sample_file = './env.sample'