From 84b4a50d0742b470a23b38036b46930f44247643 Mon Sep 17 00:00:00 2001 From: Terry Brady Date: Thu, 18 Jul 2024 15:01:22 -0700 Subject: [PATCH] fakesmtp image --- bin/fresh_build.sh | 1 + buildspec.yml | 3 +++ mrt-inttest-services/fakesmtp/Dockerfile | 1 + mrt-inttest-services/fakesmtp/docker-compose.yml | 8 ++++++++ mrt-inttest-services/merritt-maven/docker-compose.yml | 5 +---- mrt-inttest-services/merritt-tomcat/docker-compose.yml | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 mrt-inttest-services/fakesmtp/Dockerfile create mode 100644 mrt-inttest-services/fakesmtp/docker-compose.yml diff --git a/bin/fresh_build.sh b/bin/fresh_build.sh index a9fddf7..654f6ad 100755 --- a/bin/fresh_build.sh +++ b/bin/fresh_build.sh @@ -293,6 +293,7 @@ build_integration_test_images() { build_it_image mrt-minio-it-with-content/docker-compose.yml ${ECR_REGISTRY}/mrt-minio-it-with-content:dev build_it_image merritt-tomcat/docker-compose.yml ${ECR_REGISTRY}/merritt-tomcat:dev build_it_image merritt-maven/docker-compose.yml ${ECR_REGISTRY}/merritt-maven:dev + build_it_image fakesmtp/docker-compose.yml ${ECR_REGISTRY}/fakesmtp:dev } check_maven_profile() { diff --git a/buildspec.yml b/buildspec.yml index e503477..a031c4c 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -18,6 +18,7 @@ phases: - aws ecr create-repository --repository-name mrt-it-database-audit-replic || echo 'ignore if exists...' - aws ecr create-repository --repository-name mrt-minio-it || echo 'ignore if exists...' - aws ecr create-repository --repository-name mrt-minio-it-with-content || echo 'ignore if exists...' + - aws ecr create-repository --repository-name fakesmtp || echo 'ignore if exists...' - aws ecr create-repository --repository-name callback || echo 'ignore if exists...' - aws ecr create-repository --repository-name mrt-opendj || echo 'ignore if exists...' @@ -42,6 +43,8 @@ phases: - docker-compose -f mrt-inttest-services/mrt-minio-it/docker-compose.yml push - docker-compose -f mrt-inttest-services/mrt-minio-it-with-content/docker-compose.yml build - docker-compose -f mrt-inttest-services/mrt-minio-it-with-content/docker-compose.yml push + - docker-compose -f mrt-inttest-services/fakesmtp/docker-compose.yml build + - docker-compose -f mrt-inttest-services/fakesmtp/docker-compose.yml push - docker build --quiet --build-arg ECR_REGISTRY=${ECR_REGISTRY} --no-cache --force-rm -t ${ECR_REGISTRY}/mrt-database mrt-services/mysql - docker push ${ECR_REGISTRY}/mrt-database diff --git a/mrt-inttest-services/fakesmtp/Dockerfile b/mrt-inttest-services/fakesmtp/Dockerfile new file mode 100644 index 0000000..3e1c246 --- /dev/null +++ b/mrt-inttest-services/fakesmtp/Dockerfile @@ -0,0 +1 @@ +FROM docker.io/ghusta/fakesmtp \ No newline at end of file diff --git a/mrt-inttest-services/fakesmtp/docker-compose.yml b/mrt-inttest-services/fakesmtp/docker-compose.yml new file mode 100644 index 0000000..a88878b --- /dev/null +++ b/mrt-inttest-services/fakesmtp/docker-compose.yml @@ -0,0 +1,8 @@ +version: '3.3' +services: + fakesmtp: + container_name: merritt-maven + image: ${ECR_REGISTRY}/fakesmtp:dev + build: + context: . + dockerfile: Dockerfile diff --git a/mrt-inttest-services/merritt-maven/docker-compose.yml b/mrt-inttest-services/merritt-maven/docker-compose.yml index a101eb3..1c87bce 100644 --- a/mrt-inttest-services/merritt-maven/docker-compose.yml +++ b/mrt-inttest-services/merritt-maven/docker-compose.yml @@ -1,6 +1,6 @@ version: '3.3' services: - minio-server: + merritt-maven: container_name: merritt-maven image: ${ECR_REGISTRY}/merritt-maven:dev build: @@ -9,6 +9,3 @@ services: args: ECR_REGISTRY: ${ECR_REGISTRY} JAVA_RELEASE_ARG: ${JAVA_RELEASE:-8} - ports: - - published: 8080 - target: 8080 diff --git a/mrt-inttest-services/merritt-tomcat/docker-compose.yml b/mrt-inttest-services/merritt-tomcat/docker-compose.yml index f614352..34ad345 100644 --- a/mrt-inttest-services/merritt-tomcat/docker-compose.yml +++ b/mrt-inttest-services/merritt-tomcat/docker-compose.yml @@ -1,6 +1,6 @@ version: '3.3' services: - minio-server: + merritt-tomcat: container_name: merritt-tomcat image: ${ECR_REGISTRY}/merritt-tomcat:dev build: