remove oom disable

This commit is contained in:
Andras Bacsai 2023-05-26 09:59:49 +02:00
parent 8bf1b9e707
commit 89614fc047
8 changed files with 0 additions and 10 deletions

View File

@ -19,7 +19,6 @@ protected function schedule(Schedule $schedule): void
$schedule->job(new InstanceDockerCleanupJob)->everyFiveMinutes();
$schedule->job(new InstanceAutoUpdateJob)->everyFifteenMinutes();
// Disabled for now, added oom_kill_disable: true to docker-compose.yml
// $schedule->job(new InstanceProxyCheckJob)->everyMinute();
}

View File

@ -13,7 +13,6 @@ class ResourceLimits extends Component
'application.limits_memory_swap' => 'required|string',
'application.limits_memory_swappiness' => 'required|integer|min:0|max:100',
'application.limits_memory_reservation' => 'required|string',
'application.limits_memory_oom_kill' => 'boolean',
'application.limits_cpus' => 'nullable',
'application.limits_cpuset' => 'nullable',
'application.limits_cpu_shares' => 'nullable',

View File

@ -316,7 +316,6 @@ private function generate_docker_compose()
'memswap_limit' => $this->application->limits_memory_swap,
'mem_swappiness' => $this->application->limits_memory_swappiness,
'mem_reservation' => $this->application->limits_memory_reservation,
'oom_kill_disable' => $this->application->limits_memory_oom_kill,
'cpus' => $this->application->limits_cpus,
'cpuset' => $this->application->limits_cpuset,
'cpu_shares' => $this->application->limits_cpu_shares,

View File

@ -43,7 +43,6 @@ protected static function booted()
public $casts = [
'previews' => SchemalessAttributes::class,
'limits_memory_oom_kill' => 'boolean',
];
public function scopeWithExtraAttributes(): Builder
{

View File

@ -27,7 +27,6 @@ function getProxyConfiguration(Server $server)
"networks" => $array_of_networks->toArray(),
"services" => [
"traefik" => [
"oom_kill_disable" => true,
"container_name" => "coolify-proxy",
"image" => "traefik:v2.10",
"restart" => "always",

View File

@ -59,7 +59,6 @@ public function up(): void
$table->string('limits_memory_swap')->default("0");
$table->integer('limits_memory_swappiness')->default(60);
$table->string('limits_memory_reservation')->default("0");
$table->boolean('limits_memory_oom_kill')->default(false);
$table->string('limits_cpus')->default("0");
$table->string('limits_cpuset')->nullable()->default("0");

View File

@ -1,7 +1,6 @@
version: '3.8'
services:
coolify:
oom_kill_disable: true
image: "ghcr.io/coollabsio/coolify:${LATEST_IMAGE:-4.0.0-nightly.0}"
volumes:
- type: bind
@ -42,7 +41,6 @@ services:
postgres:
condition: service_healthy
postgres:
oom_kill_disable: true
volumes:
- coolify-db:/var/lib/postgresql/data
environment:
@ -61,7 +59,6 @@ services:
retries: 5
timeout: 2s
redis:
oom_kill_disable: true
command: redis-server --save 20 1 --loglevel warning --requirepass ${REDIS_PASSWORD}
environment:
REDIS_PASSWORD: "${REDIS_PASSWORD}"

View File

@ -16,6 +16,5 @@
id="application.limits_memory_swappiness" />
<x-forms.input placeholder="69b or 420k or 1337m or 1g" label="Soft Limit"
id="application.limits_memory_reservation" />
<x-forms.checkbox label="Disable OOM kill" id="application.limits_memory_oom_kill" />
</form>
</div>