From 28ab0b8e46de4220dfc4109dc896a2f86c514da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karol=20S=C3=B3jko?= <karolsojko@protonmail.com>
Date: Thu, 23 Feb 2023 11:44:26 +0100
Subject: [PATCH] chore: fix server ci setup

---
 .github/workflows/common-e2e.yml | 20 --------------------
 docker-compose.ci.yml            | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/common-e2e.yml b/.github/workflows/common-e2e.yml
index 127d3ac06..2bd16139d 100644
--- a/.github/workflows/common-e2e.yml
+++ b/.github/workflows/common-e2e.yml
@@ -26,23 +26,6 @@ jobs:
         image: standardnotes/snjs:${{ inputs.snjs_image_tag }}
         ports:
         - 9001:9001
-      mock-event-publisher:
-        image: standardnotes/mock-event-publisher
-        ports:
-        - 3124:3000
-        env:
-          LOG_LEVEL: debug
-          NODE_ENV: production
-          VERSION: snjs-test
-          SNS_TOPIC_ARN: arn:aws:sns:us-east-1:000000000000:payments-local-topic
-          SNS_ENDPOINT: http://localstack:4566
-          SNS_DISABLE_SSL: true
-          SNS_SECRET_ACCESS_KEY: x
-          SNS_ACCESS_KEY_ID: x
-          SNS_AWS_REGION: us-east-1
-          NEW_RELIC_ENABLED: false
-        options: >-
-          --name "mock-event-publisher"
 
     steps:
     - uses: actions/checkout@v3
@@ -59,8 +42,5 @@ jobs:
     - name: Wait for server to start
       run: docker/is-available.sh http://localhost:3123 $(pwd)/logs
 
-    - name: Connect external containers to self-hosted network
-      run: docker network connect --alias mock-event-publisher standardnotes_self_hosted mock-event-publisher
-
     - name: Run E2E Test Suite
       run: yarn dlx mocha-headless-chrome --timeout 1200000 -f http://localhost:9001/mocha/test.html
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index 985f2e7f0..3496791fe 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -1,4 +1,22 @@
 services:
+  mock-event-publisher:
+    image: standardnotes/mock-event-publisher
+    ports:
+    - 3124:3000
+    environment:
+      LOG_LEVEL: debug
+      NODE_ENV: production
+      VERSION: snjs-test
+      SNS_TOPIC_ARN: arn:aws:sns:us-east-1:000000000000:payments-local-topic
+      SNS_ENDPOINT: http://localstack:4566
+      SNS_DISABLE_SSL: true
+      SNS_SECRET_ACCESS_KEY: x
+      SNS_ACCESS_KEY_ID: x
+      SNS_AWS_REGION: us-east-1
+      NEW_RELIC_ENABLED: false
+    networks:
+      - standardnotes_self_hosted
+
   server:
     build: .
     env_file: .github/ci.env