remove oom disable
This commit is contained in:
parent
8bf1b9e707
commit
89614fc047
@ -19,7 +19,6 @@ class Kernel extends ConsoleKernel
|
|||||||
|
|
||||||
$schedule->job(new InstanceDockerCleanupJob)->everyFiveMinutes();
|
$schedule->job(new InstanceDockerCleanupJob)->everyFiveMinutes();
|
||||||
$schedule->job(new InstanceAutoUpdateJob)->everyFifteenMinutes();
|
$schedule->job(new InstanceAutoUpdateJob)->everyFifteenMinutes();
|
||||||
// Disabled for now, added oom_kill_disable: true to docker-compose.yml
|
|
||||||
// $schedule->job(new InstanceProxyCheckJob)->everyMinute();
|
// $schedule->job(new InstanceProxyCheckJob)->everyMinute();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,7 +13,6 @@ class ResourceLimits extends Component
|
|||||||
'application.limits_memory_swap' => 'required|string',
|
'application.limits_memory_swap' => 'required|string',
|
||||||
'application.limits_memory_swappiness' => 'required|integer|min:0|max:100',
|
'application.limits_memory_swappiness' => 'required|integer|min:0|max:100',
|
||||||
'application.limits_memory_reservation' => 'required|string',
|
'application.limits_memory_reservation' => 'required|string',
|
||||||
'application.limits_memory_oom_kill' => 'boolean',
|
|
||||||
'application.limits_cpus' => 'nullable',
|
'application.limits_cpus' => 'nullable',
|
||||||
'application.limits_cpuset' => 'nullable',
|
'application.limits_cpuset' => 'nullable',
|
||||||
'application.limits_cpu_shares' => 'nullable',
|
'application.limits_cpu_shares' => 'nullable',
|
||||||
|
@ -316,7 +316,6 @@ COPY --from={$this->application->uuid}:{$this->git_commit}-build /app/{$this->ap
|
|||||||
'memswap_limit' => $this->application->limits_memory_swap,
|
'memswap_limit' => $this->application->limits_memory_swap,
|
||||||
'mem_swappiness' => $this->application->limits_memory_swappiness,
|
'mem_swappiness' => $this->application->limits_memory_swappiness,
|
||||||
'mem_reservation' => $this->application->limits_memory_reservation,
|
'mem_reservation' => $this->application->limits_memory_reservation,
|
||||||
'oom_kill_disable' => $this->application->limits_memory_oom_kill,
|
|
||||||
'cpus' => $this->application->limits_cpus,
|
'cpus' => $this->application->limits_cpus,
|
||||||
'cpuset' => $this->application->limits_cpuset,
|
'cpuset' => $this->application->limits_cpuset,
|
||||||
'cpu_shares' => $this->application->limits_cpu_shares,
|
'cpu_shares' => $this->application->limits_cpu_shares,
|
||||||
|
@ -43,7 +43,6 @@ class Application extends BaseModel
|
|||||||
|
|
||||||
public $casts = [
|
public $casts = [
|
||||||
'previews' => SchemalessAttributes::class,
|
'previews' => SchemalessAttributes::class,
|
||||||
'limits_memory_oom_kill' => 'boolean',
|
|
||||||
];
|
];
|
||||||
public function scopeWithExtraAttributes(): Builder
|
public function scopeWithExtraAttributes(): Builder
|
||||||
{
|
{
|
||||||
|
@ -27,7 +27,6 @@ if (!function_exists('getProxyConfiguration')) {
|
|||||||
"networks" => $array_of_networks->toArray(),
|
"networks" => $array_of_networks->toArray(),
|
||||||
"services" => [
|
"services" => [
|
||||||
"traefik" => [
|
"traefik" => [
|
||||||
"oom_kill_disable" => true,
|
|
||||||
"container_name" => "coolify-proxy",
|
"container_name" => "coolify-proxy",
|
||||||
"image" => "traefik:v2.10",
|
"image" => "traefik:v2.10",
|
||||||
"restart" => "always",
|
"restart" => "always",
|
||||||
|
@ -59,7 +59,6 @@ return new class extends Migration
|
|||||||
$table->string('limits_memory_swap')->default("0");
|
$table->string('limits_memory_swap')->default("0");
|
||||||
$table->integer('limits_memory_swappiness')->default(60);
|
$table->integer('limits_memory_swappiness')->default(60);
|
||||||
$table->string('limits_memory_reservation')->default("0");
|
$table->string('limits_memory_reservation')->default("0");
|
||||||
$table->boolean('limits_memory_oom_kill')->default(false);
|
|
||||||
|
|
||||||
$table->string('limits_cpus')->default("0");
|
$table->string('limits_cpus')->default("0");
|
||||||
$table->string('limits_cpuset')->nullable()->default("0");
|
$table->string('limits_cpuset')->nullable()->default("0");
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
version: '3.8'
|
version: '3.8'
|
||||||
services:
|
services:
|
||||||
coolify:
|
coolify:
|
||||||
oom_kill_disable: true
|
|
||||||
image: "ghcr.io/coollabsio/coolify:${LATEST_IMAGE:-4.0.0-nightly.0}"
|
image: "ghcr.io/coollabsio/coolify:${LATEST_IMAGE:-4.0.0-nightly.0}"
|
||||||
volumes:
|
volumes:
|
||||||
- type: bind
|
- type: bind
|
||||||
@ -42,7 +41,6 @@ services:
|
|||||||
postgres:
|
postgres:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
postgres:
|
postgres:
|
||||||
oom_kill_disable: true
|
|
||||||
volumes:
|
volumes:
|
||||||
- coolify-db:/var/lib/postgresql/data
|
- coolify-db:/var/lib/postgresql/data
|
||||||
environment:
|
environment:
|
||||||
@ -61,7 +59,6 @@ services:
|
|||||||
retries: 5
|
retries: 5
|
||||||
timeout: 2s
|
timeout: 2s
|
||||||
redis:
|
redis:
|
||||||
oom_kill_disable: true
|
|
||||||
command: redis-server --save 20 1 --loglevel warning --requirepass ${REDIS_PASSWORD}
|
command: redis-server --save 20 1 --loglevel warning --requirepass ${REDIS_PASSWORD}
|
||||||
environment:
|
environment:
|
||||||
REDIS_PASSWORD: "${REDIS_PASSWORD}"
|
REDIS_PASSWORD: "${REDIS_PASSWORD}"
|
||||||
|
@ -16,6 +16,5 @@
|
|||||||
id="application.limits_memory_swappiness" />
|
id="application.limits_memory_swappiness" />
|
||||||
<x-forms.input placeholder="69b or 420k or 1337m or 1g" label="Soft Limit"
|
<x-forms.input placeholder="69b or 420k or 1337m or 1g" label="Soft Limit"
|
||||||
id="application.limits_memory_reservation" />
|
id="application.limits_memory_reservation" />
|
||||||
<x-forms.checkbox label="Disable OOM kill" id="application.limits_memory_oom_kill" />
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user