From 4f6c31873e5657bbfff8f27674fd193bed96c447 Mon Sep 17 00:00:00 2001
From: Arjan H <github@hakwerk.com>
Date: Tue, 23 Sep 2025 20:31:51 +0200
Subject: [PATCH] Run mysql_upgrade every time the compose stack starts

---
 build/docker-compose.yml | 11 ++++++++++-
 build/tmp.patch          | 34 ++++++++++++++++++++++++++++------
 gui/apply-boulder        |  2 +-
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/build/docker-compose.yml b/build/docker-compose.yml
index 12f2cc1..fd9a67f 100644
--- a/build/docker-compose.yml
+++ b/build/docker-compose.yml
@@ -67,7 +67,7 @@ services:
     restart: always
 
   bmysql:
-    image: mariadb:10.11.13
+    image: &db_image mariadb:10.11.13
     volumes:
       - dbdata:/var/lib/mysql
     networks:
@@ -84,6 +84,15 @@ services:
         max-file: "5"
     restart: always
 
+  bmysql-upgrade:
+    image: *db_image
+    networks:
+      - bouldernet
+    depends_on:
+      - bmysql
+    entrypoint: >
+      bash -c "sleep 20 && mysql_upgrade -h bmysql"
+
   bredis:
     image: redis:6.2.7
     volumes:
diff --git a/build/tmp.patch b/build/tmp.patch
index b0711be..d0ed895 100644
--- a/build/tmp.patch
+++ b/build/tmp.patch
@@ -1,5 +1,5 @@
 diff --git a/docker-compose.yml b/docker-compose.yml
-index c0c7fc838..12f2cc1e7 100644
+index c0c7fc838..fd9a67f35 100644
 --- a/docker-compose.yml
 +++ b/docker-compose.yml
 @@ -4,7 +4,7 @@ services:
@@ -27,7 +27,29 @@ index c0c7fc838..12f2cc1e7 100644
      networks:
        bouldernet:
          ipv4_address: 10.77.77.77
-@@ -89,7 +88,8 @@ services:
+@@ -68,7 +67,7 @@ services:
+     restart: always
+ 
+   bmysql:
+-    image: mariadb:10.11.13
++    image: &db_image mariadb:10.11.13
+     volumes:
+       - dbdata:/var/lib/mysql
+     networks:
+@@ -85,11 +84,21 @@ services:
+         max-file: "5"
+     restart: always
+ 
++  bmysql-upgrade:
++    image: *db_image
++    networks:
++      - bouldernet
++    depends_on:
++      - bmysql
++    entrypoint: >
++      bash -c "sleep 20 && mysql_upgrade -h bmysql"
++
+   bredis:
      image: redis:6.2.7
      volumes:
        - ./test/:/test/:cached
@@ -37,7 +59,7 @@ index c0c7fc838..12f2cc1e7 100644
      command: redis-server /opt/boulder/labca/redis-ratelimits.config
      networks:
        bouldernet:
-@@ -101,24 +101,26 @@ services:
+@@ -101,24 +110,26 @@ services:
      depends_on:
        - control
      volumes:
@@ -73,7 +95,7 @@ index c0c7fc838..12f2cc1e7 100644
      networks:
        - bouldernet
      expose:
-@@ -126,8 +128,8 @@ services:
+@@ -126,8 +137,8 @@ services:
      depends_on:
        - bmysql
        - control
@@ -84,7 +106,7 @@ index c0c7fc838..12f2cc1e7 100644
      logging:
        driver: "json-file"
        options:
-@@ -144,30 +146,28 @@ services:
+@@ -144,30 +155,28 @@ services:
        - 80:80
        - 443:443
      volumes:
@@ -129,7 +151,7 @@ index c0c7fc838..12f2cc1e7 100644
      expose:
        - 3030
      environment:
-@@ -184,6 +184,15 @@ services:
+@@ -184,6 +193,15 @@ services:
  
  volumes:
    dbdata:
diff --git a/gui/apply-boulder b/gui/apply-boulder
index 10546bc..a2d3374 100755
--- a/gui/apply-boulder
+++ b/gui/apply-boulder
@@ -7,7 +7,7 @@ dataDir="$baseDir/data"
 
 PKI_DNS=$(grep "\"dns\"" $dataDir/config.json | perl -p0e 's/.*?:\s+(.*)/\1/' | sed -e 's/\",//g' | sed -e 's/\"//g')
 if [ "$PKI_DNS" == "" ]; then
-    PKI_DNS="10.55.55.10:53"
+    PKI_DNS="10.77.77.10:53"
 fi
 PKI_FQDN=$(grep fqdn $dataDir/config.json | sed -e 's/.*:[ ]*//' | sed -e 's/\",//g' | sed -e 's/\"//g')
 PKI_DOMAIN=$(echo $PKI_FQDN | perl -p0e 's/.*?\.//')