fakesmtp image

CDLUC3 · Aug 22, 2024 · 9616243 · 9616243
1 parent 70da109
commit 9616243
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 22 deletions.
diff --git a/bin/fresh_build.sh b/bin/fresh_build.sh
@@ -291,10 +291,6 @@ 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
-  if [[ -f fakesmtp ]]
-  then
-    build_it_image fakesmtp/docker-compose.yml ${ECR_REGISTRY}/fakesmtp:dev
-  fi
 }
 
 check_maven_profile() {

diff --git a/bin/it_build.sh b/bin/it_build.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 docker-compose \
-  -f mrt-inttest-services/fakesmtp/docker-compose.yml \
   -f mrt-inttest-services/merritt-maven/docker-compose.yml \
   -f mrt-inttest-services/merritt-tomcat/docker-compose.yml \
   -f mrt-inttest-services/mock-merritt-it/docker-compose.yml \

diff --git a/buildspec.yml b/buildspec.yml
@@ -64,7 +64,3 @@ phases:
       docker build --push --quiet \
         -t ${ECR_REGISTRY}/callback \
         mrt-services/callback
-    - |
-      docker build --push --quiet \
-        -t ${ECR_REGISTRY}/fakesmtp:dev \
-        --push mrt-inttest-services/fakesmtp  || echo "dockerhub rate limiting may occur"
diff --git a/mrt-integ-tests b/mrt-integ-tests
diff --git a/mrt-inttest-services/fakesmtp/Dockerfile b/mrt-inttest-services/fakesmtp/Dockerfile
diff --git a/mrt-inttest-services/fakesmtp/docker-compose.yml b/mrt-inttest-services/fakesmtp/docker-compose.yml
diff --git a/mrt-services/docker-compose.yml b/mrt-services/docker-compose.yml
@@ -176,7 +176,7 @@ services:
     tty: true
   smtp:
     container_name: smtp 
-    image: ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com/fakesmtp:dev
+    image: registry-1.docker.io/ghusta/fakesmtp
     networks:
       merrittnet:
     restart: unless-stopped

diff --git a/mrt-services/ingest/mrt-ingest b/mrt-services/ingest/mrt-ingest
diff --git a/mrt-services/mrt-admin-lambda b/mrt-services/mrt-admin-lambda