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

Merge pull request #1237 from coollabsio/next

Browse Source 
Lots of fixes
This commit is contained in:
Andras Bacsai 2023-09-18 13:06:43 +02:00 committed by GitHub
commit a50e1e2f0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Actions/Proxy/StartProxy.php
View File

@ -6,11 +6,13 @@
use App\Enums\ProxyTypes;
use App\Models\Server;
use Illuminate\Support\Str;
use Lorisleiva\Actions\Concerns\AsAction;
use Spatie\Activitylog\Models\Activity;
class StartProxy
{
public function __invoke(Server $server, bool $async = true): Activity|string
use AsAction;
public function handle(Server $server, bool $async = true): Activity|string
{
$proxyType = data_get($server,'proxy.type');
if ($proxyType === 'none') {

12
app/Http/Livewire/Boarding/Index.php
View File

@ -39,6 +39,10 @@ class Index extends Component
public ?Project $createdProject = null;
public bool $dockerInstallationStarted = false;
public string $localhostPublicKey;
public bool $localhostReachable = true;
public function mount()
{
$this->privateKeyName = generate_random_name();
@ -94,6 +98,7 @@ public function setServerType(string $type)
if (!$this->createdServer) {
return $this->emit('error', 'Localhost server is not found. Something went wrong during installation. Please try to reinstall or contact support.');
}
$this->localhostPublicKey = $this->createdServer->privateKey->publicKey();
return $this->validateServer('localhost');
} elseif ($this->selectedServerType === 'remote') {
$this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
@ -188,7 +193,7 @@ public function saveServer()
$this->createdServer->save();
$this->validateServer();
}
public function validateServer(?string $type = null)
public function validateServer()
{
try {
$customErrorMessage = "Server is not reachable:";
@ -199,7 +204,12 @@ public function validateServer(?string $type = null)
$this->createdServer->settings->update([
'is_reachable' => true,
]);
} catch (\Throwable $e) {
$this->localhostReachable = false;
return handleError(error: $e, customErrorMessage: $customErrorMessage, livewire: $this);
}
try {
$dockerVersion = instant_remote_process(["docker version|head -2|grep -i version| awk '{print $2}'"], $this->createdServer, true);
$dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);
if (is_null($dockerVersion)) {

3
app/Http/Livewire/Project/Application/Heading.php
View File

@ -68,10 +68,11 @@ public function stop()
["docker rm -f {$containerName}"],
$this->application->destination->server
);
$this->application->status = 'stopped';
$this->application->status = 'exited';
$this->application->save();
// $this->application->environment->project->team->notify(new StatusChanged($this->application));
}
}
$this->application->refresh();
}
}

2
app/Http/Livewire/Project/Database/Heading.php
View File

@ -43,7 +43,7 @@ public function stop()
stopPostgresProxy($this->database);
$this->database->is_public = false;
}
$this->database->status = 'stopped';
$this->database->status = 'exited';
$this->database->save();
$this->check_status();
// $this->database->environment->project->team->notify(new StatusChanged($this->database));

2
app/Http/Livewire/Server/Proxy/Deploy.php
View File

@ -27,7 +27,7 @@ public function startProxy()
SaveConfiguration::run($this->server);
}
$activity = resolve(StartProxy::class)($this->server);
$activity = StartProxy::run($this->server);
$this->emit('newMonitorActivity', $activity->id);
} catch (\Throwable $e) {
return handleError($e);

2
app/Jobs/ApplicationDeploymentJob.php
View File

@ -89,7 +89,7 @@ public function __construct(int $application_deployment_queue_id)
$this->is_debug_enabled = $this->application->settings->is_debug_enabled;
$this->container_name = generateApplicationContainerName($this->application->uuid, $this->pull_request_id);
addPrivateKeyToSshAgent($this->server);
savePrivateKeyToFs($this->server);
$this->saved_outputs = collect();
// Set preview fqdn

2
app/Jobs/ContainerStatusJob.php
View File

@ -82,7 +82,7 @@ public function handle(): void
})->first();
if (!$foundProxyContainer) {
if ($this->server->isProxyShouldRun()) {
resolve(StartProxy::class)($this->server, false);
StartProxy::run($this->server, false);
$this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server));
}
} else {

4
bootstrap/helpers/remoteProcess.php
View File

@ -53,7 +53,7 @@ function remote_process(
// }
// // processWithEnv()->run("echo '{$server->privateKey->private_key}' | ssh-add -d -");
// }
function addPrivateKeyToSshAgent(Server $server)
function savePrivateKeyToFs(Server $server)
{
if (data_get($server, 'privateKey.private_key') === null) {
throw new \Exception("Server {$server->name} does not have a private key");
@ -70,7 +70,7 @@ function generateSshCommand(Server $server, string $command, bool $isMux = true)
{
$user = $server->user;
$port = $server->port;
$privateKeyLocation = addPrivateKeyToSshAgent($server);
$privateKeyLocation = savePrivateKeyToFs($server);
$timeout = config('constants.ssh.command_timeout');
$connectionTimeout = config('constants.ssh.connection_timeout');
$serverInterval = config('constants.ssh.server_interval');

2
config/sentry.php
View File

@ -7,7 +7,7 @@
// The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => '4.0.0-beta.41',
'release' => '4.0.0-beta.42',
// When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'),

2
config/toaster.php
View File

@ -30,7 +30,7 @@
*
* Minimum: 3000 (in milliseconds)
*/
'duration' => 1500,
'duration' => 3000,
/**
* The horizontal position of each toast.

2
config/version.php
View File

@ -1,3 +1,3 @@
<?php
return '4.0.0-beta.41';
return '4.0.0-beta.42';

12
resources/views/livewire/boarding/index.blade.php
View File

@ -46,9 +46,21 @@
<x-forms.button class="justify-center box" wire:target="setServerType('localhost')"
wire:click="setServerType('localhost')">Localhost
</x-forms.button>
<x-forms.button class="justify-center box" wire:target="setServerType('remote')"
wire:click="setServerType('remote')">Remote Server
</x-forms.button>
@if (!$localhostReachable)
Localhost is not reachable with the following public key.
<br /> <br />
Please make sure you have the correct public key in your ~/.ssh/authorized_keys file for user
'root' or skip the boarding process and add a new private key manually to Coolify and to the
server.
<x-forms.input readonly id="localhostPublicKey"></x-forms.input>
<x-forms.button class="box" wire:target="setServerType('localhost')"
wire:click="setServerType('localhost')">Check again
</x-forms.button>
@endif
</x-slot:actions>
<x-slot:explanation>
<p>Servers are the main building blocks, as they will host your applications, databases,

2
versions.json
View File

@ -4,7 +4,7 @@
"version": "3.12.36"
},
"v4": {
"version": "4.0.0-beta.41"
"version": "4.0.0-beta.42"
}
}
}