diff --git a/app/Console/Commands/CleanupRedis.php b/app/Console/Commands/CleanupRedis.php index 5fc2b4e61..e16a82be4 100644 --- a/app/Console/Commands/CleanupRedis.php +++ b/app/Console/Commands/CleanupRedis.php @@ -13,7 +13,6 @@ class CleanupRedis extends Command public function handle() { - echo "Cleanup Redis keys.\n"; $prefix = config('database.redis.options.prefix'); $keys = Redis::connection()->keys('*:laravel*'); diff --git a/app/Console/Commands/CleanupStuckedResources.php b/app/Console/Commands/CleanupStuckedResources.php index 9d36ce9b8..def3d5a2c 100644 --- a/app/Console/Commands/CleanupStuckedResources.php +++ b/app/Console/Commands/CleanupStuckedResources.php @@ -30,7 +30,6 @@ class CleanupStuckedResources extends Command public function handle() { - echo "Running cleanup stucked resources.\n"; $this->cleanup_stucked_resources(); } diff --git a/app/Console/Commands/Horizon.php b/app/Console/Commands/Horizon.php index 8ae165c59..655729ec9 100644 --- a/app/Console/Commands/Horizon.php +++ b/app/Console/Commands/Horizon.php @@ -13,7 +13,7 @@ class Horizon extends Command public function handle() { if (config('constants.horizon.is_horizon_enabled')) { - $this->info('Horizon is enabled. Starting.'); + $this->info('[x]: Horizon is enabled. Starting.'); $this->call('horizon'); exit(0); } else { diff --git a/app/Console/Commands/Init.php b/app/Console/Commands/Init.php index 400af8149..f4b7c1565 100644 --- a/app/Console/Commands/Init.php +++ b/app/Console/Commands/Init.php @@ -54,7 +54,10 @@ class Init extends Command } else { $this->cleanup_in_progress_application_deployments(); } + echo "[3]: Cleanup Redis keys.\n"; $this->call('cleanup:redis'); + + echo "[4]: Cleanup stucked resources.\n"; $this->call('cleanup:stucked-resources'); if (isCloud()) { @@ -99,7 +102,7 @@ class Init extends Command private function optimize() { - echo "Optimizing Laravel deployment.\n"; + echo "[1]: Optimizing Laravel (caching config, routes, views).\n"; Artisan::call('optimize:clear'); Artisan::call('optimize'); } @@ -217,15 +220,15 @@ class Init extends Command $settings = instanceSettings(); $do_not_track = data_get($settings, 'do_not_track'); if ($do_not_track == true) { - echo "Skipping alive as do_not_track is enabled\n"; + echo "[2]: Skipping sending live signal as do_not_track is enabled\n"; return; } try { Http::get("https://undead.coolify.io/v4/alive?appId=$id&version=$version"); - echo "I am alive!\n"; + echo "[2]: Sending live signal!\n"; } catch (\Throwable $e) { - echo "Error in alive: {$e->getMessage()}\n"; + echo "[2]: Error in sending live signal: {$e->getMessage()}\n"; } } diff --git a/app/Console/Commands/Scheduler.php b/app/Console/Commands/Scheduler.php index 9b6ca5324..9ee7b06e6 100644 --- a/app/Console/Commands/Scheduler.php +++ b/app/Console/Commands/Scheduler.php @@ -13,7 +13,7 @@ class Scheduler extends Command public function handle() { if (config('constants.horizon.is_scheduler_enabled')) { - $this->info('Scheduler is enabled. Starting.'); + $this->info('[x]: Scheduler is enabled. Starting.'); $this->call('schedule:work'); exit(0); } else { diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php index 8144a8b1a..7acdef548 100644 --- a/database/seeders/ProductionSeeder.php +++ b/database/seeders/ProductionSeeder.php @@ -22,9 +22,9 @@ class ProductionSeeder extends Seeder public function run(): void { if (isCloud()) { - echo "Running in cloud mode.\n"; + echo "[x]: Running in cloud mode.\n"; } else { - echo "Running in self-hosted mode.\n"; + echo "[x]: Running in self-hosted mode.\n"; } // Fix for 4.0.0-beta.37 diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index d86b2336b..bb8e28e95 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -53,6 +53,7 @@ services: - AUTOUPDATE - SSH_MUX_ENABLED - SSH_MUX_PERSIST_TIME + - HELPER_IMAGE ports: - "${APP_PORT:-8000}:80" expose: diff --git a/other/nightly/install.sh b/other/nightly/install.sh index 876e8c6e2..4a03a5c98 100755 --- a/other/nightly/install.sh +++ b/other/nightly/install.sh @@ -9,7 +9,7 @@ CDN="https://cdn.coollabs.io/coolify-nightly" DATE=$(date +"%Y%m%d-%H%M%S") VERSION="1.6" -DOCKER_VERSION="27.3" +DOCKER_VERSION="27.0" # TODO: Ask for a user CURRENT_USER=$USER diff --git a/scripts/install.sh b/scripts/install.sh index d15d58cb6..706b7ad3d 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -9,7 +9,7 @@ CDN="https://cdn.coollabs.io/coolify" DATE=$(date +"%Y%m%d-%H%M%S") VERSION="1.6" -DOCKER_VERSION="27.3" +DOCKER_VERSION="27.0" # TODO: Ask for a user CURRENT_USER=$USER @@ -151,7 +151,7 @@ echo "| Coolify | $LATEST_VERSION" echo "| Helper | $LATEST_HELPER_VERSION" echo "| Realtime | $LATEST_REALTIME_VERSION" echo -e "---------------------------------------------\n" -echo -e "1. Installing required packages (curl, wget, git, jq). " +echo -e "1. Installing required packages (curl, wget, git, jq, openssl). " case "$OS_TYPE" in arch) @@ -533,8 +533,7 @@ echo -e "\033[0;35m |___/ \033[0m" echo -e "\nYour instance is ready to use." -echo -e "You can access Coolify through:" -echo -e "- Public IP: http://$(curl -4s https://ifconfig.io):8000" +echo -e "You can access Coolify through your Public IP: http://$(curl -4s https://ifconfig.io):8000" set +e DEFAULT_PRIVATE_IP=$(ip route get 1 | sed -n 's/^.*src \([0-9.]*\) .*$/\1/p') @@ -542,15 +541,12 @@ PRIVATE_IPS=$(hostname -I) set -e if [ -n "$PRIVATE_IPS" ]; then - echo -e "If your Public IP is not accessible, you can use the following Private IPs:\n" + echo -e "\n\nIf your Public IP is not accessible, you can use the following Private IPs:\n" for IP in $PRIVATE_IPS; do - if [ "$IP" == "$DEFAULT_PRIVATE_IP" ]; then - echo -e "http://$DEFAULT_PRIVATE_IP:8000 (default)" - else + if [ "$IP" != "$DEFAULT_PRIVATE_IP" ]; then echo -e "http://$IP:8000" fi done fi -echo -e "\n" echo -e "WARNING: It is highly recommended to backup your Environment variables file (/data/coolify/source/.env) to a safe location, outside of this server (e.g. into a Password Manager).\n" cp /data/coolify/source/.env /data/coolify/source/.env.backup