diff --git a/bin/fresh_build.sh b/bin/fresh_build.sh index 89bd7a5..fcd495e 100755 --- 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 index 87ed29f..0b17909 100755 --- 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 index 27715c8..d52a823 100644 --- 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 index 205a8ba..9276018 160000 --- a/mrt-integ-tests +++ b/mrt-integ-tests @@ -1 +1 @@ -Subproject commit 205a8ba6ee8e733d8798c98ffb99e9dd899a5da4 +Subproject commit 9276018f27e1cac97012b89bf5a59c475531e464 diff --git a/mrt-inttest-services/fakesmtp/Dockerfile b/mrt-inttest-services/fakesmtp/Dockerfile deleted file mode 100644 index 3e1c246..0000000 --- a/mrt-inttest-services/fakesmtp/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 1217681..0000000 --- a/mrt-inttest-services/fakesmtp/docker-compose.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: '3.3' -services: - fakesmtp: - container_name: fakesmtp - image: ${ECR_REGISTRY}/fakesmtp:dev - build: - context: . - dockerfile: Dockerfile diff --git a/mrt-services/docker-compose.yml b/mrt-services/docker-compose.yml index 573af10..0de10e3 100644 --- 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 index 3a3d526..a524017 160000 --- a/mrt-services/ingest/mrt-ingest +++ b/mrt-services/ingest/mrt-ingest @@ -1 +1 @@ -Subproject commit 3a3d52611fe190d8a1d1006cd89899d8ac782e08 +Subproject commit a524017ca2e5d5a36aa976e3f0897b33ea354d40 diff --git a/mrt-services/mrt-admin-lambda b/mrt-services/mrt-admin-lambda index ea649cc..0301d15 160000 --- a/mrt-services/mrt-admin-lambda +++ b/mrt-services/mrt-admin-lambda @@ -1 +1 @@ -Subproject commit ea649cc12d579e65c99b2b9ee6ce598c45501f61 +Subproject commit 0301d152e359cddf8839a7f759cfbb8d1918eacf