From e695ae382cdee0ada4f3d239538914d580f44dcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9?= Date: Sun, 29 Jul 2018 00:39:56 +0200 Subject: [PATCH] [Compose] Disable oom killer for watchdog and dockerapi [Compose] Add compose project name to php-fpm-mailcow --- docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index b36efe38..a5cd7da5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -125,6 +125,7 @@ services: - SMTP_PORT=${SMTP_PORT:-25} - API_KEY=${API_KEY:-invalid} - API_ALLOW_FROM=${API_ALLOW_FROM:-invalid} + - COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME:-mailcow-dockerized} restart: always dns: - ${IPV4_NETWORK:-172.22.1}.254 @@ -330,6 +331,7 @@ services: # Debug #command: /watchdog.sh build: ./data/Dockerfiles/watchdog + oom_kill_disable: true volumes: - rspamd-sock:/rspamd-sock restart: always @@ -354,7 +356,7 @@ services: image: mailcow/dockerapi:1.13 restart: always build: ./data/Dockerfiles/dockerapi - oom_score_adj: -10 + oom_kill_disable: true environment: - TZ=${TZ} volumes: