From f0601ff66800961b17623a67291a543f95bc18c9 Mon Sep 17 00:00:00 2001
From: Arjan H <github@hakwerk.com>
Date: Sun, 11 Jun 2023 12:19:00 +0200
Subject: [PATCH] Fix MySQL container name; fix workdir for apply script in
 install

---
 install | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/install b/install
index 2c7d994..3f5726f 100755
--- a/install
+++ b/install
@@ -630,7 +630,7 @@ config_boulder() {
     fi
 
     mkdir -p $baseDir/backup
-    [ -z "$(docker ps | grep boulder-bmysql-1)" ] || docker exec -i boulder-bmysql-1 mysqldump boulder_sa_integration >$baseDir/backup/dbdata-${runId}.sql
+    [ -z "$(docker ps | grep labca-bmysql-1)" ] || docker exec -i labca-bmysql-1 mysqldump boulder_sa_integration >$baseDir/backup/dbdata-${runId}.sql
     # housekeeping
     for file in `ls -1t $baseDir/backup/dbdata-*.sql 2>&1 | tail -n +3 || true`; do
         rm $file
@@ -654,7 +654,9 @@ config_boulder() {
     if [ "$installMode" == "normal" ]; then
         local have_config=$(grep restarted $adminDir/data/config.json 2>/dev/null | grep true)
         if [ "$have_config" != "" ]; then
+            cd "$boulderLabCADir"
             $adminDir/apply-boulder &>>$installLog
+            cd "$boulderDir"
         else
             chown -R labca:labca "$boulderLabCADir" || /bin/true
         fi
@@ -758,7 +760,7 @@ startup() {
     wait_up $PS_CONSUL 2 &>>$installLog || true
     wait_up $PS_LABCA &>>$installLog || true
     wait_up $PS_CONTROL &>>$installLog || true
-    docker exec -i boulder-bmysql-1 mysql_upgrade &>>$installLog
+    docker exec -i labca-bmysql-1 mysql_upgrade &>>$installLog
     [ -f "$boulderLabCADir/setup_complete" ] && wait_up $PS_BOULDER $PS_BOULDER_COUNT &>>$installLog || /bin/true
 
     if [ $cnt -gt 0 ]; then