From aefdc76805672e2e3455496f23b9e767bafe6af6 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sun, 1 Oct 2023 17:27:12 +0200
Subject: [PATCH] fix: dockerfile expose is not overwritten

---
 app/Http/Livewire/Project/New/SimpleDockerfile.php | 3 +++
 bootstrap/helpers/docker.php                       | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Http/Livewire/Project/New/SimpleDockerfile.php b/app/Http/Livewire/Project/New/SimpleDockerfile.php
index be65475a3..8a1d2c024 100644
--- a/app/Http/Livewire/Project/New/SimpleDockerfile.php
+++ b/app/Http/Livewire/Project/New/SimpleDockerfile.php
@@ -45,6 +45,9 @@ public function submit()
         $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
 
         $port = get_port_from_dockerfile($this->dockerfile);
+        if (!$port) {
+            $port = 80;
+        }
         $application = Application::create([
             'name' => 'dockerfile-' . new Cuid2(7),
             'repository_project_id' => 0,
diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php
index fdb682a72..e22a3596c 100644
--- a/bootstrap/helpers/docker.php
+++ b/bootstrap/helpers/docker.php
@@ -113,7 +113,7 @@ function generateApplicationContainerName(Application $application, $pull_reques
         return $application->uuid . '-' . $now;
     }
 }
-function get_port_from_dockerfile($dockerfile): int
+function get_port_from_dockerfile($dockerfile): int|null
 {
     $dockerfile_array = explode("\n", $dockerfile);
     $found_exposed_port = null;
@@ -127,7 +127,7 @@ function get_port_from_dockerfile($dockerfile): int
     if ($found_exposed_port) {
         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)