From 85659b47efb1c1432eb877c0ad6010199b9d59aa Mon Sep 17 00:00:00 2001
From: Sven Roederer <sven@geroedel.de>
Date: Sun, 20 Mar 2022 16:14:46 +0100
Subject: [PATCH] docker-compose: backport "stop_grace_period" and "restart"
 option to mysql variant

* backport from 743bc8522cc24c8f7684c4671a2a29477fae73b6
* backport from 0b22a0da62c56f85076ca1999e81f224092e003a
* also whitespace fix and line reordering

Signed-off-by: Sven Roederer <sven@geroedel.de>
---
 docker-compose-mysql.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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