chore: Update Dockerfile and workflow for Coolify Realtime (v4)

coollabsio · Sep 13, 2024 · 7cac243 · 7cac243
1 parent 0cfd8ed
commit 7cac243
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -110,13 +110,14 @@ services:
       retries: 10
       timeout: 2s
   soketi:
-    image: 'ghcr.io/coollabsio/coolify-realtime:latest'
+    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.0'
     ports:
       - "${SOKETI_PORT:-6001}:6001"
       - "6002:6002"
     volumes:
-      - ./storage:/var/www/html/storage
+      - /data/coolify/ssh:/var/www/html/storage/app/ssh
     environment:
+      APP_NAME: "${APP_NAME:-Coolify}"
       SOKETI_DEBUG: "${SOKETI_DEBUG:-false}"
       SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID}"
       SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}"

diff --git a/docker-compose.windows.yml b/docker-compose.windows.yml
@@ -103,7 +103,7 @@ services:
       retries: 10
       timeout: 2s
   soketi:
-    image: 'ghcr.io/coollabsio/coolify-realtime:latest'
+    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.0'
     pull_policy: always
     container_name: coolify-realtime
     restart: always
@@ -113,13 +113,9 @@ services:
       - "${SOKETI_PORT:-6001}:6001"
       - "6002:6002"
     volumes:
-      - ./docker/soketi-entrypoint/soketi-entrypoint.sh:/soketi-entrypoint.sh
-      - ./package.json:/terminal/package.json
-      - ./package-lock.json:/terminal/package-lock.json
-      - ./terminal-server.js:/terminal/terminal-server.js
-      - ./storage:/var/www/html/storage
-    entrypoint: ["/bin/sh", "/soketi-entrypoint.sh"]
+      - ./ssh:/var/www/html/storage/app/ssh
     environment:
+      APP_NAME: "${APP_NAME:-Coolify}"
       SOKETI_DEBUG: "${SOKETI_DEBUG:-false}"
       SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID}"
       SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}"

diff --git a/docker/coolify-realtime/soketi-entrypoint.sh b/docker/coolify-realtime/soketi-entrypoint.sh
@@ -5,7 +5,7 @@ timestamp() {
 }
 
 # Start the terminal server in the background with logging
-node --watch /terminal/terminal-server.js > >(while read line; do echo "$(timestamp) [TERMINAL] $line"; done) 2>&1 &
+node /terminal/terminal-server.js > >(while read line; do echo "$(timestamp) [TERMINAL] $line"; done) 2>&1 &
 TERMINAL_PID=$!
 
 # Start the Soketi process in the background with logging

diff --git a/other/nightly/docker-compose.prod.yml b/other/nightly/docker-compose.prod.yml
@@ -110,7 +110,7 @@ services:
       retries: 10
       timeout: 2s
   soketi:
-    image: 'ghcr.io/coollabsio/coolify-realtime:latest'
+    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.0'
     ports:
       - "${SOKETI_PORT:-6001}:6001"
       - "6002:6002"

diff --git a/other/nightly/docker-compose.windows.yml b/other/nightly/docker-compose.windows.yml
@@ -45,7 +45,7 @@ services:
       - PUSHER_APP_SECRET
       - AUTOUPDATE=true
       - SELF_HOSTED=true
-      - MUX_ENABLED=false
+      - SSH_MUX_ENABLED=false
       - IS_WINDOWS_DOCKER_DESKTOP=true
     ports:
       - "${APP_PORT:-8000}:80"
@@ -103,24 +103,29 @@ services:
       retries: 10
       timeout: 2s
   soketi:
-    image: 'quay.io/soketi/soketi:1.6-16-alpine'
+    image: 'ghcr.io/coollabsio/coolify-realtime:1.0.0'
     pull_policy: always
     container_name: coolify-realtime
     restart: always
     env_file:
       - .env
     ports:
       - "${SOKETI_PORT:-6001}:6001"
+      - "6002:6002"
+    volumes:
+      - ./ssh:/var/www/html/storage/app/ssh
     environment:
+      APP_NAME: "${APP_NAME:-Coolify}"
       SOKETI_DEBUG: "${SOKETI_DEBUG:-false}"
       SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID}"
       SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}"
       SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET}"
     healthcheck:
-      test: wget -qO- http://localhost:6001/ready || exit 1
+      test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:6001/ready && wget -qO- http://127.0.0.1:6002/ready || exit 1"]
       interval: 5s
       retries: 10
       timeout: 2s
+
 volumes:
   coolify-db:
     name: coolify-db