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

fix: sslip for localhost

Browse Source
This commit is contained in:
Andras Bacsai 2023-09-28 10:53:00 +02:00
parent 199881c596
commit b046a3e9f7
6 changed files with 24 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Livewire/Project/New/GithubPrivateRepository.php
View File

@ -144,10 +144,8 @@ class GithubPrivateRepository extends Component
$application->settings->is_static = $this->is_static; $application->settings->is_static = $this->is_static;
$application->settings->save(); $application->settings->save();
$application->fqdn = "http://{$application->uuid}.{$destination->server->ip}.sslip.io"; $sslip = sslip($destination->server);
if (isDev()) { $application->fqdn = "http://{$application->uuid}.$sslip";
$application->fqdn = "http://{$application->uuid}.127.0.0.1.sslip.io";
}
$application->name = generate_application_name($this->selected_repository_owner . '/' . $this->selected_repository_repo, $this->selected_branch_name, $application->uuid); $application->name = generate_application_name($this->selected_repository_owner . '/' . $this->selected_repository_repo, $this->selected_branch_name, $application->uuid);
$application->save(); $application->save();

6
app/Http/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
View File

@ -112,10 +112,8 @@ class GithubPrivateRepositoryDeployKey extends Component
$application->settings->is_static = $this->is_static; $application->settings->is_static = $this->is_static;
$application->settings->save(); $application->settings->save();
$application->fqdn = "http://{$application->uuid}.{$destination->server->ip}.sslip.io"; $sslip = sslip($destination->server);
if (isDev()) { $application->fqdn = "http://{$application->uuid}.$sslip";
$application->fqdn = "http://{$application->uuid}.127.0.0.1.sslip.io";
}
$application->name = generate_random_name($application->uuid); $application->name = generate_random_name($application->uuid);
$application->save(); $application->save();

6
app/Http/Livewire/Project/New/PublicGitRepository.php
View File

@ -156,10 +156,8 @@ class PublicGitRepository extends Component
$application->settings->is_static = $this->is_static; $application->settings->is_static = $this->is_static;
$application->settings->save(); $application->settings->save();
$application->fqdn = "http://{$application->uuid}.{$destination->server->ip}.sslip.io"; $sslip = sslip($destination->server);
if (isDev()) { $application->fqdn = "http://{$application->uuid}.$sslip";
$application->fqdn = "http://{$application->uuid}.127.0.0.1.sslip.io";
}
$application->name = generate_application_name($this->git_repository, $this->git_branch, $application->uuid); $application->name = generate_application_name($this->git_repository, $this->git_branch, $application->uuid);
$application->save(); $application->save();

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

@ -60,13 +60,10 @@ CMD ["nginx", "-g", "daemon off;"]
'source_type' => GithubApp::class 'source_type' => GithubApp::class
]); ]);
$fqdn = "http://{$application->uuid}.{$destination->server->ip}.sslip.io"; $sslip = sslip($destination->server);
if (isDev()) {
$fqdn = "http://{$application->uuid}.127.0.0.1.sslip.io";
}
$application->update([ $application->update([
'name' => 'dockerfile-' . $application->uuid, 'name' => 'dockerfile-' . $application->uuid,
'fqdn' => $fqdn 'fqdn' => "http://{$application->uuid}.$sslip"
]); ]);
redirect()->route('project.application.configuration', [ redirect()->route('project.application.configuration', [

36
app/Models/Service.php
View File

@ -109,37 +109,7 @@ class Service extends BaseModel
} }
instant_remote_process($commands, $this->server); instant_remote_process($commands, $this->server);
} }
private function sslip(Server $server)
{
if (isDev()) {
return "127.0.0.1.sslip.io";
}
return "{$server->ip}.sslip.io";
}
// private function generateFqdn($serviceVariables, $serviceName, Collection $configuration)
// {
// // Add sslip.io to the service
// $defaultUsableFqdn = null;
// $sslip = $this->sslip($this->server);
// if (Str::of($serviceVariables)->contains('SERVICE_FQDN') || Str::of($serviceVariables)->contains('SERVICE_URL')) {
// $defaultUsableFqdn = "http://$serviceName-{$this->uuid}.{$sslip}";
// }
// if ($configuration->count() > 0) {
// foreach ($configuration as $requiredFqdn) {
// $requiredFqdn = (array)$requiredFqdn;
// $name = data_get($requiredFqdn, 'name');
// $path = data_get($requiredFqdn, 'path');
// $customFqdn = data_get($requiredFqdn, 'customFqdn');
// if ($serviceName === $name) {
// $defaultUsableFqdn = "http://$serviceName-{$this->uuid}.{$sslip}{$path}";
// if ($customFqdn) {
// $defaultUsableFqdn = "http://$customFqdn-{$this->uuid}.{$sslip}{$path}";
// }
// }
// }
// }
// return $defaultUsableFqdn ?? null;
// }
public function parse(bool $isNew = false): Collection public function parse(bool $isNew = false): Collection
{ {
// ray()->clearAll(); // ray()->clearAll();
@ -374,7 +344,7 @@ class Service extends BaseModel
} }
if ($key->startsWith('SERVICE_FQDN')) { if ($key->startsWith('SERVICE_FQDN')) {
if (is_null(data_get($savedService, 'fqdn'))) { if (is_null(data_get($savedService, 'fqdn'))) {
$sslip = $this->sslip($this->server); $sslip = sslip($this->server);
$fqdn = "http://$containerName.$sslip"; $fqdn = "http://$containerName.$sslip";
if (substr_count($key->value(), '_') === 2 && $key->contains("=")) { if (substr_count($key->value(), '_') === 2 && $key->contains("=")) {
$path = $value->value(); $path = $value->value();
@ -409,7 +379,7 @@ class Service extends BaseModel
$forService = $value->afterLast('_'); $forService = $value->afterLast('_');
$generatedValue = null; $generatedValue = null;
if ($command->value() === 'FQDN' || $command->value() === 'URL') { if ($command->value() === 'FQDN' || $command->value() === 'URL') {
$sslip = $this->sslip($this->server); $sslip = sslip($this->server);
$fqdn = "http://$containerName.$sslip"; $fqdn = "http://$containerName.$sslip";
if ($foundEnv) { if ($foundEnv) {
$fqdn = data_get($foundEnv, 'value'); $fqdn = data_get($foundEnv, 'value');

13
bootstrap/helpers/shared.php
View File

@ -1,6 +1,7 @@
<?php <?php
use App\Models\InstanceSettings; use App\Models\InstanceSettings;
use App\Models\Server;
use App\Models\Team; use App\Models\Team;
use App\Models\User; use App\Models\User;
use App\Notifications\Channels\DiscordChannel; use App\Notifications\Channels\DiscordChannel;
@ -393,3 +394,15 @@ function data_get_str($data, $key, $default = null): Stringable
$str = data_get($data, $key, $default) ?? $default; $str = data_get($data, $key, $default) ?? $default;
return Str::of($str); return Str::of($str);
} }
function sslip(Server $server)
{
if (isDev()) {
return "127.0.0.1.sslip.io";
}
if ($server->ip === 'host.docker.internal') {
$baseIp = base_ip();
return "$baseIp.sslip.io";
}
return "{$server->ip}.sslip.io";
}