From b07f2c486c5db09b7035cdc000c04a3dfe03b660 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 24 May 2023 14:56:41 +0200 Subject: [PATCH] add default standalonedockernetwork --- app/Console/Commands/SyncBunny.php | 2 -- database/seeders/ProductionSeeder.php | 10 ++++++++++ docker-compose.yml | 1 + scripts/run | 14 +++++++------- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/app/Console/Commands/SyncBunny.php b/app/Console/Commands/SyncBunny.php index a06d515fc..97c730668 100644 --- a/app/Console/Commands/SyncBunny.php +++ b/app/Console/Commands/SyncBunny.php @@ -82,8 +82,6 @@ public function handle() $pool->purge(url: "$bunny_cdn/$versions"), ]); echo "All files uploaded & purged...\n"; - return; - throw new \Exception("Something went wrong."); } catch (\Exception $e) { echo $e->getMessage(); } diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php index d6e5074b7..974e673f9 100644 --- a/database/seeders/ProductionSeeder.php +++ b/database/seeders/ProductionSeeder.php @@ -10,6 +10,7 @@ use App\Models\InstanceSettings; use App\Models\PrivateKey; use App\Models\Server; +use App\Models\StandaloneDocker; use App\Models\Team; use Illuminate\Database\Seeder; use Illuminate\Support\Facades\Storage; @@ -98,5 +99,14 @@ public function run(): void $server->settings->is_validated = true; $server->settings->save(); } + if (StandaloneDocker::find(0) == null) { + StandaloneDocker::create([ + 'id' => 0, + 'name' => 'localhost-coolify', + 'description' => 'This is the standalone Docker instance that is used to run the Coolify services.', + 'network' => 'coolify', + 'server_id' => 0, + ]); + } } } diff --git a/docker-compose.yml b/docker-compose.yml index 5c44251a6..e84ce3220 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,4 +25,5 @@ services: - coolify networks: coolify: + name: coolify driver: bridge diff --git a/scripts/run b/scripts/run index 15d72b15f..d0537d85f 100755 --- a/scripts/run +++ b/scripts/run @@ -20,7 +20,7 @@ function help { compgen -A function | cat -n } -function sync-bunny { +function sync:bunny { php artisan sync:bunny --env=secrets } @@ -36,19 +36,19 @@ function schedule { bash vendor/bin/spin exec -u webuser coolify php artisan schedule:work } -function schedule-run { +function schedule:run { bash vendor/bin/spin exec -u webuser coolify php artisan schedule:run } -function db-reset { +function db:reset { bash vendor/bin/spin exec -u webuser coolify php artisan migrate:fresh --seed } function mfs { - db-reset + db:reset } -function db-reset-prod { +function db:reset-prod { bash vendor/bin/spin exec -u webuser coolify php artisan migrate:fresh --force --seed --seeder=ProductionSeeder || php artisan migrate:fresh --force --seed --seeder=ProductionSeeder } @@ -57,7 +57,7 @@ function coolify { bash vendor/bin/spin exec -u webuser coolify bash } -function coolify-root { +function coolify:root { bash vendor/bin/spin exec coolify bash } @@ -77,7 +77,7 @@ function db { bash vendor/bin/spin exec -u webuser coolify php artisan db } -function build-builder { +function build:builder { act -W .github/workflows/coolify-builder.yml --secret-file .env.secrets } function default {