Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: turn off hc for dockerimage/docker base deployments by default

Browse Source 
fix: loading github app
This commit is contained in:
Andras Bacsai 2024-05-08 14:42:45 +02:00
parent c618e58a11
commit f6396f2e74
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Livewire/Project/New/GithubPrivateRepository.php
View File

@ -150,7 +150,7 @@ public function submit()
'repository_project_id' => $this->selected_repository_id, 'repository_project_id' => $this->selected_repository_id,
'git_repository' => "{$this->selected_repository_owner}/{$this->selected_repository_repo}", 'git_repository' => "{$this->selected_repository_owner}/{$this->selected_repository_repo}",
'git_branch' => $this->selected_branch_name, 'git_branch' => $this->selected_branch_name,
'build_pack' => 'nixpacks', 'build_pack' => $this->build_pack,
'ports_exposes' => $this->port, 'ports_exposes' => $this->port,
'publish_directory' => $this->publish_directory, 'publish_directory' => $this->publish_directory,
'environment_id' => $environment->id, 'environment_id' => $environment->id,
@ -162,6 +162,9 @@ public function submit()
$application->settings->is_static = $this->is_static; $application->settings->is_static = $this->is_static;
$application->settings->save(); $application->settings->save();
if ($this->build_pack === 'dockerfile' || $this->build_pack === 'dockerimage') {
$application->health_check_enabled = false;
}
$fqdn = generateFqdn($destination->server, $application->uuid); $fqdn = generateFqdn($destination->server, $application->uuid);
$application->fqdn = $fqdn; $application->fqdn = $fqdn;

10
app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
View File

@ -19,7 +19,7 @@ class GithubPrivateRepositoryDeployKey extends Component
public $current_step = 'private_keys'; public $current_step = 'private_keys';
public $parameters; public $parameters;
public $query; public $query;
public $private_keys =[]; public $private_keys = [];
public int $private_key_id; public int $private_key_id;
public int $port = 3000; public int $port = 3000;
@ -125,7 +125,7 @@ public function submit()
'name' => generate_random_name(), 'name' => generate_random_name(),
'git_repository' => $this->git_repository, 'git_repository' => $this->git_repository,
'git_branch' => $this->branch, 'git_branch' => $this->branch,
'build_pack' => 'nixpacks', 'build_pack' => $this->build_pack,
'ports_exposes' => $this->port, 'ports_exposes' => $this->port,
'publish_directory' => $this->publish_directory, 'publish_directory' => $this->publish_directory,
'environment_id' => $environment->id, 'environment_id' => $environment->id,
@ -138,7 +138,7 @@ public function submit()
'name' => generate_random_name(), 'name' => generate_random_name(),
'git_repository' => $this->git_repository, 'git_repository' => $this->git_repository,
'git_branch' => $this->branch, 'git_branch' => $this->branch,
'build_pack' => 'nixpacks', 'build_pack' => $this->build_pack,
'ports_exposes' => $this->port, 'ports_exposes' => $this->port,
'publish_directory' => $this->publish_directory, 'publish_directory' => $this->publish_directory,
'environment_id' => $environment->id, 'environment_id' => $environment->id,
@ -149,7 +149,9 @@ public function submit()
'source_type' => $this->git_source->getMorphClass() 'source_type' => $this->git_source->getMorphClass()
]; ];
} }
if ($this->build_pack === 'dockerfile' || $this->build_pack === 'dockerimage') {
$application_init['health_check_enabled'] = false;
}
$application = Application::create($application_init); $application = Application::create($application_init);
$application->settings->is_static = $this->is_static; $application->settings->is_static = $this->is_static;
$application->settings->save(); $application->settings->save();

3
app/Livewire/Project/New/PublicGitRepository.php
View File

@ -205,6 +205,9 @@ public function submit()
]; ];
} }
if ($this->build_pack === 'dockerfile' || $this->build_pack === 'dockerimage') {
$application_init['health_check_enabled'] = false;
}
$application = Application::create($application_init); $application = Application::create($application_init);
$application->settings->is_static = $this->is_static; $application->settings->is_static = $this->is_static;

6
resources/views/livewire/project/new/github-private-repository.blade.php
View File

@ -33,14 +33,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="flex flex-col items-center justify-center">
<x-loading wire:loading wire:target="loadRepositories({{ $ghapp->id }})" />
</div>
@endforeach @endforeach
</div> </div>
@endif @endif
@if ($current_step === 'repository') @if ($current_step === 'repository')
@if ($repositories->count() > 0) @if ($repositories->count() > 0)
<div class="flex items-end gap-2"> <div class="flex items-end gap-2">
<x-forms.select class="w-full" label="Repository" <x-forms.select class="w-full" label="Repository" wire:model="selected_repository_id">
wire:model="selected_repository_id">
@foreach ($repositories as $repo) @foreach ($repositories as $repo)
@if ($loop->first) @if ($loop->first)
<option selected value="{{ data_get($repo, 'id') }}"> <option selected value="{{ data_get($repo, 'id') }}">