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

fix again

Browse Source
This commit is contained in:
Andras Bacsai 2023-03-31 16:47:27 +02:00
parent 8c94bcb27b
commit 304087a24d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Jobs/DeployApplicationJob.php
View File

@ -117,7 +117,9 @@ class DeployApplicationJob implements ShouldQueue
$this->executeNow([ $this->executeNow([
"echo -n 'Generating nixpacks configuration... '", "echo -n 'Generating nixpacks configuration... '",
$this->getNixpacks(), $this->nixpacks_build_cmd(),
$this->execute_in_builder("cp {$this->workdir}/.nixpacks/Dockerfile {$this->workdir}/Dockerfile"),
$this->execute_in_builder("rm -f {$this->workdir}/.nixpacks/Dockerfile"),
"echo 'Done.'", "echo 'Done.'",
"echo -n 'Building image... '", "echo -n 'Building image... '",
$this->execute_in_builder("docker build -f {$this->workdir}/Dockerfile --build-arg SOURCE_COMMIT={$this->git_commit} --progress plain -t {$this->application->uuid}:{$this->git_commit} {$this->workdir}"), $this->execute_in_builder("docker build -f {$this->workdir}/Dockerfile --build-arg SOURCE_COMMIT={$this->git_commit} --progress plain -t {$this->application->uuid}:{$this->git_commit} {$this->workdir}"),
@ -281,7 +283,7 @@ class DeployApplicationJob implements ShouldQueue
} }
} }
} }
private function getNixpacks() private function nixpacks_build_cmd()
{ {
if (str_starts_with($this->application->base_image, 'apache') || str_starts_with($this->application->base_image, 'nginx')) { if (str_starts_with($this->application->base_image, 'apache') || str_starts_with($this->application->base_image, 'nginx')) {
// @TODO: Add static site builds // @TODO: Add static site builds
@ -297,10 +299,7 @@ class DeployApplicationJob implements ShouldQueue
$nixpacks_command .= " --start-cmd '{$this->application->start_command}'"; $nixpacks_command .= " --start-cmd '{$this->application->start_command}'";
} }
$nixpacks_command .= " {$this->workdir}"; $nixpacks_command .= " {$this->workdir}";
$command_other_command[] = $this->execute_in_builder($nixpacks_command);
$command_other_command[] = $this->execute_in_builder("cp {$this->workdir}/.nixpacks/Dockerfile {$this->workdir}/Dockerfile");
$command_other_command[] = $this->execute_in_builder("rm -f {$this->workdir}/.nixpacks/Dockerfile");
} }
return $command_other_command; return $this->execute_in_builder($nixpacks_command);
} }
} }