diff --git a/app/Models/Application.php b/app/Models/Application.php index 64dc3d43e..2bfc88bcd 100644 --- a/app/Models/Application.php +++ b/app/Models/Application.php @@ -905,7 +905,7 @@ public function generateGitImportCommands(string $deployment_uuid, int $pull_req $commands->push("echo 'Checking out $branch'"); } $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $branch && ".$this->buildGitCheckoutCommand($pr_branch_name); - } elseif ($git_type === 'github') { + } elseif ($git_type === 'github' || $git_type === 'gitea') { $branch = "pull/{$pull_request_id}/head:$pr_branch_name"; if ($exec_in_docker) { $commands->push(executeInDocker($deployment_uuid, "echo 'Checking out $branch'")); @@ -949,7 +949,7 @@ public function generateGitImportCommands(string $deployment_uuid, int $pull_req $commands->push("echo 'Checking out $branch'"); } $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $branch && ".$this->buildGitCheckoutCommand($pr_branch_name); - } elseif ($git_type === 'github') { + } elseif ($git_type === 'github' || $git_type === 'gitea') { $branch = "pull/{$pull_request_id}/head:$pr_branch_name"; if ($exec_in_docker) { $commands->push(executeInDocker($deployment_uuid, "echo 'Checking out $branch'")); diff --git a/app/Models/Server.php b/app/Models/Server.php index fc4fd9892..2efc9907b 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -322,7 +322,7 @@ public function setupDynamicProxyConfiguration() $dynamic_config_path = $this->proxyPath().'/dynamic'; if ($this->proxyType() === 'TRAEFIK_V2') { $file = "$dynamic_config_path/coolify.yaml"; - if (empty($settings->fqdn) || (isCloud() && $this->id !== 0)) { + if (empty($settings->fqdn) || (isCloud() && $this->id !== 0) || ! $this->isLocalhost()) { instant_remote_process([ "rm -f $file", ], $this); @@ -428,7 +428,7 @@ public function setupDynamicProxyConfiguration() } } elseif ($this->proxyType() === 'CADDY') { $file = "$dynamic_config_path/coolify.caddy"; - if (empty($settings->fqdn) || (isCloud() && $this->id !== 0)) { + if (empty($settings->fqdn) || (isCloud() && $this->id !== 0) || ! $this->isLocalhost()) { instant_remote_process([ "rm -f $file", ], $this); diff --git a/resources/views/livewire/project/application/rollback.blade.php b/resources/views/livewire/project/application/rollback.blade.php index 6501155da..2807f2c18 100644 --- a/resources/views/livewire/project/application/rollback.blade.php +++ b/resources/views/livewire/project/application/rollback.blade.php @@ -18,7 +18,12 @@ @endif SHA: {{ data_get($image, 'tag') }} -
{{ data_get($image, 'created_at') }}
+ @php + $date = data_get($image, 'created_at'); + $interval = \Illuminate\Support\Carbon::parse($date); + @endphp +
{{ $interval->diffForHumans() }}
+
{{ $date }}
@if (data_get($image, 'is_current'))