Add autoupgrade and mariadb conf

docker-compose/generate-config.py

@@ -27,7 +27,6 @@
 
 START_TEMPLATE = """
 ---
-version: "3.7"
 services:
   mariadb:
     image: mariadb:10.11
@@ -39,11 +38,13 @@
       - MARIADB_DATABASE=buildbot
       - MARIADB_USER=buildmaster
       - MARIADB_PASSWORD=password
+      - MARIADB_AUTO_UPGRADE=1
     network_mode: host
     healthcheck:
       test: ['CMD', "mariadb-admin", "--password=password", "--protocol", "tcp", "ping"]
     volumes:
       - ./mariadb:/var/lib/mysql:rw
+      - ./mariadb.cnf:/etc/mysql/conf.d/mariadb.cnf:ro
     logging:
       driver: journald
       options:
@@ -96,8 +97,10 @@
       - /srv/buildbot/master/docker-compose/start-bbm-web.sh
     network_mode: host
     depends_on:
-      - mariadb
-      - crossbar
+      mariadb:
+        condition: service_healthy
+      crossbar:
+        condition: service_started
 """
 
 DOCKER_COMPOSE_TEMPLATE = """
@@ -113,8 +116,10 @@
       - "/srv/buildbot/master/docker-compose/start.sh {master_directory}"
     network_mode: host
     depends_on:
-      - mariadb
-      - crossbar
+      mariadb:
+        condition: service_healthy
+      crossbar:
+        condition: service_started
 """
 
 

docker-compose/mariadb.cnf

@@ -0,0 +1,8 @@
+[mariadb]
+
+slow_query_log
+log_slow_verbosity      = query_plan,explain,engine
+log_slow_query_time     = 0.5
+innodb-buffer-pool-size = 4G # FIXME: find a solution for DEV and PROD not being ISO
+innodb-log-file-size    = 4G # FIXME: find a solution for DEV and PROD not being ISO
+innodb_io_capacity      = 2000