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

fix: server ip could be hostname in self-hosted

Browse Source
This commit is contained in:
Andras Bacsai
2023-10-13 09:31:44 +02:00
parent 8f9949160c
commit b196c138d9
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Livewire/Server/Form.php
View File

@@ -21,7 +21,7 @@ class Form extends Component
protected $rules = [ protected $rules = [
'server.name' => 'required|min:6', 'server.name' => 'required|min:6',
'server.description' => 'nullable', 'server.description' => 'nullable',
'server.ip' => 'required|ip', 'server.ip' => 'required',
'server.user' => 'required', 'server.user' => 'required',
'server.port' => 'required', 'server.port' => 'required',
'server.settings.is_cloudflare_tunnel' => 'required', 'server.settings.is_cloudflare_tunnel' => 'required',
@@ -45,7 +45,8 @@ class Form extends Component
$this->wildcard_domain = $this->server->settings->wildcard_domain; $this->wildcard_domain = $this->server->settings->wildcard_domain;
$this->cleanup_after_percentage = $this->server->settings->cleanup_after_percentage; $this->cleanup_after_percentage = $this->server->settings->cleanup_after_percentage;
} }
public function serverRefresh() { public function serverRefresh()
{
$this->validateServer(); $this->validateServer();
} }
public function instantSave() public function instantSave()
@@ -61,7 +62,8 @@ class Form extends Component
$activity = InstallDocker::run($this->server); $activity = InstallDocker::run($this->server);
$this->emit('newMonitorActivity', $activity->id); $this->emit('newMonitorActivity', $activity->id);
} }
public function checkLocalhostConnection() { public function checkLocalhostConnection()
{
$uptime = $this->server->validateConnection(); $uptime = $this->server->validateConnection();
if ($uptime) { if ($uptime) {
$this->emit('success', 'Server is reachable.'); $this->emit('success', 'Server is reachable.');
@@ -80,7 +82,7 @@ class Form extends Component
if ($uptime) { if ($uptime) {
$install && $this->emit('success', 'Server is reachable.'); $install && $this->emit('success', 'Server is reachable.');
} else { } else {
$install &&$this->emit('error', 'Server is not reachable. Please check your connection and configuration.'); $install && $this->emit('error', 'Server is not reachable. Please check your connection and configuration.');
return; return;
} }
$dockerInstalled = $this->server->validateDockerEngine(); $dockerInstalled = $this->server->validateDockerEngine();
@@ -120,7 +122,15 @@ class Form extends Component
} }
public function submit() public function submit()
{ {
$validDomainsForServers = collect(['host.docker.internal', 'coolify-testing-host']);
if ($validDomainsForServers->contains($this->server->ip)) {
$this->validate(); $this->validate();
} else {
$this->validate();
$this->validate([
'server.ip' => 'required|ip',
]);
}
$uniqueIPs = Server::all()->reject(function (Server $server) { $uniqueIPs = Server::all()->reject(function (Server $server) {
return $server->id === $this->server->id; return $server->id === $this->server->id;
})->pluck('ip')->toArray(); })->pluck('ip')->toArray();