rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next' into rename-github-app

Browse source
This commit is contained in:
🏔️ Peak 2024-12-03 15:35:23 +01:00 committed by GitHub
commit 24cd57ca8d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 30 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Actions/Database/StartClickhouse.php
View file

@ -24,7 +24,7 @@ public function handle(StandaloneClickhouse $database)
$this->configuration_dir = database_configuration_dir().'/'.$container_name;
$this->commands = [
"echo 'Starting {$database->name}.'",
"echo 'Starting database.'",
"mkdir -p $this->configuration_dir",
];

2
app/Actions/Database/StartDragonfly.php
View file

@ -26,7 +26,7 @@ public function handle(StandaloneDragonfly $database)
$this->configuration_dir = database_configuration_dir().'/'.$container_name;
$this->commands = [
"echo 'Starting {$database->name}.'",
"echo 'Starting database.'",
"mkdir -p $this->configuration_dir",
];

2
app/Actions/Database/StartKeydb.php
View file

@ -27,7 +27,7 @@ public function handle(StandaloneKeydb $database)
$this->configuration_dir = database_configuration_dir().'/'.$container_name;
$this->commands = [
"echo 'Starting {$database->name}.'",
"echo 'Starting database.'",
"mkdir -p $this->configuration_dir",
];

2
app/Actions/Database/StartMariadb.php
View file

@ -24,7 +24,7 @@ public function handle(StandaloneMariadb $database)
$this->configuration_dir = database_configuration_dir().'/'.$container_name;
$this->commands = [
"echo 'Starting {$database->name}.'",
"echo 'Starting database.'",
"mkdir -p $this->configuration_dir",
];

2
app/Actions/Database/StartMongodb.php
View file

@ -30,7 +30,7 @@ public function handle(StandaloneMongodb $database)
}
$this->commands = [
"echo 'Starting {$database->name}.'",
"echo 'Starting database.'",
"mkdir -p $this->configuration_dir",
];

2
app/Actions/Database/StartMysql.php
View file

@ -24,7 +24,7 @@ public function handle(StandaloneMysql $database)
$this->configuration_dir = database_configuration_dir().'/'.$container_name;
$this->commands = [
"echo 'Starting {$database->name}.'",
"echo 'Starting database.'",
"mkdir -p $this->configuration_dir",
];

2
app/Actions/Database/StartPostgresql.php
View file

@ -25,7 +25,7 @@ public function handle(StandalonePostgresql $database)
$this->configuration_dir = database_configuration_dir().'/'.$container_name;
$this->commands = [
"echo 'Starting {$database->name}.'",
"echo 'Starting database.'",
"mkdir -p $this->configuration_dir",
"mkdir -p $this->configuration_dir/docker-entrypoint-initdb.d/",
];

2
app/Actions/Database/StartRedis.php
View file

@ -25,7 +25,7 @@ public function handle(StandaloneRedis $database)
$this->configuration_dir = database_configuration_dir().'/'.$container_name;
$this->commands = [
"echo 'Starting {$database->name}.'",
"echo 'Starting database.'",
"mkdir -p $this->configuration_dir",
];

6
app/Console/Commands/CloudCleanupSubscriptions.php
View file

@ -36,7 +36,7 @@ public function handle()
}
// If the team has no subscription id and the invoice is paid, we need to reset the invoice paid status
if (! (data_get($team, 'subscription.stripe_subscription_id'))) {
$this->info("Resetting invoice paid status for team {$team->id} {$team->name}");
$this->info("Resetting invoice paid status for team {$team->id}");
$team->subscription->update([
'stripe_invoice_paid' => false,
@ -61,9 +61,9 @@ public function handle()
$this->info('Subscription id: '.data_get($team, 'subscription.stripe_subscription_id'));
$confirm = $this->confirm('Do you want to cancel the subscription?', true);
if (! $confirm) {
$this->info("Skipping team {$team->id} {$team->name}");
$this->info("Skipping team {$team->id}");
} else {
$this->info("Cancelling subscription for team {$team->id} {$team->name}");
$this->info("Cancelling subscription for team {$team->id}");
$team->subscription->update([
'stripe_invoice_paid' => false,
'stripe_trial_already_ended' => false,

28
app/Livewire/Project/Application/Configuration.php
View file

@ -16,24 +16,26 @@ class Configuration extends Component
public function mount()
{
$this->application = Application::query()
->whereHas('environment.project', function ($query) {
$query->where('team_id', currentTeam()->id)
->where('uuid', request()->route('project_uuid'));
})
->whereHas('environment', function ($query) {
$query->where('name', request()->route('environment_name'));
})
$project = currentTeam()
->projects()
->select('id', 'uuid', 'team_id')
->where('uuid', request()->route('project_uuid'))
->firstOrFail();
$environment = $project->environments()
->select('id', 'name', 'project_id')
->where('name', request()->route('environment_name'))
->firstOrFail();
$application = $environment->applications()
->with(['destination'])
->where('uuid', request()->route('application_uuid'))
->with(['destination' => function ($query) {
$query->select('id', 'server_id');
}])
->firstOrFail();
if ($this->application->destination && $this->application->destination->server_id) {
$this->application = $application;
if ($application->destination && $application->destination->server) {
$mainServer = $application->destination->server;
$this->servers = Server::ownedByCurrentTeam()
->select('id', 'name')
->where('id', '!=', $this->application->destination->server_id)
->where('id', '!=', $mainServer->id)
->get();
} else {
$this->servers = collect();

7
app/Models/Team.php
View file

@ -127,13 +127,6 @@ public function routeNotificationForTelegram()
];
}
public function name(): Attribute
{
return new Attribute(
get: fn () => sanitize_string($this->getRawOriginal('name')),
);
}
public function getRecepients($notification)
{
$recipients = data_get($notification, 'emails', null);

2
config/constants.php
View file

@ -2,7 +2,7 @@
return [
'coolify' => [
'version' => '4.0.0-beta.374',
'version' => '4.0.0-beta.375',
'self_hosted' => env('SELF_HOSTED', true),
'autoupdate' => env('AUTOUPDATE'),
'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),

2
resources/views/livewire/switch-team.blade.php
View file

@ -1,6 +1,6 @@
<x-forms.select wire:model.live="selectedTeamId" label="Current Team">
<option value="default" disabled selected>Switch team</option>
@foreach (auth()->user()->teams as $team)
<option value="{{ $team->id }}">{{ $team->name }}</option>
<option value="{{ $team->id }}">{{ $team->name }}</option>
@endforeach
</x-forms.select>

4
versions.json
View file

@ -1,10 +1,10 @@
{
"coolify": {
"v4": {
"version": "4.0.0-beta.374"
"version": "4.0.0-beta.375"
},
"nightly": {
"version": "4.0.0-beta.375"
"version": "4.0.0-beta.376"
},
"helper": {
"version": "1.0.4"