Scott.Idem/OSIT-Mailman3
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

docker-compose: backport "stop_grace_period" and "restart" option to mysql variant

Browse Source 
* backport from 743bc8522c
* backport from 0b22a0da62
* also whitespace fix and line reordering

Signed-off-by: Sven Roederer <sven@geroedel.de>
This commit is contained in:
Sven Roederer
2022-03-20 16:14:46 +01:00
parent 420d47e88e
commit 85659b47ef
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose-mysql.yaml
View File

@@ -7,6 +7,7 @@ services:
hostname: mailman-core hostname: mailman-core
volumes: volumes:
- /opt/mailman/core:/opt/mailman/ - /opt/mailman/core:/opt/mailman/
stop_grace_period: 30s
links: links:
- database:database - database:database
depends_on: depends_on:
@@ -34,8 +35,8 @@ services:
volumes: volumes:
- /opt/mailman/web:/opt/mailman-web-data - /opt/mailman/web:/opt/mailman-web-data
environment: environment:
- DATABASE_TYPE=mysql
- DATABASE_URL=mysql://mailman:mailmanpass@database/mailmandb?charset=utf8mb4 - DATABASE_URL=mysql://mailman:mailmanpass@database/mailmandb?charset=utf8mb4
- DATABASE_TYPE=mysql
- HYPERKITTY_API_KEY=someapikey - HYPERKITTY_API_KEY=someapikey
- SECRET_KEY=thisisaverysecretkey - SECRET_KEY=thisisaverysecretkey
- DYLD_LIBRARY_PATH=/usr/local/mysql/lib/ - DYLD_LIBRARY_PATH=/usr/local/mysql/lib/
@@ -51,7 +52,6 @@ services:
MYSQL_USER: mailman MYSQL_USER: mailman
MYSQL_PASSWORD: mailmanpass MYSQL_PASSWORD: mailmanpass
MYSQL_RANDOM_ROOT_PASSWORD: "yes" MYSQL_RANDOM_ROOT_PASSWORD: "yes"
restart: always
image: mariadb:10.5 image: mariadb:10.5
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
volumes: volumes:
@@ -60,7 +60,7 @@ services:
mailman: mailman:
networks: networks:
mailman: mailman:
driver: bridge driver: bridge
ipam: ipam:
driver: default driver: default