mirror of
https://github.com/coollabsio/coolify.git
synced 2026-11-06 13:10:37 -04:00
Merge remote-tracking branch 'origin/release/v4.5' into pr-12202-next
# Conflicts: # .ai/lessons.md # app/Actions/Server/CleanupDocker.php # app/Http/Controllers/Api/DatabasesController.php # app/Http/Controllers/Api/ServerCanvasController.php # app/Http/Controllers/Api/ServicesController.php # app/Http/Middleware/ApiIpAllowed.php # app/Jobs/VolumeBackupJob.php # app/Livewire/Concerns/RemembersCanvasView.php # app/Livewire/Fleet/Metrics.php # app/Livewire/Project/Database/BackupEdit.php # app/Livewire/Project/Service/BackupExecutions.php # app/Livewire/Project/Shared/EnvironmentVariable/All.php # app/Livewire/Project/Shared/Storages/VolumeBackups.php # app/Livewire/Security/ApiTokens.php # app/Livewire/Tags/Show.php # app/Models/ApplicationSetting.php # app/Models/Service.php # app/Rules/ValidGitRepositoryUrl.php # app/Services/EnvironmentCanvas.php # app/Services/ProjectCanvas.php # app/Services/ServerCanvas.php # app/Services/ServerTransfer/ServerTransferExporter.php # app/Services/ServerTransfer/ServerTransferImporter.php # app/Services/ServerTransfer/ServerTransferMigrator.php # app/Services/SharedVariableCanvas.php # app/Traits/ExecutesDatabaseStartCommands.php # app/Traits/HasS3Replicas.php # bootstrap/helpers/shared.php # config/constants.php # other/nightly/versions.json # resources/css/app.css # resources/js/canvas-core.js # resources/js/canvas/deploy/DeployCanvas.svelte # resources/js/canvas/deploy/state.svelte.js # resources/js/canvas/deploy/styles.js # resources/js/canvas/environment/Card.svelte # resources/js/canvas/environment/EnvironmentCanvas.svelte # resources/js/canvas/environment/Panel.svelte # resources/js/canvas/environment/StatusDot.svelte # resources/js/canvas/environment/Toolbar.svelte # resources/js/canvas/environment/Zone.svelte # resources/js/deploy-canvas.test.js # resources/js/environment-canvas.js # resources/js/environment-canvas.test.js # resources/views/components/canvas-view-toggle.blade.php # resources/views/components/navbar.blade.php # resources/views/components/server/sidebar.blade.php # resources/views/components/shared-variables/layout.blade.php # resources/views/components/shared-variables/sidebar.blade.php # resources/views/components/top-user-menu.blade.php # resources/views/layouts/app.blade.php # resources/views/livewire/fleet/metrics.blade.php # resources/views/livewire/project/database/backup-edit/s3.blade.php # resources/views/livewire/project/database/backup-executions.blade.php # resources/views/livewire/project/environment-canvas.blade.php # resources/views/livewire/project/new/select.blade.php # resources/views/livewire/project/project-canvas.blade.php # resources/views/livewire/project/projects-canvas.blade.php # resources/views/livewire/project/shared/environment-variable/all.blade.php # resources/views/livewire/project/shared/storages/volume-backups/s3.blade.php # resources/views/livewire/security/api-tokens.blade.php # resources/views/livewire/server/canvas.blade.php # resources/views/livewire/server/index.blade.php # resources/views/livewire/server/navbar.blade.php # resources/views/livewire/server/partials/localhost-general.blade.php # resources/views/livewire/server/show.blade.php # resources/views/livewire/settings/advanced.blade.php # resources/views/livewire/shared-variables/canvas.blade.php # resources/views/livewire/tags/canvas.blade.php # resources/views/livewire/tags/show.blade.php # routes/web.php # tests/Feature/ApiDisabledCalloutTest.php # tests/Feature/BackupS3DestinationsFormTest.php # tests/Feature/DatabaseStartContentFilesTest.php # tests/Feature/DockerCleanupJobTest.php # tests/Feature/EnvironmentCanvasTest.php # tests/Feature/InstanceBackupMultipleS3DestinationsTest.php # tests/Feature/Livewire/Fleet/MetricsChartPayloadTest.php # tests/Feature/Livewire/Fleet/MetricsDataTest.php # tests/Feature/Mcp/McpEndpointTest.php # tests/Feature/Mcp/McpToggleApiTest.php # tests/Feature/ProjectCanvasTest.php # tests/Feature/ServerCanvasTest.php # tests/Feature/SharedVariableCanvasTest.php # tests/Feature/VolumeBackupTest.php # tests/Unit/ScpStyleGitUrlTest.php # tests/Unit/ServerTransfer/ServerTransferS3DestinationsTest.php # tests/v4/Browser/DeployCanvasTest.php # versions.json
This commit is contained in:
+28
@@ -0,0 +1,28 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*/
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('instance_settings', function (Blueprint $table) {
|
||||
$table->foreignId('file_download_s3_storage_id')->nullable()->constrained('s3_storages')->nullOnDelete();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*/
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('instance_settings', function (Blueprint $table) {
|
||||
$table->dropConstrainedForeignId('file_download_s3_storage_id');
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
use App\Models\InstanceSettings;
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
/**
|
||||
* Move instances that use the old midnight default to a random minute after midnight,
|
||||
* so they do not all pull images from the registry at 00:00.
|
||||
*/
|
||||
public function up(): void
|
||||
{
|
||||
DB::table('instance_settings')
|
||||
->where('auto_update_frequency', '0 0 * * *')
|
||||
->update(['auto_update_frequency' => InstanceSettings::randomAutoUpdateFrequency()]);
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
//
|
||||
}
|
||||
};
|
||||
+40
@@ -0,0 +1,40 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
return new class extends Migration
|
||||
{
|
||||
private const TABLES = [
|
||||
'application_settings',
|
||||
'services',
|
||||
'standalone_postgresqls',
|
||||
'standalone_mysqls',
|
||||
'standalone_mariadbs',
|
||||
'standalone_mongodbs',
|
||||
'standalone_redis',
|
||||
'standalone_keydbs',
|
||||
'standalone_dragonflies',
|
||||
'standalone_clickhouses',
|
||||
'standalone_sqlites',
|
||||
];
|
||||
|
||||
public function up(): void
|
||||
{
|
||||
foreach (self::TABLES as $tableName) {
|
||||
Schema::table($tableName, function (Blueprint $table) {
|
||||
$table->boolean('include_coolify_default_variables')->default(true);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
foreach (self::TABLES as $tableName) {
|
||||
Schema::table($tableName, function (Blueprint $table) {
|
||||
$table->dropColumn('include_coolify_default_variables');
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
Reference in New Issue
Block a user