diff --git a/.docker/nginx/nginx.conf b/.docker/nginx/nginx.conf index 174efc10..27b284da 100644 --- a/.docker/nginx/nginx.conf +++ b/.docker/nginx/nginx.conf @@ -25,6 +25,17 @@ http { root /app/public; charset utf-8; index index.php; + location /app/adremakey { + proxy_pass http://socketi:6001; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; + proxy_redirect off; + proxy_read_timeout 60; + proxy_connect_timeout 60; + } location / { try_files $uri $uri/ /index.php?$query_string; } diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 4ae89111..6da50cb5 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -2,6 +2,7 @@ version: '3' services: webservice: image: zoomyboy/adrema-webservice:latest + restart: always depends_on: - php ports: @@ -11,6 +12,7 @@ services: php: image: zoomyboy/adrema-app:latest + restart: always depends_on: - db command: /bin/entrypoint app @@ -30,6 +32,7 @@ services: horizon: image: zoomyboy/adrema-app:latest + restart: always depends_on: - db - php @@ -50,6 +53,7 @@ services: schedule: image: zoomyboy/adrema-app:latest + restart: always depends_on: - db - php @@ -70,6 +74,7 @@ services: db: image: mariadb:10.6.5 + restart: always env_file: - .app.env environment: @@ -79,6 +84,14 @@ services: volumes: - ./data/db:/var/lib/mysql + socketi: + image: quay.io/soketi/soketi:89604f268623cf799573178a7ba56b7491416bde-16-debian + restart: always + environment: + SOKETI_DEFAULT_APP_ID: adremaid + SOKETI_DEFAULT_APP_KEY: adremakey + SOKETI_DEFAULT_APP_SECRET: adremasecret + redis: image: redis:alpine3.18 - container_name: redis + restart: always diff --git a/docker-compose.yml b/docker-compose.yml index 8ad12307..6d6fa902 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -89,8 +89,6 @@ services: socketi: image: quay.io/soketi/soketi:89604f268623cf799573178a7ba56b7491416bde-16-debian - ports: - - '6001:6001' environment: SOKETI_DEFAULT_APP_ID: adremaid SOKETI_DEFAULT_APP_KEY: adremakey diff --git a/resources/js/lib/echo.js b/resources/js/lib/echo.js index 8e76fd62..c3f09791 100644 --- a/resources/js/lib/echo.js +++ b/resources/js/lib/echo.js @@ -6,7 +6,8 @@ export default new Echo({ broadcaster: 'pusher', key: 'adremakey', wsHost: window.location.hostname, - wsPort: 6001, + wsPort: 80, + wssPort: 443, forceTLS: false, disableStats: true, cluster: 'adrema',