[Compose] Should fix the crash on Ubuntus latest kernel - perhaps the network_mode host combined with a dns flag panics the horscht?

master
andryyy 2019-09-03 15:04:18 +02:00
parent 1be5caf168
commit dc6eea5142
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
1 changed files with 0 additions and 24 deletions

View File

@ -30,8 +30,6 @@ services:
- MYSQL_USER=${DBUSER} - MYSQL_USER=${DBUSER}
- MYSQL_PASSWORD=${DBPASS} - MYSQL_PASSWORD=${DBPASS}
restart: always restart: always
dns:
- ${IPV4_NETWORK:-172.22.1}.254
ports: ports:
- "${SQL_PORT:-127.0.0.1:13306}:3306" - "${SQL_PORT:-127.0.0.1:13306}:3306"
networks: networks:
@ -46,8 +44,6 @@ services:
restart: always restart: always
environment: environment:
- TZ=${TZ} - TZ=${TZ}
dns:
- ${IPV4_NETWORK:-172.22.1}.254
networks: networks:
mailcow-network: mailcow-network:
ipv4_address: ${IPV4_NETWORK:-172.22.1}.249 ipv4_address: ${IPV4_NETWORK:-172.22.1}.249
@ -63,8 +59,6 @@ services:
- SKIP_CLAMD=${SKIP_CLAMD:-n} - SKIP_CLAMD=${SKIP_CLAMD:-n}
volumes: volumes:
- ./data/conf/clamav/:/etc/clamav/ - ./data/conf/clamav/:/etc/clamav/
dns:
- ${IPV4_NETWORK:-172.22.1}.254
networks: networks:
mailcow-network: mailcow-network:
aliases: aliases:
@ -137,8 +131,6 @@ services:
- SKIP_SOLR=${SKIP_SOLR:-y} - SKIP_SOLR=${SKIP_SOLR:-y}
- ALLOW_ADMIN_EMAIL_LOGIN=${ALLOW_ADMIN_EMAIL_LOGIN:-n} - ALLOW_ADMIN_EMAIL_LOGIN=${ALLOW_ADMIN_EMAIL_LOGIN:-n}
restart: always restart: always
dns:
- ${IPV4_NETWORK:-172.22.1}.254
networks: networks:
mailcow-network: mailcow-network:
aliases: aliases:
@ -165,8 +157,6 @@ services:
- mysql-socket-vol-1:/var/run/mysqld/ - mysql-socket-vol-1:/var/run/mysqld/
- sogo-web-vol-1:/sogo_web - sogo-web-vol-1:/sogo_web
restart: always restart: always
dns:
- ${IPV4_NETWORK:-172.22.1}.254
networks: networks:
mailcow-network: mailcow-network:
ipv4_address: ${IPV4_NETWORK:-172.22.1}.248 ipv4_address: ${IPV4_NETWORK:-172.22.1}.248
@ -217,8 +207,6 @@ services:
nofile: nofile:
soft: 20000 soft: 20000
hard: 40000 hard: 40000
dns:
- ${IPV4_NETWORK:-172.22.1}.254
hostname: ${MAILCOW_HOSTNAME} hostname: ${MAILCOW_HOSTNAME}
networks: networks:
mailcow-network: mailcow-network:
@ -260,8 +248,6 @@ services:
memcached-mailcow: memcached-mailcow:
image: memcached:alpine image: memcached:alpine
restart: always restart: always
dns:
- ${IPV4_NETWORK:-172.22.1}.254
networks: networks:
mailcow-network: mailcow-network:
aliases: aliases:
@ -303,8 +289,6 @@ services:
- "${HTTPS_BIND:-0.0.0.0}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}" - "${HTTPS_BIND:-0.0.0.0}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}"
- "${HTTP_BIND:-0.0.0.0}:${HTTP_PORT:-80}:${HTTP_PORT:-80}" - "${HTTP_BIND:-0.0.0.0}:${HTTP_PORT:-80}:${HTTP_PORT:-80}"
restart: always restart: always
dns:
- ${IPV4_NETWORK:-172.22.1}.254
networks: networks:
mailcow-network: mailcow-network:
aliases: aliases:
@ -315,8 +299,6 @@ services:
- nginx-mailcow - nginx-mailcow
image: mailcow/acme:1.61 image: mailcow/acme:1.61
build: ./data/Dockerfiles/acme build: ./data/Dockerfiles/acme
dns:
- ${IPV4_NETWORK:-172.22.1}.254
environment: environment:
- LOG_LINES=${LOG_LINES:-9999} - LOG_LINES=${LOG_LINES:-9999}
- ADDITIONAL_SAN=${ADDITIONAL_SAN} - ADDITIONAL_SAN=${ADDITIONAL_SAN}
@ -360,8 +342,6 @@ services:
- SNAT_TO_SOURCE=${SNAT_TO_SOURCE:-n} - SNAT_TO_SOURCE=${SNAT_TO_SOURCE:-n}
- SNAT6_TO_SOURCE=${SNAT6_TO_SOURCE:-n} - SNAT6_TO_SOURCE=${SNAT6_TO_SOURCE:-n}
network_mode: "host" network_mode: "host"
dns:
- ${IPV4_NETWORK:-172.22.1}.254
volumes: volumes:
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro
@ -391,8 +371,6 @@ services:
- SKIP_CLAMD=${SKIP_CLAMD:-n} - SKIP_CLAMD=${SKIP_CLAMD:-n}
- SKIP_LETS_ENCRYPT=${SKIP_LETS_ENCRYPT:-n} - SKIP_LETS_ENCRYPT=${SKIP_LETS_ENCRYPT:-n}
- HTTPS_PORT=${HTTPS_PORT:-443} - HTTPS_PORT=${HTTPS_PORT:-443}
dns:
- ${IPV4_NETWORK:-172.22.1}.254
networks: networks:
mailcow-network: mailcow-network:
aliases: aliases:
@ -419,8 +397,6 @@ services:
restart: always restart: always
volumes: volumes:
- solr-vol-1:/opt/solr/server/solr/dovecot-fts/data - solr-vol-1:/opt/solr/server/solr/dovecot-fts/data
dns:
- ${IPV4_NETWORK:-172.22.1}.254
environment: environment:
- TZ=${TZ} - TZ=${TZ}
- SOLR_HEAP=${SOLR_HEAP:-1024} - SOLR_HEAP=${SOLR_HEAP:-1024}