diff --git a/resources/js/app.js b/resources/js/app.js index 3370f1857..e61f1a3a4 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -1,26 +1,8 @@ import Alpine from "alpinejs"; -// import Echo from 'laravel-echo'; -// import Pusher from 'pusher-js'; import { createApp } from "vue"; import MagicBar from "./components/MagicBar.vue"; import Toaster from "../../vendor/masmerise/livewire-toaster/resources/js"; -// window.Pusher = Pusher; - -// window.Echo = new Echo({ -// broadcaster: 'pusher', -// cluster: window.location.hostname, -// key: 'coolify', -// wsHost: window.location.hostname, -// wsPort: 6001, -// wssPort: 6001, -// forceTLS: false, -// encrypted: true, -// disableStats: false, -// enableLogging: true, -// enabledTransports: ['ws', 'wss'], -// }); - Alpine.plugin(Toaster); window.Alpine = Alpine; diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index d0a240951..5614a01d1 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -49,7 +49,7 @@ window.Echo = new Echo({ broadcaster: 'pusher', cluster: "{{ env('PUSHER_HOST') }}" || window.location.hostname, - key: 'coolify', + key: "{{ env('PUSHER_APP_KEY') }}" || 'coolify', wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname, wsPort: "{{ env('PUSHER_PORT') }}" || 6001, wssPort: "{{ env('PUSHER_PORT') }}" || 6001, diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh index 35233c141..4be056e89 100644 --- a/scripts/upgrade.sh +++ b/scripts/upgrade.sh @@ -29,7 +29,7 @@ docker network create --attachable coolify 2>/dev/null # docker network create --attachable --driver=overlay coolify-overlay 2>/dev/null if [ -f /data/coolify/source/docker-compose.custom.yml ]; then - echo "Custom docker-compose.yml detected." + echo "docker-compose.custom.yml detected." docker run --pull always -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock --rm ghcr.io/coollabsio/coolify-helper bash -c "LATEST_IMAGE=${1:-} docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml -f /data/coolify/source/docker-compose.custom.yml up -d --pull always --remove-orphans --force-recreate" else docker run --pull always -v /data/coolify/source:/data/coolify/source -v /var/run/docker.sock:/var/run/docker.sock --rm ghcr.io/coollabsio/coolify-helper bash -c "LATEST_IMAGE=${1:-} docker compose --env-file /data/coolify/source/.env -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml up -d --pull always --remove-orphans --force-recreate"