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

Merge pull request #1812 from coollabsio/next

Browse Source 
v4.0.0-beta.236
This commit is contained in:
Andras Bacsai
2024-03-05 16:25:08 +01:00
committed by GitHub
parent 3dd00dd91a fadff798a7
commit 46ed17c99e
5 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/Http/Controllers/Api/Server.php
View File

@@ -19,11 +19,11 @@ class Server extends Controller
$server['is_usable'] = $server->settings->is_usable; $server['is_usable'] = $server->settings->is_usable;
return $server; return $server;
}); });
ray($servers);
return response()->json($servers); return response()->json($servers);
} }
public function server_by_uuid(Request $request) public function server_by_uuid(Request $request)
{ {
$with_resources = $request->query('resources');
$teamId = get_team_id_from_token(); $teamId = get_team_id_from_token();
if (is_null($teamId)) { if (is_null($teamId)) {
return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400); return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
@@ -32,23 +32,26 @@ class Server extends Controller
if (is_null($server)) { if (is_null($server)) {
return response()->json(['error' => 'Server not found.'], 404); return response()->json(['error' => 'Server not found.'], 404);
} }
$server->load(['settings']); if ($with_resources) {
$server['resources'] = $server->definedResources()->map(function ($resource) { $server['resources'] = $server->definedResources()->map(function ($resource) {
$payload = [ $payload = [
'id' => $resource->id, 'id' => $resource->id,
'uuid' => $resource->uuid, 'uuid' => $resource->uuid,
'name' => $resource->name, 'name' => $resource->name,
'type' => $resource->type(), 'type' => $resource->type(),
'created_at' => $resource->created_at, 'created_at' => $resource->created_at,
'updated_at' => $resource->updated_at, 'updated_at' => $resource->updated_at,
]; ];
if ($resource->type() === 'service') { if ($resource->type() === 'service') {
$payload['status'] = $resource->status(); $payload['status'] = $resource->status();
} else { } else {
$payload['status'] = $resource->status; $payload['status'] = $resource->status;
} }
return $payload; return $payload;
}); });
} else {
$server->load(['settings']);
}
return response()->json($server); return response()->json($server);
} }
} }

2
app/Livewire/Boarding/Index.php
View File

@@ -199,7 +199,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
} }
public function installServer() public function installServer()
{ {
$this->dispatch('validateServer', true); $this->dispatch('init', true);
} }
public function validateServer() public function validateServer()
{ {

2
config/sentry.php
View File

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

2
config/version.php
View File

@@ -1,3 +1,3 @@
<?php <?php
return '4.0.0-beta.235'; return '4.0.0-beta.236';

2
versions.json
View File

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