dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

updates

Browse Source
This commit is contained in:
Andras Bacsai
2023-05-30 15:00:11 +00:00
parent 726d46c3c1
commit ca777384eb
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,10 +45,13 @@ class Previews extends Component
{
try {
$this->set_deployment_uuid();
ApplicationPreview::create([
'application_id' => $this->application->id,
'pull_request_id' => $pull_request_id,
]);
$found = ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->first();
if (!$found) {
ApplicationPreview::create([
'application_id' => $this->application->id,
'pull_request_id' => $pull_request_id,
]);
}
queue_application_deployment(
application_id: $this->application->id,
deployment_uuid: $this->deployment_uuid,

6
app/Jobs/ApplicationDeploymentJob.php
View File

@@ -202,8 +202,8 @@ COPY --from=$this->build_image_name /app/{$this->application->publish_directory}
}
private function deploy_pull_request()
{
$this->build_image_name = "{$this->application->uuid}:pr_{$this->pull_request_id}-build";
$this->production_image_name = "{$this->application->uuid}:pr_{$this->pull_request_id}";
$this->build_image_name = "{$this->application->uuid}:pr-{$this->pull_request_id}-build";
$this->production_image_name = "{$this->application->uuid}:pr-{$this->pull_request_id}";
$this->container_name = generate_container_name($this->application->uuid, $this->pull_request_id);
// Deploy pull request
$this->execute_now([
@@ -577,7 +577,7 @@ COPY --from=$this->build_image_name /app/{$this->application->publish_directory}
{
$git_clone_command = "git clone -q -b {$this->application->git_branch}";
if ($this->pull_request_id) {
$pr_branch_name = "pr_{$this->pull_request_id}_coolify";
$pr_branch_name = "pr-{$this->pull_request_id}-coolify";
}
if ($this->application->deploymentType() === 'source') {