Skip to content

Commit 583ec43

Browse files
andrasbacsaiandrasbacsai
authored
Merge branch 'next' into bugfix/2860_plane_images
2 parents 439fe43 + 8ffbccf commit 583ec43

File tree

11 files changed

+61
-54
lines changed

11 files changed

+61
-54
lines changed

‎app/Jobs/ApplicationDeploymentJob.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1448,6 +1448,11 @@ private function generate_nixpacks_confs()
14481448
}
14491449
$this->nixpacks_plan = json_encode($parsed, JSON_PRETTY_PRINT);
14501450
$this->application_deployment_queue->addLogEntry("Final Nixpacks plan: {$this->nixpacks_plan}", hidden: true);
1451+
if ($this->nixpacks_type === 'rust') {
1452+
// temporary: disable healthcheck for rust because the start phase does not have curl/wget
1453+
$this->application->health_check_enabled = false;
1454+
$this->application->save();
1455+
}
14511456
}
14521457
}
14531458
}

‎app/Models/LocalFileVolume.php

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,23 +79,29 @@ public function saveStorageOnServer()
7979
$isFile = instant_remote_process(["test -f $path && echo OK || echo NOK"], $server);
8080
$isDir = instant_remote_process(["test -d $path && echo OK || echo NOK"], $server);
8181
if ($isFile == 'OK' && $fileVolume->is_directory) {
82+
$fileVolume->is_directory = false;
83+
$fileVolume->save();
8284
throw new \Exception('The following file is a file on the server, but you are trying to mark it as a directory. Please delete the file on the server or mark it as directory.');
8385
} elseif ($isDir == 'OK' && ! $fileVolume->is_directory) {
86+
$fileVolume->is_directory = true;
87+
$fileVolume->save();
8488
throw new \Exception('The following file is a directory on the server, but you are trying to mark it as a file. <br><br>Please delete the directory on the server or mark it as directory.');
8589
}
86-
if (! $fileVolume->is_directory && $isDir == 'NOK') {
90+
if ($isDir == 'NOK' && ! $fileVolume->is_directory) {
91+
$chmod = data_get($fileVolume, 'chmod');
92+
$chown = data_get($fileVolume, 'chown');
8793
if ($content) {
8894
$content = base64_encode($content);
89-
$chmod = $fileVolume->chmod;
90-
$chown = $fileVolume->chown;
9195
$commands->push("echo '$content' | base64 -d | tee $path > /dev/null");
92-
$commands->push("chmod +x $path");
93-
if ($chown) {
94-
$commands->push("chown $chown $path");
95-
}
96-
if ($chmod) {
97-
$commands->push("chmod $chmod $path");
98-
}
96+
} else {
97+
$commands->push("touch $path");
98+
}
99+
$commands->push("chmod +x $path");
100+
if ($chown) {
101+
$commands->push("chown $chown $path");
102+
}
103+
if ($chmod) {
104+
$commands->push("chmod $chmod $path");
99105
}
100106
} elseif ($isDir == 'NOK' && $fileVolume->is_directory) {
101107
$commands->push("mkdir -p $path > /dev/null 2>&1 || true");

‎config/sentry.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// The release version of your application
99
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
10-
'release' => '4.0.0-beta.317',
10+
'release' => '4.0.0-beta.318',
1111
// When left empty or `null` the Laravel environment will be used
1212
'environment' => config('app.env'),
1313

‎config/version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?php
22

3-
return '4.0.0-beta.317';
3+
return '4.0.0-beta.318';

‎database/migrations/2024_07_19_132617_disable_healtcheck_by_default.php

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?php
2+
3+
use Illuminate\Database\Migrations\Migration;
4+
use Illuminate\Database\Schema\Blueprint;
5+
use Illuminate\Support\Facades\Schema;
6+
7+
return new class extends Migration
8+
{
9+
/**
10+
* Run the migrations.
11+
*/
12+
public function up(): void
13+
{
14+
Schema::table('applications', function (Blueprint $table) {
15+
$table->boolean('health_check_enabled')->default(false)->change();
16+
});
17+
}
18+
19+
/**
20+
* Reverse the migrations.
21+
*/
22+
public function down(): void
23+
{
24+
Schema::table('applications', function (Blueprint $table) {
25+
$table->boolean('health_check_enabled')->default(true)->change();
26+
});
27+
}
28+
};

‎database/seeders/new_services.php

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎resources/views/components/status/running.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</div>
1919
@if (!str($status)->startsWith('Proxy') && !str($status)->contains('('))
2020
@if (str($status)->contains('unhealthy'))
21-
<x-helper helper="Unhealthy state. <span class='dark:text-warning text-coollabs'>This doesn't mean that the resource is malfunctioning.</span><br><br>- If the resource is accessible, it indicates that no health check is configured - it is not mandatory.<br>- If the resource is not accessible (returning 404 or 503), it may indicate that a health check is needed and has not passed. <span class='dark:text-warning text-coollabs'>Your action is required.</span>" >
21+
<x-helper helper="Unhealthy state. <span class='dark:text-warning text-coollabs'>This doesn't mean that the resource is malfunctioning.</span><br><br>- If the resource is accessible, it indicates that no health check is configured - it is not mandatory.<br>- If the resource is not accessible (returning 404 or 503), it may indicate that a health check is needed and has not passed. <span class='dark:text-warning text-coollabs'>Your action is required.</span><br><br>More details in the <a href='https://coolify.io/docs/knowledge-base/healthchecks' class='underline dark:text-warning text-coollabs' target='_blank'>documentation</a>." >
2222
<x-slot:icon>
2323
<svg class="hidden w-4 h-4 dark:text-warning lg:block" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
2424
<path fill="currentColor" d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16"></path>

‎resources/views/livewire/project/service/configuration.blade.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,15 +175,15 @@ class="w-4 h-4 dark:text-warning text-coollabs"
175175
<div class="pb-4 dark:text-warning text-coollabs">If you would like to add a volume, you must add it to
176176
your compose file (General tab).</div>
177177
@foreach ($applications as $application)
178-
<livewire:project.service.storage wire:key="application-{{ $application->id }}"
179-
:resource="$application" />
178+
<livewire:project.service.storage wire:key="application-{{ $application->id }}" :resource="$application"
179+
lazy />
180180
@endforeach
181181
@foreach ($databases as $database)
182-
<livewire:project.service.storage wire:key="database-{{ $database->id }}" :resource="$database" />
182+
<livewire:project.service.storage wire:key="database-{{ $database->id }}" :resource="$database" lazy />
183183
@endforeach
184184
</div>
185185
<div x-cloak x-show="activeTab === 'scheduled-tasks'">
186-
<livewire:project.shared.scheduled-task.all :resource="$service" />
186+
<livewire:project.shared.scheduled-task.all :resource="$service" lazy />
187187
</div>
188188
<div x-cloak x-show="activeTab === 'webhooks'">
189189
<livewire:project.shared.webhooks :resource="$service" />

‎templates/compose/supabase.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ services:
301301
- DEFAULT_ORGANIZATION_NAME=${STUDIO_DEFAULT_ORGANIZATION:-Default Organization}
302302
- DEFAULT_PROJECT_NAME=${STUDIO_DEFAULT_PROJECT:-Default Project}
303303

304-
- SUPABASE_URL=${SERVICE_FQDN_SUPABASEKONG:-http://supabase-kong:8000}
304+
- SUPABASE_URL=${SERVICE_FQDN_SUPABASEKONG}
305305
- SUPABASE_PUBLIC_URL=${SERVICE_FQDN_SUPABASEKONG}
306306
- SUPABASE_ANON_KEY=${SERVICE_SUPABASEANON_KEY}
307307
- SUPABASE_SERVICE_KEY=${SERVICE_SUPABASESERVICE_KEY}
@@ -1013,7 +1013,7 @@ services:
10131013
"/dev/null",
10141014
"-H",
10151015
"Authorization: Bearer ${SERVICE_SUPABASEANON_KEY}",
1016-
"http://127.0.0.1:4000/api/tenants/realtime-dev/health"
1016+
"http://127.0.0.1:4000/api/tenants/realtime-dev/health",
10171017
]
10181018
timeout: 5s
10191019
interval: 5s
@@ -1182,7 +1182,7 @@ services:
11821182
retries: 3
11831183
environment:
11841184
- JWT_SECRET=${SERVICE_PASSWORD_JWT}
1185-
- SUPABASE_URL=${SERVICE_FQDN_SUPABASEKONG:-http://supabase-kong:8000}
1185+
- SUPABASE_URL=${SERVICE_FQDN_SUPABASEKONG}
11861186
- SUPABASE_ANON_KEY=${SERVICE_SUPABASEANON_KEY}
11871187
- SUPABASE_SERVICE_ROLE_KEY=${SERVICE_SUPABASESERVICE_KEY}
11881188
- SUPABASE_DB_URL=postgresql://postgres:${SERVICE_PASSWORD_POSTGRES}@${POSTGRES_HOSTNAME:-supabase-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres}

‎templates/service-templates.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)