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

fix

Browse Source
This commit is contained in:
Andras Bacsai 2023-05-30 15:05:27 +00:00
parent ca777384eb
commit 3d4e985aa6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Livewire/Project/Application/Previews.php
View File

@ -69,11 +69,11 @@ public function stop(int $pull_request_id)
ray('Stopping container: ' . $container_name); ray('Stopping container: ' . $container_name);
instant_remote_process(["docker rm -f $container_name"], $this->application->destination->server, throwError: false); instant_remote_process(["docker rm -f $container_name"], $this->application->destination->server, throwError: false);
dispatch(new ContainerStatusJob( $found = ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->first();
application: $this->application, if ($found) {
container_name: $container_name, $found->delete();
pull_request_id: $pull_request_id }
)); $this->application->refresh();
} catch (\Throwable $th) { } catch (\Throwable $th) {
return general_error_handler($th, $this); return general_error_handler($th, $this);
} }

2
app/Jobs/ApplicationDeploymentJob.php
View File

@ -594,7 +594,7 @@ private function importing_git_repository()
$commands = [$this->execute_in_builder($git_clone_command)]; $commands = [$this->execute_in_builder($git_clone_command)];
if ($this->pull_request_id) { if ($this->pull_request_id) {
$commands[] = $this->execute_in_builder("cd {$this->workdir} && git fetch origin pull/{$this->pull_request_id}/head:$pr_branch_name && git checkout $pr_branch_name"); $commands[] = $this->execute_in_builder("cd {$this->workdir} && git fetch origin pull/{$this->pull_request_id}/head:$pr_branch_name >/dev/null 2>&1 && git checkout $pr_branch_name >/dev/null 2>&1");
} }
return $commands; return $commands;
} else { } else {