Generate docker-compose file

docker-compose/docker-compose.yaml

@@ -1,10 +1,9 @@
 # This is an autogenerated file. Do not edit it manually.
 # Use `python generate-config.py` instead.
 ---
-version: "3.7"
 services:
   mariadb:
-    image: mariadb:10.6
+    image: mariadb:10.11
     restart: unless-stopped
     container_name: mariadb
     hostname: mariadb
@@ -13,11 +12,13 @@ services:
       - 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:
@@ -88,8 +89,10 @@ services:
       - /srv/buildbot/master/docker-compose/start-bbm-web.sh
     network_mode: host
     depends_on:
-      - mariadb
-      - crossbar
+      mariadb:
+        condition: service_healthy
+      crossbar:
+        condition: service_started
 
   master-nonlatent:
     image: quay.io/mariadb-foundation/bb-master:master
@@ -124,8 +127,10 @@ services:
       - "/srv/buildbot/master/docker-compose/start.sh master-nonlatent"
     network_mode: host
     depends_on:
-      - mariadb
-      - crossbar
+      mariadb:
+        condition: service_healthy
+      crossbar:
+        condition: service_started
 
   master-libvirt:
     image: quay.io/mariadb-foundation/bb-master:master
@@ -159,8 +164,10 @@ services:
       - "/srv/buildbot/master/docker-compose/start.sh master-libvirt"
     network_mode: host
     depends_on:
-      - mariadb
-      - crossbar
+      mariadb:
+        condition: service_healthy
+      crossbar:
+        condition: service_started
 
   autogen_aarch64-master-0:
     image: quay.io/mariadb-foundation/bb-master:master
@@ -194,8 +201,10 @@ services:
       - "/srv/buildbot/master/docker-compose/start.sh autogen/aarch64-master-0"
     network_mode: host
     depends_on:
-      - mariadb
-      - crossbar
+      mariadb:
+        condition: service_healthy
+      crossbar:
+        condition: service_started
 
   autogen_amd64-master-0:
     image: quay.io/mariadb-foundation/bb-master:master
@@ -229,8 +238,10 @@ services:
       - "/srv/buildbot/master/docker-compose/start.sh autogen/amd64-master-0"
     network_mode: host
     depends_on:
-      - mariadb
-      - crossbar
+      mariadb:
+        condition: service_healthy
+      crossbar:
+        condition: service_started
 
   autogen_amd64-master-1:
     image: quay.io/mariadb-foundation/bb-master:master
@@ -264,8 +275,10 @@ services:
       - "/srv/buildbot/master/docker-compose/start.sh autogen/amd64-master-1"
     network_mode: host
     depends_on:
-      - mariadb
-      - crossbar
+      mariadb:
+        condition: service_healthy
+      crossbar:
+        condition: service_started
 
   autogen_ppc64le-master-0:
     image: quay.io/mariadb-foundation/bb-master:master
@@ -299,8 +312,10 @@ services:
       - "/srv/buildbot/master/docker-compose/start.sh autogen/ppc64le-master-0"
     network_mode: host
     depends_on:
-      - mariadb
-      - crossbar
+      mariadb:
+        condition: service_healthy
+      crossbar:
+        condition: service_started
 
   autogen_s390x-master-0:
     image: quay.io/mariadb-foundation/bb-master:master
@@ -334,8 +349,10 @@ services:
       - "/srv/buildbot/master/docker-compose/start.sh autogen/s390x-master-0"
     network_mode: host
     depends_on:
-      - mariadb
-      - crossbar
+      mariadb:
+        condition: service_healthy
+      crossbar:
+        condition: service_started
 
   autogen_x86-master-0:
     image: quay.io/mariadb-foundation/bb-master:master
@@ -369,8 +386,10 @@ services:
       - "/srv/buildbot/master/docker-compose/start.sh autogen/x86-master-0"
     network_mode: host
     depends_on:
-      - mariadb
-      - crossbar
+      mariadb:
+        condition: service_healthy
+      crossbar:
+        condition: service_started
 
   master-docker-nonstandard:
     image: quay.io/mariadb-foundation/bb-master:master
@@ -404,8 +423,10 @@ services:
       - "/srv/buildbot/master/docker-compose/start.sh master-docker-nonstandard"
     network_mode: host
     depends_on:
-      - mariadb
-      - crossbar
+      mariadb:
+        condition: service_healthy
+      crossbar:
+        condition: service_started
 
   master-galera:
     image: quay.io/mariadb-foundation/bb-master:master
@@ -439,8 +460,10 @@ services:
       - "/srv/buildbot/master/docker-compose/start.sh master-galera"
     network_mode: host
     depends_on:
-      - mariadb
-      - crossbar
+      mariadb:
+        condition: service_healthy
+      crossbar:
+        condition: service_started
 
   master-protected-branches:
     image: quay.io/mariadb-foundation/bb-master:master
@@ -474,8 +497,10 @@ services:
       - "/srv/buildbot/master/docker-compose/start.sh master-protected-branches"
     network_mode: host
     depends_on:
-      - mariadb
-      - crossbar
+      mariadb:
+        condition: service_healthy
+      crossbar:
+        condition: service_started
 
   master-docker-nonstandard-2:
     image: quay.io/mariadb-foundation/bb-master:master
@@ -509,8 +534,10 @@ services:
       - "/srv/buildbot/master/docker-compose/start.sh master-docker-nonstandard-2"
     network_mode: host
     depends_on:
-      - mariadb
-      - crossbar
+      mariadb:
+        condition: service_healthy
+      crossbar:
+        condition: service_started
 
   master-bintars:
     image: quay.io/mariadb-foundation/bb-master:master
@@ -544,5 +571,7 @@ services:
       - "/srv/buildbot/master/docker-compose/start.sh master-bintars"
     network_mode: host
     depends_on:
-      - mariadb
-      - crossbar
+      mariadb:
+        condition: service_healthy
+      crossbar:
+        condition: service_started