From dc6eea5142c063e26408a685b66fbb7754408ec2 Mon Sep 17 00:00:00 2001 From: andryyy Date: Tue, 3 Sep 2019 15:04:18 +0200 Subject: [PATCH] [Compose] Should fix the crash on Ubuntus latest kernel - perhaps the network_mode host combined with a dns flag panics the horscht? --- docker-compose.yml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9085d8db..d03ee8fc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,8 +30,6 @@ services: - MYSQL_USER=${DBUSER} - MYSQL_PASSWORD=${DBPASS} restart: always - dns: - - ${IPV4_NETWORK:-172.22.1}.254 ports: - "${SQL_PORT:-127.0.0.1:13306}:3306" networks: @@ -46,8 +44,6 @@ services: restart: always environment: - TZ=${TZ} - dns: - - ${IPV4_NETWORK:-172.22.1}.254 networks: mailcow-network: ipv4_address: ${IPV4_NETWORK:-172.22.1}.249 @@ -63,8 +59,6 @@ services: - SKIP_CLAMD=${SKIP_CLAMD:-n} volumes: - ./data/conf/clamav/:/etc/clamav/ - dns: - - ${IPV4_NETWORK:-172.22.1}.254 networks: mailcow-network: aliases: @@ -137,8 +131,6 @@ services: - SKIP_SOLR=${SKIP_SOLR:-y} - ALLOW_ADMIN_EMAIL_LOGIN=${ALLOW_ADMIN_EMAIL_LOGIN:-n} restart: always - dns: - - ${IPV4_NETWORK:-172.22.1}.254 networks: mailcow-network: aliases: @@ -165,8 +157,6 @@ services: - mysql-socket-vol-1:/var/run/mysqld/ - sogo-web-vol-1:/sogo_web restart: always - dns: - - ${IPV4_NETWORK:-172.22.1}.254 networks: mailcow-network: ipv4_address: ${IPV4_NETWORK:-172.22.1}.248 @@ -217,8 +207,6 @@ services: nofile: soft: 20000 hard: 40000 - dns: - - ${IPV4_NETWORK:-172.22.1}.254 hostname: ${MAILCOW_HOSTNAME} networks: mailcow-network: @@ -260,8 +248,6 @@ services: memcached-mailcow: image: memcached:alpine restart: always - dns: - - ${IPV4_NETWORK:-172.22.1}.254 networks: mailcow-network: aliases: @@ -303,8 +289,6 @@ services: - "${HTTPS_BIND:-0.0.0.0}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}" - "${HTTP_BIND:-0.0.0.0}:${HTTP_PORT:-80}:${HTTP_PORT:-80}" restart: always - dns: - - ${IPV4_NETWORK:-172.22.1}.254 networks: mailcow-network: aliases: @@ -315,8 +299,6 @@ services: - nginx-mailcow image: mailcow/acme:1.61 build: ./data/Dockerfiles/acme - dns: - - ${IPV4_NETWORK:-172.22.1}.254 environment: - LOG_LINES=${LOG_LINES:-9999} - ADDITIONAL_SAN=${ADDITIONAL_SAN} @@ -360,8 +342,6 @@ services: - SNAT_TO_SOURCE=${SNAT_TO_SOURCE:-n} - SNAT6_TO_SOURCE=${SNAT6_TO_SOURCE:-n} network_mode: "host" - dns: - - ${IPV4_NETWORK:-172.22.1}.254 volumes: - /lib/modules:/lib/modules:ro @@ -391,8 +371,6 @@ services: - SKIP_CLAMD=${SKIP_CLAMD:-n} - SKIP_LETS_ENCRYPT=${SKIP_LETS_ENCRYPT:-n} - HTTPS_PORT=${HTTPS_PORT:-443} - dns: - - ${IPV4_NETWORK:-172.22.1}.254 networks: mailcow-network: aliases: @@ -419,8 +397,6 @@ services: restart: always volumes: - solr-vol-1:/opt/solr/server/solr/dovecot-fts/data - dns: - - ${IPV4_NETWORK:-172.22.1}.254 environment: - TZ=${TZ} - SOLR_HEAP=${SOLR_HEAP:-1024}