dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Andras Bacsai
2023-12-05 14:18:44 +01:00
parent 5cc22a8271
commit b106705c8d
3 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/js/app.js
View File

@@ -1,26 +1,8 @@
import Alpine from "alpinejs"; import Alpine from "alpinejs";
// import Echo from 'laravel-echo';
// import Pusher from 'pusher-js';
import { createApp } from "vue"; import { createApp } from "vue";
import MagicBar from "./components/MagicBar.vue"; import MagicBar from "./components/MagicBar.vue";
import Toaster from "../../vendor/masmerise/livewire-toaster/resources/js"; 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); Alpine.plugin(Toaster);
window.Alpine = Alpine; window.Alpine = Alpine;

2
resources/views/layouts/base.blade.php
View File

@@ -49,7 +49,7 @@
window.Echo = new Echo({ window.Echo = new Echo({
broadcaster: 'pusher', broadcaster: 'pusher',
cluster: "{{ env('PUSHER_HOST') }}" || window.location.hostname, cluster: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
key: 'coolify', key: "{{ env('PUSHER_APP_KEY') }}" || 'coolify',
wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname, wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname,
wsPort: "{{ env('PUSHER_PORT') }}" || 6001, wsPort: "{{ env('PUSHER_PORT') }}" || 6001,
wssPort: "{{ env('PUSHER_PORT') }}" || 6001, wssPort: "{{ env('PUSHER_PORT') }}" || 6001,

2
scripts/upgrade.sh
View File

@@ -29,7 +29,7 @@ docker network create --attachable coolify 2>/dev/null
# docker network create --attachable --driver=overlay coolify-overlay 2>/dev/null # docker network create --attachable --driver=overlay coolify-overlay 2>/dev/null
if [ -f /data/coolify/source/docker-compose.custom.yml ]; then 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" 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 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" 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"