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

wip: nixpacksarchive

Browse Source
This commit is contained in:
Andras Bacsai
2023-09-11 15:53:05 +02:00
parent f0adf10e6a
commit b7786504b8
9 changed files with 161 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Livewire/Project/Application/General.php
View File

@@ -48,6 +48,7 @@ class General extends Component
'application.ports_exposes' => 'required',
'application.ports_mappings' => 'nullable',
'application.dockerfile' => 'nullable',
'application.nixpkgsarchive' => 'nullable',
];
protected $validationAttributes = [
'application.name' => 'name',
@@ -66,6 +67,7 @@ class General extends Component
'application.ports_exposes' => 'Ports exposes',
'application.ports_mappings' => 'Ports mappings',
'application.dockerfile' => 'Dockerfile',
'application.nixpkgsarchive' => 'Nixpkgs archive',
];
public function instantSave()

2
app/Http/Middleware/IsBoardingFlow.php
View File

@@ -15,7 +15,7 @@ class IsBoardingFlow
*/
public function handle(Request $request, Closure $next): Response
{
ray()->showQueries()->color('orange');
// ray()->showQueries()->color('orange');
if (showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
return redirect('boarding');
}

10
app/Jobs/ApplicationDeploymentJob.php
View File

@@ -28,6 +28,8 @@ use Spatie\Url\Url;
use Symfony\Component\Yaml\Yaml;
use Throwable;
use Visus\Cuid2\Cuid2;
use Yosymfony\Toml\Toml;
use Yosymfony\Toml\TomlArray;
class ApplicationDeploymentJob implements ShouldQueue
{
@@ -411,6 +413,7 @@ class ApplicationDeploymentJob implements ShouldQueue
private function generate_nixpacks_confs()
{
ray('nixpkgsarchive', $this->application->nixpkgsarchive);
$this->execute_remote_command(
[
"echo -n 'Generating nixpacks configuration.'",
@@ -419,6 +422,13 @@ class ApplicationDeploymentJob implements ShouldQueue
[$this->execute_in_builder("cp {$this->workdir}/.nixpacks/Dockerfile {$this->workdir}/Dockerfile")],
[$this->execute_in_builder("rm -f {$this->workdir}/.nixpacks/Dockerfile")]
);
// if ($this->application->nixpkgsarchive) {
// $this->execute_remote_command([
// $this->execute_in_builder("cat {$this->workdir}/nixpacks.toml"), "hidden" => true, "save" => 'nixpacks_toml'
// ]);
// }
}
private function nixpacks_build_cmd()