From 2dcb7fec05f059d133dcc9e0499061e51a30c98e Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 24 Sep 2023 11:52:13 +0200 Subject: [PATCH 1/4] fix: services --- app/Jobs/ContainerStatusJob.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Jobs/ContainerStatusJob.php b/app/Jobs/ContainerStatusJob.php index 1067d0028..cc561ee50 100644 --- a/app/Jobs/ContainerStatusJob.php +++ b/app/Jobs/ContainerStatusJob.php @@ -74,7 +74,8 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted $containers = format_docker_command_output_to_json($containers); $applications = $this->server->applications(); $databases = $this->server->databases(); - $services = $this->server->services(); + // $services = $this->server->services(); + $services = collect([]); $previews = $this->server->previews(); /// Check if proxy is running From 66bc03b4cdad071acaf1ccac124da4cfe6eb5851 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 24 Sep 2023 11:56:32 +0200 Subject: [PATCH 2/4] fix: database schema --- app/Jobs/ContainerStatusJob.php | 3 +-- .../migrations/2023_03_27_083621_create_services_table.php | 3 ++- .../migrations/2023_09_20_082541_update_services_table.php | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Jobs/ContainerStatusJob.php b/app/Jobs/ContainerStatusJob.php index cc561ee50..1067d0028 100644 --- a/app/Jobs/ContainerStatusJob.php +++ b/app/Jobs/ContainerStatusJob.php @@ -74,8 +74,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted $containers = format_docker_command_output_to_json($containers); $applications = $this->server->applications(); $databases = $this->server->databases(); - // $services = $this->server->services(); - $services = collect([]); + $services = $this->server->services(); $previews = $this->server->previews(); /// Check if proxy is running diff --git a/database/migrations/2023_03_27_083621_create_services_table.php b/database/migrations/2023_03_27_083621_create_services_table.php index a363d2119..12bb77b1b 100644 --- a/database/migrations/2023_03_27_083621_create_services_table.php +++ b/database/migrations/2023_03_27_083621_create_services_table.php @@ -16,7 +16,8 @@ return new class extends Migration $table->string('uuid')->unique(); $table->string('name'); - $table->foreignId('server_id')->nullable(); + $table->morphs('destination'); + $table->foreignId('environment_id'); $table->timestamps(); }); diff --git a/database/migrations/2023_09_20_082541_update_services_table.php b/database/migrations/2023_09_20_082541_update_services_table.php index 959d5e6fd..8c6b350f7 100644 --- a/database/migrations/2023_09_20_082541_update_services_table.php +++ b/database/migrations/2023_09_20_082541_update_services_table.php @@ -12,6 +12,7 @@ return new class extends Migration public function up(): void { Schema::table('services', function (Blueprint $table) { + $table->foreignId('server_id')->nullable(); $table->longText('description')->nullable(); $table->longText('docker_compose_raw'); $table->longText('docker_compose')->nullable(); @@ -25,6 +26,7 @@ return new class extends Migration public function down(): void { Schema::table('services', function (Blueprint $table) { + $table->dropColumn('server_id'); $table->dropColumn('description'); $table->dropColumn('docker_compose_raw'); $table->dropColumn('docker_compose'); From 074c56edaac5b8779c267eb2adcbada86424ca7d Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 24 Sep 2023 11:57:11 +0200 Subject: [PATCH 3/4] version++ --- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/sentry.php b/config/sentry.php index 39c920a43..3a1955646 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -7,7 +7,7 @@ return [ // The release version of your application // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) - 'release' => '4.0.0-beta.44', + 'release' => '4.0.0-beta.45', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index 34ed5e7bd..462d9f013 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Sun, 24 Sep 2023 11:58:10 +0200 Subject: [PATCH 4/4] version-- --- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/sentry.php b/config/sentry.php index 3a1955646..39c920a43 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -7,7 +7,7 @@ return [ // The release version of your application // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) - 'release' => '4.0.0-beta.45', + 'release' => '4.0.0-beta.44', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index 462d9f013..34ed5e7bd 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@