From 978487f6958f239014e54c23ab34749d4080f9b2 Mon Sep 17 00:00:00 2001
From: Daniel M Brasil <danielmbrasil@protonmail.com>
Date: Fri, 1 Nov 2024 17:00:39 -0300
Subject: [PATCH] fix pusher-fake setup in docker

---
 Dockerfile                | 10 ----------
 docker-compose.yml        | 15 +++++++--------
 pusher-fake-entrypoint.sh |  3 ---
 3 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100755 pusher-fake-entrypoint.sh

diff --git a/Dockerfile b/Dockerfile
index 77ce00c6c..ba2d228e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -81,14 +81,4 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | b
 ENV NODE_PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/lib/node_modules
 ENV PATH ${NVM_DIR}/versions/node/v${NODE_VERSION}/bin:${PATH}
 
-# Set up Pusher Fake
-ENV PUSHER_PORT 8888
-ENV PUSHER_WS_PORT 45449
-
-ADD pusher-fake-entrypoint.sh /tmp/pusher-fake-entrypoint.sh
-
-EXPOSE $PUSHER_WS_PORT $PUSHER_PORT
-
-CMD ["/tmp/pusher-fake-entrypoint.sh"]
-
 WORKDIR /var/app
diff --git a/docker-compose.yml b/docker-compose.yml
index 855b9524a..a09ed2432 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,6 +14,12 @@ services:
       VIRTUAL_HOST: 'cm42-central.localhost'
       VIRTUAL_PORT: 3000
       MEMCACHIER_SERVERS: memcached:11211
+      PUSHER_APP_ID: 1234
+      PUSHER_WS_PORT: 45449
+      PUSHER_PORT: 8888
+      PUSHER_APP_KEY: 123456
+      PUSHER_APP_SECRET: 34214341
+      PUSHER_HOST: pusherfake
     depends_on:
       - postgres
       - redis
@@ -76,14 +82,7 @@ services:
     ports:
       - '8888:8888' # Pusher-Fake web port
       - '45449:45449' # Pusher-Fake socket port
-    volumes:
-      - .:/app
-    environment:
-      PUSHER_APP_ID: 1234
-      PUSHER_WS_PORT: 45449
-      PUSHER_PORT: 8888
-      PUSHER_APP_KEY: 123456
-      PUSHER_APP_SECRET: 34214341
+    command: bundle exec pusher-fake -i 1234 --socket-host 0.0.0.0 --socket-port 45499 --web-host 0.0.0.0 --web-port 8888 -k 123456 -s 34214341
 
 volumes:
   bundle_cache:
diff --git a/pusher-fake-entrypoint.sh b/pusher-fake-entrypoint.sh
deleted file mode 100755
index 61e23d19f..000000000
--- a/pusher-fake-entrypoint.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-pusher-fake -i $PUSHER_APP_ID --socket-host 0.0.0.0 --socket-port $PUSHER_WS_PORT --web-host 0.0.0.0 --web-port $PUSHER_PORT -k $PUSHER_APP_KEY -s $PUSHER_APP_SECRET