From 594a5ce06eb5f924156e1a3561777e146bc125cf Mon Sep 17 00:00:00 2001
From: Michal Kleszcz <mkleszcz@apptension.com>
Date: Mon, 12 Feb 2024 14:02:00 +0100
Subject: [PATCH 1/2] fix: #458 Fix sending emails on local environment and
 replace mailcatcher instance built from Dockerfile with image from Docker Hub

---
 docker-compose.local.yml                    |  4 ++--
 packages/internal/local-ws-server/yarn.lock |  8 ++++----
 packages/internal/mailcatcher/Dockerfile    | 11 -----------
 3 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 packages/internal/mailcatcher/Dockerfile

diff --git a/docker-compose.local.yml b/docker-compose.local.yml
index 01b6264a5..96dc7907f 100644
--- a/docker-compose.local.yml
+++ b/docker-compose.local.yml
@@ -41,6 +41,7 @@ services:
       - ./packages/workers/.env
     environment:
       - AWS_ENDPOINT_URL=http://localstack:4566
+      - ENV_STAGE=${ENV_STAGE:-}
 
     depends_on:
       - db
@@ -72,8 +73,7 @@ services:
       - db
 
   mailcatcher:
-    platform: linux/amd64
-    build: ./packages/internal/mailcatcher
+    image: sj26/mailcatcher
     ports:
       - "1080:1080"
       - "1025:1025"
diff --git a/packages/internal/local-ws-server/yarn.lock b/packages/internal/local-ws-server/yarn.lock
index 8bab01224..405d6b510 100644
--- a/packages/internal/local-ws-server/yarn.lock
+++ b/packages/internal/local-ws-server/yarn.lock
@@ -887,10 +887,10 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-ws@^8.14.1:
-  version "8.14.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.2.tgz#6c249a806eb2db7a20d26d51e7709eab7b2e6c7f"
-  integrity sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==
+ws@^8.14.2:
+  version "8.16.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4"
+  integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==
 
 yallist@^4.0.0:
   version "4.0.0"
diff --git a/packages/internal/mailcatcher/Dockerfile b/packages/internal/mailcatcher/Dockerfile
deleted file mode 100644
index ffbb099dd..000000000
--- a/packages/internal/mailcatcher/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM dockage/alpine:3.15.4
-
-ENV MAILCATCHER_VERSION=0.8.2
-
-RUN apk --no-cache --update add build-base ruby ruby-dev ruby-json ruby-etc sqlite-dev \
-    && gem install mailcatcher:${MAILCATCHER_VERSION} --no-document \
-    && apk del --rdepends --purge build-base
-
-EXPOSE 1025 1080
-
-ENTRYPOINT ["mailcatcher", "--smtp-ip=0.0.0.0", "--http-ip=0.0.0.0", "--foreground"]

From e9e24d2f90f4a0bb81116c225e3002ce133c1ab0 Mon Sep 17 00:00:00 2001
From: Michal Kleszcz <mkleszcz@apptension.com>
Date: Mon, 12 Feb 2024 14:05:49 +0100
Subject: [PATCH 2/2] fix: #458 Fix sending emails on local environment and
 replace mailcatcher instance built from Dockerfile with image from Docker Hub

---
 docker-compose.local.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.local.yml b/docker-compose.local.yml
index 96dc7907f..944997340 100644
--- a/docker-compose.local.yml
+++ b/docker-compose.local.yml
@@ -73,7 +73,7 @@ services:
       - db
 
   mailcatcher:
-    image: sj26/mailcatcher
+    image: sj26/mailcatcher:v0.9.0
     ports:
       - "1080:1080"
       - "1025:1025"