Cleanup docker builds in cdk

Signed-off-by: Andre Kurait <akurait@amazon.com>
opensearch-project · Oct 11, 2024 · 4777117 · 4777117
1 parent e304aa1
commit 4777117
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 22 deletions.
diff --git a/deployment/cdk/opensearch-service-migration/lib/service-stacks/capture-proxy-es-stack.ts b/deployment/cdk/opensearch-service-migration/lib/service-stacks/capture-proxy-es-stack.ts
@@ -81,7 +81,7 @@ export class CaptureProxyESStack extends MigrationServiceCore {
 
         this.createService({
             serviceName: "capture-proxy-es",
-            dockerDirectoryPath: join(__dirname, "../../../../../", "TrafficCapture/dockerSolution/build/docker/trafficCaptureProxyServer"),
+            dockerImageRegistryName: "migrations/capture_proxy_es:latest",
             dockerImageCommand: ['/bin/sh', '-c', command.concat(" & wait -n 1")],
             securityGroups: securityGroups,
             taskRolePolicies: servicePolicies,

diff --git a/deployment/cdk/opensearch-service-migration/lib/service-stacks/elasticsearch-stack.ts b/deployment/cdk/opensearch-service-migration/lib/service-stacks/elasticsearch-stack.ts
@@ -39,7 +39,7 @@ export class ElasticsearchStack extends MigrationServiceCore {
 
         this.createService({
             serviceName: "elasticsearch",
-            dockerDirectoryPath: join(__dirname, "../../../../../", "TrafficCapture/dockerSolution/src/main/docker/elasticsearchWithSearchGuard"),
+            dockerImageRegistryName: "migrations/elasticsearch_searchguard:latest",
             securityGroups: securityGroups,
             portMappings: [servicePort],
             cpuArchitecture: props.fargateCpuArch,

diff --git a/deployment/cdk/opensearch-service-migration/lib/service-stacks/migration-service-core.ts b/deployment/cdk/opensearch-service-migration/lib/service-stacks/migration-service-core.ts
@@ -30,8 +30,7 @@ export interface MigrationServiceCoreProps extends StackPropsExt {
     readonly securityGroups: ISecurityGroup[],
     readonly cpuArchitecture: CpuArchitecture,
     readonly dockerFilePath?: string,
-    readonly dockerDirectoryPath?: string,
-    readonly dockerImageRegistryName?: string,
+    readonly dockerImageRegistryName: string,
     readonly dockerImageCommand?: string[],
     readonly dockerBuildArgs?: {
         [key: string]: string
@@ -59,10 +58,6 @@ export class MigrationServiceCore extends Stack {
     serviceTaskRole: Role;
 
     createService(props: MigrationServiceCoreProps) {
-        if ((!props.dockerDirectoryPath && !props.dockerImageRegistryName) || (props.dockerDirectoryPath && props.dockerImageRegistryName)) {
-            throw new Error(`Exactly one option [dockerDirectoryPath, dockerImageRegistryName] is required to create the "${props.serviceName}" service`)
-        }
-
         const ecsCluster = Cluster.fromClusterAttributes(this, 'ecsCluster', {
             clusterName: `migration-${props.stage}-ecs-cluster`,
             vpc: props.vpc
@@ -86,19 +81,7 @@ export class MigrationServiceCore extends Stack {
             props.volumes.forEach(vol => serviceTaskDef.addVolume(vol))
         }
 
-        let serviceImage
-        if (props.dockerDirectoryPath) {
-            serviceImage = ContainerImage.fromDockerImageAsset(new DockerImageAsset(this, "ServiceImage", {
-                directory: props.dockerDirectoryPath,
-                buildArgs: props.dockerBuildArgs,
-                // File path relative to above directory path
-                file: props.dockerFilePath
-            }))
-        }
-        else {
-            // @ts-ignore
-            serviceImage = ContainerImage.fromRegistry(props.dockerImageRegistryName)
-        }
+        let serviceImage = ContainerImage.fromRegistry(props.dockerImageRegistryName)
 
         const serviceLogGroup = new LogGroup(this, 'ServiceLogGroup',  {
             retention: RetentionDays.ONE_MONTH,

diff --git a/...oyment/cdk/opensearch-service-migration/lib/service-stacks/reindex-from-snapshot-stack.ts b/...oyment/cdk/opensearch-service-migration/lib/service-stacks/reindex-from-snapshot-stack.ts
@@ -167,7 +167,7 @@ export class ReindexFromSnapshotStack extends MigrationServiceCore {
         this.createService({
             serviceName: 'reindex-from-snapshot',
             taskInstanceCount: 0,
-            dockerDirectoryPath: join(__dirname, "../../../../../", "DocumentsFromSnapshotMigration/docker"),
+            dockerImageRegistryName: "migrations/reindex-from-snapshot:latest",
             dockerImageCommand: ['/bin/sh', '-c', "/rfs-app/entrypoint.sh"],
             securityGroups: securityGroups,
             volumes: volumes,