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

fix: dockerfile expose is not overwritten

Browse Source
This commit is contained in:
Andras Bacsai 2023-10-01 17:27:12 +02:00
parent b3c8c881b7
commit aefdc76805
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Livewire/Project/New/SimpleDockerfile.php
View File

@ -45,6 +45,9 @@ public function submit()
$environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first(); $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
$port = get_port_from_dockerfile($this->dockerfile); $port = get_port_from_dockerfile($this->dockerfile);
if (!$port) {
$port = 80;
}
$application = Application::create([ $application = Application::create([
'name' => 'dockerfile-' . new Cuid2(7), 'name' => 'dockerfile-' . new Cuid2(7),
'repository_project_id' => 0, 'repository_project_id' => 0,

4
bootstrap/helpers/docker.php
View File

@ -113,7 +113,7 @@ function generateApplicationContainerName(Application $application, $pull_reques
return $application->uuid . '-' . $now; return $application->uuid . '-' . $now;
} }
} }
function get_port_from_dockerfile($dockerfile): int function get_port_from_dockerfile($dockerfile): int|null
{ {
$dockerfile_array = explode("\n", $dockerfile); $dockerfile_array = explode("\n", $dockerfile);
$found_exposed_port = null; $found_exposed_port = null;
@ -127,7 +127,7 @@ function get_port_from_dockerfile($dockerfile): int
if ($found_exposed_port) { if ($found_exposed_port) {
return (int)$found_exposed_port->value(); return (int)$found_exposed_port->value();
} }
return 80; return null;
} }
function defaultLabels($id, $name, $pull_request_id = 0, string $type = 'application', $subType = null, $subId = null) function defaultLabels($id, $name, $pull_request_id = 0, string $type = 'application', $subType = null, $subId = null)