Merge branch '27-refactor-asset-image' into 'develop'

define image in cdk_app_root and reuse in services

Closes #27

See merge request verbose-equals-true/django-postgres-vue-gitlab-ecs!71

Author: briancaffey

awscdk/awscdk/backend.py

@@ -14,6 +14,7 @@ def __init__(
         self,
         scope: core.Construct,
         id: str,
+        image: ecs.AssetImage,
         load_balancer,
         cluster: ecs.ICluster,
         environment_variables: core.Construct,
@@ -28,11 +29,7 @@ def __init__(
 
         self.backend_task.add_container(
             "DjangoBackend",
-            image=ecs.AssetImage(
-                "../backend",
-                file="scripts/prod/Dockerfile",
-                target="production",
-            ),
+            image=image,
             logging=ecs.LogDrivers.aws_logs(stream_prefix="Backend"),
             environment=environment_variables.regular_variables,
             secrets=environment_variables.secret_variables,

awscdk/awscdk/backend_tasks.py

@@ -11,6 +11,7 @@ def __init__(
         self,
         scope: core.Construct,
         id: str,
+        image: ecs.AssetImage,
         cluster: ecs.ICluster,
         environment_variables: core.Construct,
         full_app_name: str,
@@ -20,10 +21,6 @@ def __init__(
             scope, id, **kwargs,
         )
 
-        image = ecs.AssetImage(
-            "../backend", file="scripts/prod/Dockerfile", target="production",
-        )
-
         self.migrate_task = ecs.FargateTaskDefinition(
             self, "MigrateTask", family=f"{full_app_name}-migrate"
         )

awscdk/awscdk/cdk_app_root.py

@@ -1,4 +1,4 @@
-from aws_cdk import core
+from aws_cdk import core, aws_ecs as ecs
 
 from cert import SiteCertificate
 from hosted_zone import HostedZone
@@ -78,6 +78,12 @@ def __init__(
         #     self, "ElastiCacheRedis", vpc=self.vpc.vpc
         # )
 
+        # image used for all django containers
+        # gunicorn, daphne, celery workers, celery beat
+        self.image = ecs.AssetImage(
+            "../backend", file="scripts/prod/Dockerfile", target="production",
+        )
+
         self.variables = Variables(
             self,
             "Variables",
@@ -91,6 +97,7 @@ def __init__(
         self.backend = Backend(
             self,
             "Backend",
+            image=self.image,
             load_balancer=self.alb,
             cluster=self.ecs.cluster,
             environment_variables=self.variables,
@@ -101,6 +108,7 @@ def __init__(
         self.backend_tasks = BackendTasks(
             self,
             "BackendTasks",
+            image=self.image,
             cluster=self.ecs.cluster,
             environment_variables=self.variables,
             full_app_name=full_app_name,