Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into v2

Browse source
This commit is contained in:
Matthew Penner 2021-09-15 10:30:40 -06:00
commit 23a160b9e1
No known key found for this signature in database
GPG key ID: 030E4AB751DC756F
4 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/Services/Servers/ServerConfigurationStructureService.php
View file

@ -58,9 +58,13 @@ class ServerConfigurationStructureService
'cpu_limit' => $server->cpu,
'threads' => $server->threads,
'disk_space' => $server->disk,
'oom_disabled' => $server->oom_disabled,
],
'container' => [
'image' => $server->image,
// This field is deprecated — use the value in the "build" block.
//
// TODO: remove this key in V2.
'oom_disabled' => $server->oom_disabled,
'requires_rebuild' => false,
],